From 56ae122b89755ef5b2dd2d825a10968a2878c6e4 Mon Sep 17 00:00:00 2001 From: Tyler Bochard Date: Wed, 28 Jul 2021 07:24:38 -0400 Subject: [PATCH] client: rev 198 (#3014) * client: rev 198 * client: checkstyle Co-authored-by: therealnull --- buildSrc/src/main/kotlin/Dependencies.kt | 4 +- .../mixins/RSClanChannelMemberMixin.java | 7 + .../runelite/rs/api/RSClanChannelMember.java | 5 +- .../src/main/java/AbstractArchive.java | 726 +- .../main/java/AbstractByteArrayCopier.java | 92 +- .../src/main/java/AbstractFont.java | 1082 +- .../src/main/java/AbstractRasterProvider.java | 42 +- .../src/main/java/AbstractSocket.java | 71 +- .../src/main/java/AbstractSound.java | 6 +- .../src/main/java/AbstractUserComparator.java | 49 +- .../src/main/java/AbstractWorldMapData.java | 243 +- .../src/main/java/AbstractWorldMapIcon.java | 1046 +- .../src/main/java/AccessFile.java | 148 +- runescape-client/src/main/java/Actor.java | 998 +- runescape-client/src/main/java/Animation.java | 140 +- .../main/java/ApproximateRouteStrategy.java | 259 +- runescape-client/src/main/java/Archive.java | 649 +- .../src/main/java/ArchiveDisk.java | 326 +- .../src/main/java/ArchiveDiskAction.java | 83 +- .../main/java/ArchiveDiskActionHandler.java | 168 +- .../src/main/java/ArchiveLoader.java | 198 +- .../src/main/java/AttackOption.java | 227 +- .../src/main/java/AudioFilter.java | 226 +- .../src/main/java/BZip2Decompressor.java | 734 +- .../src/main/java/BZip2State.java | 174 +- .../src/main/java/BoundaryObject.java | 60 +- runescape-client/src/main/java/Bounds.java | 181 +- runescape-client/src/main/java/Buddy.java | 134 +- .../src/main/java/BuddyRankComparator.java | 57 +- runescape-client/src/main/java/Buffer.java | 1665 ++- .../src/main/java/BufferedFile.java | 390 +- .../src/main/java/BufferedNetSocket.java | 114 +- .../src/main/java/BufferedSink.java | 266 +- .../src/main/java/BufferedSource.java | 214 +- .../src/main/java/ByteArrayNode.java | 8 +- .../src/main/java/ByteArrayPool.java | 116 +- runescape-client/src/main/java/Calendar.java | 33 +- runescape-client/src/main/java/Canvas.java | 1012 +- .../src/main/java/ChatChannel.java | 96 +- .../src/main/java/ClanChannel.java | 652 +- .../src/main/java/ClanChannelMember.java | 116 +- runescape-client/src/main/java/ClanMate.java | 84 +- .../src/main/java/ClanSettings.java | 1021 +- runescape-client/src/main/java/Client.java | 10012 +++++++++------- .../src/main/java/ClientPacket.java | 1206 +- .../src/main/java/ClientPreferences.java | 219 +- runescape-client/src/main/java/Clock.java | 105 +- .../src/main/java/CollisionMap.java | 598 +- runescape-client/src/main/java/Coord.java | 230 +- runescape-client/src/main/java/Decimator.java | 441 +- .../src/main/java/DefaultsGroup.java | 32 +- .../src/main/java/DemotingHashTable.java | 172 +- .../java/DesktopPlatformInfoProvider.java | 258 +- .../src/main/java/DevicePcmPlayer.java | 98 +- .../main/java/DevicePcmPlayerProvider.java | 214 +- .../src/main/java/DirectByteArrayCopier.java | 50 +- .../src/main/java/DirectWrapper.java | 18 +- runescape-client/src/main/java/DualNode.java | 24 +- .../src/main/java/DualNodeDeque.java | 52 +- .../src/main/java/DynamicObject.java | 230 +- .../src/main/java/EnumComposition.java | 147 +- .../src/main/java/Enumerated.java | 6 +- .../main/java/EvictingDualNodeHashTable.java | 96 +- .../src/main/java/FaceNormal.java | 113 +- .../src/main/java/FileSystem.java | 234 +- runescape-client/src/main/java/FillMode.java | 57 +- .../src/main/java/FloorDecoration.java | 128 +- .../src/main/java/FloorOverlayDefinition.java | 360 +- .../main/java/FloorUnderlayDefinition.java | 233 +- runescape-client/src/main/java/Font.java | 122 +- runescape-client/src/main/java/FontName.java | 492 +- runescape-client/src/main/java/Fonts.java | 253 +- runescape-client/src/main/java/Frames.java | 102 +- runescape-client/src/main/java/Friend.java | 117 +- .../src/main/java/FriendLoginUpdate.java | 80 +- .../src/main/java/FriendSystem.java | 510 +- .../src/main/java/FriendsChat.java | 336 +- .../src/main/java/FriendsList.java | 204 +- .../src/main/java/GZipDecompressor.java | 45 +- runescape-client/src/main/java/GameBuild.java | 244 +- .../src/main/java/GameEngine.java | 1333 +- .../src/main/java/GameObject.java | 905 +- .../src/main/java/GrandExchangeEvent.java | 483 +- .../src/main/java/GrandExchangeEvents.java | 94 +- .../src/main/java/GrandExchangeOffer.java | 138 +- .../java/GrandExchangeOfferAgeComparator.java | 110 +- .../GrandExchangeOfferNameComparator.java | 92 +- .../GrandExchangeOfferOwnWorldComparator.java | 115 +- ...dExchangeOfferTotalQuantityComparator.java | 14 +- ...GrandExchangeOfferUnitPriceComparator.java | 77 +- .../GrandExchangeOfferWorldComparator.java | 258 +- .../src/main/java/GraphicsDefaults.java | 169 +- .../src/main/java/GraphicsObject.java | 460 +- runescape-client/src/main/java/HealthBar.java | 130 +- .../src/main/java/HealthBarDefinition.java | 278 +- .../src/main/java/HealthBarUpdate.java | 124 +- .../src/main/java/HitSplatDefinition.java | 541 +- .../src/main/java/HorizontalAlignment.java | 131 +- runescape-client/src/main/java/Huffman.java | 359 +- .../src/main/java/IgnoreList.java | 95 +- runescape-client/src/main/java/Ignored.java | 26 +- .../src/main/java/IndexedSprite.java | 297 +- .../src/main/java/Instrument.java | 408 +- .../src/main/java/IntHashTable.java | 36 +- .../src/main/java/IntegerNode.java | 8 +- .../src/main/java/InterfaceParent.java | 54 +- .../src/main/java/Interpreter.java | 234 +- .../src/main/java/InvDefinition.java | 432 +- .../src/main/java/IsaacCipher.java | 346 +- .../src/main/java/ItemComposition.java | 1382 ++- .../src/main/java/ItemContainer.java | 289 +- runescape-client/src/main/java/ItemLayer.java | 177 +- .../src/main/java/IterableDualNodeQueue.java | 124 +- .../java/IterableDualNodeQueueIterator.java | 62 +- .../src/main/java/IterableNodeDeque.java | 296 +- .../IterableNodeDequeDescendingIterator.java | 80 +- .../src/main/java/IterableNodeHashTable.java | 130 +- .../java/IterableNodeHashTableIterator.java | 98 +- .../src/main/java/JagexCache.java | 232 +- .../src/main/java/KeyHandler.java | 683 +- .../src/main/java/KitDefinition.java | 283 +- runescape-client/src/main/java/Language.java | 248 +- runescape-client/src/main/java/Link.java | 24 +- runescape-client/src/main/java/LinkDeque.java | 64 +- runescape-client/src/main/java/Login.java | 200 +- .../src/main/java/LoginPacket.java | 92 +- .../src/main/java/LoginScreenAnimation.java | 1036 +- runescape-client/src/main/java/LoginType.java | 108 +- .../src/main/java/MenuAction.java | 782 +- runescape-client/src/main/java/Message.java | 228 +- runescape-client/src/main/java/Messages.java | 122 +- .../src/main/java/MidiFileReader.java | 296 +- .../src/main/java/MidiPcmStream.java | 1367 ++- .../src/main/java/MilliClock.java | 186 +- runescape-client/src/main/java/ModeWhere.java | 1090 +- runescape-client/src/main/java/Model.java | 2156 ++-- runescape-client/src/main/java/ModelData.java | 2030 ++-- .../src/main/java/ModelData0.java | 66 +- .../src/main/java/MouseHandler.java | 656 +- .../src/main/java/MouseRecorder.java | 105 +- .../src/main/java/MouseWheel.java | 6 +- .../src/main/java/MouseWheelHandler.java | 42 +- .../src/main/java/MusicPatch.java | 632 +- .../src/main/java/MusicPatchNode.java | 300 +- .../src/main/java/MusicPatchNode2.java | 77 +- .../src/main/java/MusicPatchPcmStream.java | 397 +- .../src/main/java/MusicTrack.java | 534 +- runescape-client/src/main/java/NPC.java | 242 +- .../src/main/java/NPCComposition.java | 784 +- runescape-client/src/main/java/NanoClock.java | 44 +- runescape-client/src/main/java/NetCache.java | 219 +- .../src/main/java/NetFileRequest.java | 386 +- runescape-client/src/main/java/NetSocket.java | 376 +- runescape-client/src/main/java/Node.java | 30 +- runescape-client/src/main/java/NodeDeque.java | 212 +- .../src/main/java/NodeHashTable.java | 102 +- .../src/main/java/ObjectComposition.java | 2250 +++- .../src/main/java/ObjectNode.java | 8 +- .../src/main/java/ObjectSound.java | 305 +- runescape-client/src/main/java/Occluder.java | 168 +- .../src/main/java/PacketBuffer.java | 199 +- .../src/main/java/PacketBufferNode.java | 51 +- .../src/main/java/PacketWriter.java | 230 +- .../src/main/java/ParamComposition.java | 436 +- runescape-client/src/main/java/PcmPlayer.java | 1583 +-- runescape-client/src/main/java/PcmStream.java | 54 +- .../src/main/java/PcmStreamMixer.java | 226 +- .../src/main/java/PcmStreamMixerListener.java | 12 +- .../src/main/java/PendingSpawn.java | 261 +- .../src/main/java/PlatformInfo.java | 326 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 1315 +- .../src/main/java/PlayerComposition.java | 592 +- .../src/main/java/PlayerProvider.java | 8 +- .../src/main/java/PlayerType.java | 61 +- runescape-client/src/main/java/Players.java | 95 +- .../src/main/java/PrivateChatMode.java | 36 +- .../src/main/java/Projectile.java | 309 +- .../src/main/java/RasterProvider.java | 86 +- .../src/main/java/Rasterizer2D.java | 900 +- .../src/main/java/Rasterizer3D.java | 4290 +++---- .../src/main/java/RawPcmStream.java | 2184 ++-- runescape-client/src/main/java/RawSound.java | 52 +- .../src/main/java/ReflectionCheck.java | 171 +- .../src/main/java/Renderable.java | 576 +- .../src/main/java/RouteStrategy.java | 73 +- .../src/main/java/RunException.java | 19 +- runescape-client/src/main/java/Scene.java | 2856 ++--- .../src/main/java/SceneTileModel.java | 398 +- .../src/main/java/SceneTilePaint.java | 228 +- runescape-client/src/main/java/Script.java | 87 +- .../src/main/java/ScriptEvent.java | 122 +- .../src/main/java/ScriptFrame.java | 219 +- .../src/main/java/SecureRandomCallable.java | 142 +- .../src/main/java/SecureRandomFuture.java | 105 +- .../src/main/java/SequenceDefinition.java | 630 +- .../src/main/java/ServerPacket.java | 1097 +- runescape-client/src/main/java/Skeleton.java | 91 +- runescape-client/src/main/java/Skills.java | 36 +- .../src/main/java/SoftWrapper.java | 18 +- .../src/main/java/SoundCache.java | 540 +- .../src/main/java/SoundEffect.java | 108 +- .../src/main/java/SoundEnvelope.java | 102 +- .../src/main/java/SoundSystem.java | 121 +- .../main/java/SpotAnimationDefinition.java | 358 +- .../src/main/java/SpriteMask.java | 62 +- .../src/main/java/SpritePixels.java | 2022 ++-- runescape-client/src/main/java/Strings.java | 83 +- .../src/main/java/StructComposition.java | 815 +- .../src/main/java/StudioGame.java | 198 +- runescape-client/src/main/java/Task.java | 22 +- .../src/main/java/TaskHandler.java | 261 +- runescape-client/src/main/java/Texture.java | 228 +- .../src/main/java/TextureLoader.java | 20 +- .../src/main/java/TextureProvider.java | 269 +- runescape-client/src/main/java/Tile.java | 131 +- runescape-client/src/main/java/TileItem.java | 62 +- runescape-client/src/main/java/Tiles.java | 286 +- runescape-client/src/main/java/Timer.java | 224 +- runescape-client/src/main/java/TriBool.java | 20 +- .../src/main/java/UrlRequest.java | 480 +- .../src/main/java/UrlRequester.java | 176 +- runescape-client/src/main/java/User.java | 77 +- .../src/main/java/UserComparator1.java | 32 +- .../src/main/java/UserComparator10.java | 100 +- .../src/main/java/UserComparator2.java | 44 +- .../src/main/java/UserComparator3.java | 56 +- .../src/main/java/UserComparator4.java | 800 +- .../src/main/java/UserComparator5.java | 97 +- .../src/main/java/UserComparator6.java | 112 +- .../src/main/java/UserComparator7.java | 50 +- .../src/main/java/UserComparator8.java | 72 +- .../src/main/java/UserComparator9.java | 571 +- runescape-client/src/main/java/UserList.java | 334 +- runescape-client/src/main/java/Username.java | 118 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitComposition.java | 228 +- runescape-client/src/main/java/VarcInt.java | 142 +- runescape-client/src/main/java/Varcs.java | 1134 +- .../src/main/java/VarpDefinition.java | 208 +- runescape-client/src/main/java/Varps.java | 294 +- .../src/main/java/VertexNormal.java | 654 +- .../src/main/java/VerticalAlignment.java | 121 +- .../src/main/java/ViewportMouse.java | 116 +- .../src/main/java/VorbisCodebook.java | 236 +- .../src/main/java/VorbisFloor.java | 428 +- .../src/main/java/VorbisMapping.java | 36 +- .../src/main/java/VorbisResidue.java | 118 +- .../src/main/java/VorbisSample.java | 732 +- .../src/main/java/WallDecoration.java | 248 +- runescape-client/src/main/java/Widget.java | 1721 +-- runescape-client/src/main/java/World.java | 630 +- runescape-client/src/main/java/WorldMap.java | 2064 ++-- .../src/main/java/WorldMapArchiveLoader.java | 90 +- .../src/main/java/WorldMapArea.java | 420 +- .../src/main/java/WorldMapAreaData.java | 111 +- .../src/main/java/WorldMapCacheName.java | 81 +- .../src/main/java/WorldMapData_0.java | 140 +- .../src/main/java/WorldMapData_1.java | 187 +- .../src/main/java/WorldMapDecoration.java | 190 +- .../src/main/java/WorldMapDecorationType.java | 388 +- .../src/main/java/WorldMapElement.java | 450 +- .../src/main/java/WorldMapEvent.java | 130 +- .../src/main/java/WorldMapID.java | 117 +- .../src/main/java/WorldMapIcon_0.java | 259 +- .../src/main/java/WorldMapIcon_1.java | 224 +- .../src/main/java/WorldMapLabel.java | 105 +- .../src/main/java/WorldMapLabelSize.java | 195 +- .../src/main/java/WorldMapManager.java | 740 +- .../src/main/java/WorldMapRectangle.java | 161 +- .../src/main/java/WorldMapRegion.java | 1302 +- .../src/main/java/WorldMapScaleHandler.java | 924 +- .../src/main/java/WorldMapSection.java | 32 +- .../src/main/java/WorldMapSection0.java | 251 +- .../src/main/java/WorldMapSection1.java | 185 +- .../src/main/java/WorldMapSection2.java | 877 +- .../src/main/java/WorldMapSectionType.java | 177 +- .../src/main/java/WorldMapSprite.java | 38 +- runescape-client/src/main/java/Wrapper.java | 12 +- runescape-client/src/main/java/class0.java | 198 +- runescape-client/src/main/java/class1.java | 199 +- runescape-client/src/main/java/class10.java | 84 - runescape-client/src/main/java/class100.java | 232 + runescape-client/src/main/java/class101.java | 84 + runescape-client/src/main/java/class102.java | 160 + runescape-client/src/main/java/class103.java | 181 + runescape-client/src/main/java/class104.java | 180 + runescape-client/src/main/java/class105.java | 57 - runescape-client/src/main/java/class106.java | 230 +- runescape-client/src/main/java/class107.java | 167 + runescape-client/src/main/java/class108.java | 140 + runescape-client/src/main/java/class109.java | 156 + runescape-client/src/main/java/class110.java | 109 + runescape-client/src/main/java/class111.java | 49 + runescape-client/src/main/java/class112.java | 75 + runescape-client/src/main/java/class113.java | 102 + runescape-client/src/main/java/class115.java | 69 + runescape-client/src/main/java/class116.java | 101 + runescape-client/src/main/java/class117.java | 84 + runescape-client/src/main/java/class118.java | 189 + runescape-client/src/main/java/class119.java | 350 + runescape-client/src/main/java/class12.java | 98 - runescape-client/src/main/java/class120.java | 112 + runescape-client/src/main/java/class121.java | 893 ++ runescape-client/src/main/java/class122.java | 182 + runescape-client/src/main/java/class124.java | 295 +- runescape-client/src/main/java/class125.java | 558 +- runescape-client/src/main/java/class126.java | 322 +- runescape-client/src/main/java/class127.java | 164 + runescape-client/src/main/java/class13.java | 55 - runescape-client/src/main/java/class136.java | 33 - runescape-client/src/main/java/class137.java | 169 + runescape-client/src/main/java/class14.java | 92 +- runescape-client/src/main/java/class143.java | 265 - runescape-client/src/main/java/class144.java | 121 + runescape-client/src/main/java/class15.java | 147 +- runescape-client/src/main/java/class16.java | 437 +- runescape-client/src/main/java/class160.java | 99 - runescape-client/src/main/java/class161.java | 211 + runescape-client/src/main/java/class162.java | 7 - runescape-client/src/main/java/class163.java | 47 + runescape-client/src/main/java/class17.java | 161 - runescape-client/src/main/java/class170.java | 171 - runescape-client/src/main/java/class171.java | 317 +- runescape-client/src/main/java/class172.java | 13 + runescape-client/src/main/java/class18.java | 226 - runescape-client/src/main/java/class180.java | 33 - runescape-client/src/main/java/class181.java | 78 + runescape-client/src/main/java/class182.java | 17 - runescape-client/src/main/java/class183.java | 129 + runescape-client/src/main/java/class19.java | 263 - runescape-client/src/main/java/class2.java | 123 +- runescape-client/src/main/java/class20.java | 163 - runescape-client/src/main/java/class21.java | 658 - runescape-client/src/main/java/class214.java | 5 - runescape-client/src/main/java/class215.java | 64 +- runescape-client/src/main/java/class216.java | 39 +- runescape-client/src/main/java/class217.java | 2 +- runescape-client/src/main/java/class218.java | 6 +- runescape-client/src/main/java/class219.java | 7 + runescape-client/src/main/java/class22.java | 119 - runescape-client/src/main/java/class224.java | 5 - runescape-client/src/main/java/class225.java | 5 + runescape-client/src/main/java/class226.java | 211 - runescape-client/src/main/java/class227.java | 82 + runescape-client/src/main/java/class23.java | 81 - runescape-client/src/main/java/class230.java | 16 - runescape-client/src/main/java/class231.java | 40 +- runescape-client/src/main/java/class232.java | 30 + runescape-client/src/main/java/class233.java | 87 - runescape-client/src/main/java/class234.java | 272 + runescape-client/src/main/java/class24.java | 18 - runescape-client/src/main/java/class244.java | 159 - runescape-client/src/main/java/class245.java | 27 + runescape-client/src/main/java/class246.java | 96 - runescape-client/src/main/java/class247.java | 20 + runescape-client/src/main/java/class248.java | 50 - runescape-client/src/main/java/class249.java | 75 + runescape-client/src/main/java/class25.java | 393 - runescape-client/src/main/java/class250.java | 84 - runescape-client/src/main/java/class251.java | 22 + runescape-client/src/main/java/class255.java | 155 +- runescape-client/src/main/java/class256.java | 56 + runescape-client/src/main/java/class26.java | 189 - runescape-client/src/main/java/class260.java | 14 + runescape-client/src/main/java/class261.java | 227 - runescape-client/src/main/java/class262.java | 91 +- runescape-client/src/main/java/class263.java | 164 + runescape-client/src/main/java/class265.java | 128 - runescape-client/src/main/java/class266.java | 18 +- runescape-client/src/main/java/class267.java | 212 +- runescape-client/src/main/java/class268.java | 43 + runescape-client/src/main/java/class269.java | 132 - runescape-client/src/main/java/class27.java | 510 - runescape-client/src/main/java/class270.java | 659 + runescape-client/src/main/java/class28.java | 30 - runescape-client/src/main/java/class281.java | 191 - runescape-client/src/main/java/class282.java | 23 + runescape-client/src/main/java/class286.java | 204 - runescape-client/src/main/java/class287.java | 269 +- runescape-client/src/main/java/class288.java | 79 + runescape-client/src/main/java/class289.java | 24 - runescape-client/src/main/java/class29.java | 181 - runescape-client/src/main/java/class290.java | 169 + runescape-client/src/main/java/class3.java | 11 + runescape-client/src/main/java/class30.java | 5 - runescape-client/src/main/java/class302.java | 43 - runescape-client/src/main/java/class303.java | 112 +- runescape-client/src/main/java/class304.java | 112 +- runescape-client/src/main/java/class305.java | 9 - runescape-client/src/main/java/class306.java | 28 - runescape-client/src/main/java/class307.java | 88 +- runescape-client/src/main/java/class308.java | 71 + runescape-client/src/main/java/class309.java | 57 - runescape-client/src/main/java/class31.java | 11 - runescape-client/src/main/java/class310.java | 25 + runescape-client/src/main/java/class314.java | 36 +- runescape-client/src/main/java/class315.java | 14 + runescape-client/src/main/java/class32.java | 231 - runescape-client/src/main/java/class33.java | 80 - runescape-client/src/main/java/class337.java | 9 + runescape-client/src/main/java/class338.java | 54 + runescape-client/src/main/java/class339.java | 104 +- runescape-client/src/main/java/class34.java | 808 -- runescape-client/src/main/java/class340.java | 73 +- runescape-client/src/main/java/class341.java | 77 +- runescape-client/src/main/java/class342.java | 220 +- runescape-client/src/main/java/class343.java | 139 +- runescape-client/src/main/java/class344.java | 4 +- runescape-client/src/main/java/class345.java | 40 +- runescape-client/src/main/java/class346.java | 40 + runescape-client/src/main/java/class35.java | 272 - runescape-client/src/main/java/class350.java | 11 - runescape-client/src/main/java/class351.java | 11 + runescape-client/src/main/java/class36.java | 35 - runescape-client/src/main/java/class363.java | 19 - runescape-client/src/main/java/class364.java | 68 +- runescape-client/src/main/java/class365.java | 64 + runescape-client/src/main/java/class366.java | 14 - runescape-client/src/main/java/class367.java | 51 + runescape-client/src/main/java/class369.java | 46 - runescape-client/src/main/java/class370.java | 109 +- runescape-client/src/main/java/class371.java | 81 +- runescape-client/src/main/java/class372.java | 54 +- runescape-client/src/main/java/class373.java | 33 +- runescape-client/src/main/java/class374.java | 37 +- runescape-client/src/main/java/class375.java | 313 +- runescape-client/src/main/java/class376.java | 189 +- runescape-client/src/main/java/class377.java | 52 +- runescape-client/src/main/java/class378.java | 33 - runescape-client/src/main/java/class379.java | 7 - runescape-client/src/main/java/class380.java | 11 - runescape-client/src/main/java/class381.java | 11 + runescape-client/src/main/java/class386.java | 11 - runescape-client/src/main/java/class387.java | 62 +- runescape-client/src/main/java/class388.java | 85 + runescape-client/src/main/java/class390.java | 12 - runescape-client/src/main/java/class391.java | 255 +- runescape-client/src/main/java/class392.java | 41 + runescape-client/src/main/java/class397.java | 28 - runescape-client/src/main/java/class398.java | 93 + runescape-client/src/main/java/class4.java | 88 +- runescape-client/src/main/java/class403.java | 21 - .../java/{class254.java => class406.java} | 10 +- runescape-client/src/main/java/class407.java | 11 + runescape-client/src/main/java/class41.java | 134 + runescape-client/src/main/java/class42.java | 25 - runescape-client/src/main/java/class43.java | 86 - runescape-client/src/main/java/class44.java | 81 - runescape-client/src/main/java/class5.java | 170 +- runescape-client/src/main/java/class52.java | 88 + runescape-client/src/main/java/class54.java | 30 + runescape-client/src/main/java/class6.java | 298 +- runescape-client/src/main/java/class65.java | 28 + runescape-client/src/main/java/class69.java | 652 - runescape-client/src/main/java/class7.java | 334 +- runescape-client/src/main/java/class74.java | 31 + runescape-client/src/main/java/class78.java | 446 + runescape-client/src/main/java/class79.java | 213 + runescape-client/src/main/java/class8.java | 358 +- runescape-client/src/main/java/class80.java | 73 - runescape-client/src/main/java/class82.java | 397 - runescape-client/src/main/java/class93.java | 116 - runescape-client/src/main/java/class97.java | 5 + runescape-client/src/main/java/class98.java | 314 + runescape-client/src/main/java/class99.java | 82 + 466 files changed, 65937 insertions(+), 65851 deletions(-) delete mode 100644 runescape-client/src/main/java/class10.java create mode 100644 runescape-client/src/main/java/class100.java create mode 100644 runescape-client/src/main/java/class101.java create mode 100644 runescape-client/src/main/java/class102.java create mode 100644 runescape-client/src/main/java/class103.java create mode 100644 runescape-client/src/main/java/class104.java delete mode 100644 runescape-client/src/main/java/class105.java create mode 100644 runescape-client/src/main/java/class107.java create mode 100644 runescape-client/src/main/java/class108.java create mode 100644 runescape-client/src/main/java/class109.java create mode 100644 runescape-client/src/main/java/class110.java create mode 100644 runescape-client/src/main/java/class111.java create mode 100644 runescape-client/src/main/java/class112.java create mode 100644 runescape-client/src/main/java/class113.java create mode 100644 runescape-client/src/main/java/class115.java create mode 100644 runescape-client/src/main/java/class116.java create mode 100644 runescape-client/src/main/java/class117.java create mode 100644 runescape-client/src/main/java/class118.java create mode 100644 runescape-client/src/main/java/class119.java delete mode 100644 runescape-client/src/main/java/class12.java create mode 100644 runescape-client/src/main/java/class120.java create mode 100644 runescape-client/src/main/java/class121.java create mode 100644 runescape-client/src/main/java/class122.java create mode 100644 runescape-client/src/main/java/class127.java delete mode 100644 runescape-client/src/main/java/class13.java delete mode 100644 runescape-client/src/main/java/class136.java create mode 100644 runescape-client/src/main/java/class137.java delete mode 100644 runescape-client/src/main/java/class143.java create mode 100644 runescape-client/src/main/java/class144.java delete mode 100644 runescape-client/src/main/java/class160.java create mode 100644 runescape-client/src/main/java/class161.java delete mode 100644 runescape-client/src/main/java/class162.java create mode 100644 runescape-client/src/main/java/class163.java delete mode 100644 runescape-client/src/main/java/class17.java delete mode 100644 runescape-client/src/main/java/class170.java create mode 100644 runescape-client/src/main/java/class172.java delete mode 100644 runescape-client/src/main/java/class18.java delete mode 100644 runescape-client/src/main/java/class180.java create mode 100644 runescape-client/src/main/java/class181.java delete mode 100644 runescape-client/src/main/java/class182.java create mode 100644 runescape-client/src/main/java/class183.java delete mode 100644 runescape-client/src/main/java/class19.java delete mode 100644 runescape-client/src/main/java/class20.java delete mode 100644 runescape-client/src/main/java/class21.java delete mode 100644 runescape-client/src/main/java/class214.java create mode 100644 runescape-client/src/main/java/class219.java delete mode 100644 runescape-client/src/main/java/class22.java delete mode 100644 runescape-client/src/main/java/class224.java create mode 100644 runescape-client/src/main/java/class225.java delete mode 100644 runescape-client/src/main/java/class226.java create mode 100644 runescape-client/src/main/java/class227.java delete mode 100644 runescape-client/src/main/java/class23.java delete mode 100644 runescape-client/src/main/java/class230.java create mode 100644 runescape-client/src/main/java/class232.java delete mode 100644 runescape-client/src/main/java/class233.java create mode 100644 runescape-client/src/main/java/class234.java delete mode 100644 runescape-client/src/main/java/class24.java delete mode 100644 runescape-client/src/main/java/class244.java create mode 100644 runescape-client/src/main/java/class245.java delete mode 100644 runescape-client/src/main/java/class246.java create mode 100644 runescape-client/src/main/java/class247.java delete mode 100644 runescape-client/src/main/java/class248.java create mode 100644 runescape-client/src/main/java/class249.java delete mode 100644 runescape-client/src/main/java/class25.java delete mode 100644 runescape-client/src/main/java/class250.java create mode 100644 runescape-client/src/main/java/class251.java create mode 100644 runescape-client/src/main/java/class256.java delete mode 100644 runescape-client/src/main/java/class26.java create mode 100644 runescape-client/src/main/java/class260.java delete mode 100644 runescape-client/src/main/java/class261.java create mode 100644 runescape-client/src/main/java/class263.java delete mode 100644 runescape-client/src/main/java/class265.java create mode 100644 runescape-client/src/main/java/class268.java delete mode 100644 runescape-client/src/main/java/class269.java delete mode 100644 runescape-client/src/main/java/class27.java create mode 100644 runescape-client/src/main/java/class270.java delete mode 100644 runescape-client/src/main/java/class28.java delete mode 100644 runescape-client/src/main/java/class281.java create mode 100644 runescape-client/src/main/java/class282.java delete mode 100644 runescape-client/src/main/java/class286.java create mode 100644 runescape-client/src/main/java/class288.java delete mode 100644 runescape-client/src/main/java/class289.java delete mode 100644 runescape-client/src/main/java/class29.java create mode 100644 runescape-client/src/main/java/class290.java create mode 100644 runescape-client/src/main/java/class3.java delete mode 100644 runescape-client/src/main/java/class30.java delete mode 100644 runescape-client/src/main/java/class302.java delete mode 100644 runescape-client/src/main/java/class305.java delete mode 100644 runescape-client/src/main/java/class306.java create mode 100644 runescape-client/src/main/java/class308.java delete mode 100644 runescape-client/src/main/java/class309.java delete mode 100644 runescape-client/src/main/java/class31.java create mode 100644 runescape-client/src/main/java/class310.java create mode 100644 runescape-client/src/main/java/class315.java delete mode 100644 runescape-client/src/main/java/class32.java delete mode 100644 runescape-client/src/main/java/class33.java create mode 100644 runescape-client/src/main/java/class337.java create mode 100644 runescape-client/src/main/java/class338.java delete mode 100644 runescape-client/src/main/java/class34.java create mode 100644 runescape-client/src/main/java/class346.java delete mode 100644 runescape-client/src/main/java/class35.java delete mode 100644 runescape-client/src/main/java/class350.java create mode 100644 runescape-client/src/main/java/class351.java delete mode 100644 runescape-client/src/main/java/class36.java delete mode 100644 runescape-client/src/main/java/class363.java create mode 100644 runescape-client/src/main/java/class365.java delete mode 100644 runescape-client/src/main/java/class366.java create mode 100644 runescape-client/src/main/java/class367.java delete mode 100644 runescape-client/src/main/java/class369.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 create mode 100644 runescape-client/src/main/java/class381.java delete mode 100644 runescape-client/src/main/java/class386.java create mode 100644 runescape-client/src/main/java/class388.java delete mode 100644 runescape-client/src/main/java/class390.java create mode 100644 runescape-client/src/main/java/class392.java delete mode 100644 runescape-client/src/main/java/class397.java create mode 100644 runescape-client/src/main/java/class398.java delete mode 100644 runescape-client/src/main/java/class403.java rename runescape-client/src/main/java/{class254.java => class406.java} (50%) create mode 100644 runescape-client/src/main/java/class407.java create mode 100644 runescape-client/src/main/java/class41.java delete mode 100644 runescape-client/src/main/java/class42.java delete mode 100644 runescape-client/src/main/java/class43.java delete mode 100644 runescape-client/src/main/java/class44.java create mode 100644 runescape-client/src/main/java/class52.java create mode 100644 runescape-client/src/main/java/class54.java create mode 100644 runescape-client/src/main/java/class65.java delete mode 100644 runescape-client/src/main/java/class69.java create mode 100644 runescape-client/src/main/java/class74.java create mode 100644 runescape-client/src/main/java/class78.java create mode 100644 runescape-client/src/main/java/class79.java delete mode 100644 runescape-client/src/main/java/class80.java delete mode 100644 runescape-client/src/main/java/class82.java delete mode 100644 runescape-client/src/main/java/class93.java create mode 100644 runescape-client/src/main/java/class97.java create mode 100644 runescape-client/src/main/java/class98.java create mode 100644 runescape-client/src/main/java/class99.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 144e70c14a..ec0e03883a 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,9 +27,9 @@ object ProjectVersions { const val launcherVersion = "2.2.0" const val rlVersion = "1.7.17" - const val openosrsVersion = "4.9.6" + const val openosrsVersion = "4.9.7" - const val rsversion = 197 + const val rsversion = 198 const val cacheversion = 165 const val lombokVersion = "1.18.20" diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMemberMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMemberMixin.java index dd51bb86f9..0c9556f5ad 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMemberMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMemberMixin.java @@ -58,4 +58,11 @@ public abstract class RSClanChannelMemberMixin implements RSClanChannelMember { return client.getClanRankFromRs(getRSRank()); } + + @Override + @Inject + public String getName() + { + return getUsername().getName(); + } } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java index 4e34ed6f5c..cec1a838ca 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java @@ -36,7 +36,6 @@ public interface RSClanChannelMember extends ClanChannelMember @Override int getWorld(); - @Import("name") - @Override - String getName(); + @Import("username") + RSUsername getUsername(); } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 4f21791d6c..32919ada45 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,195 +4,183 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("jy") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Loj;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -592681403 + intValue = -53448723 ) - static int field3599; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lkn;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - @Export("socketTask") - static Task socketTask; + static int field3591; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2033401093 + intValue = 964693835 ) @Export("groupCount") int groupCount; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("groupIds") int[] groupIds; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Lod;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Lox;" + descriptor = "[Lod;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("groups") Object[] groups; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("files") Object[][] files; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1153167145 + intValue = 378032211 ) @Export("hash") public int hash; - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("shallowFiles") boolean shallowFiles; static { - gzipDecompressor = new GZipDecompressor(); // L: 23 - field3599 = 0; // L: 27 + gzipDecompressor = new GZipDecompressor(); + field3591 = 0; } AbstractArchive(boolean var1, boolean var2) { - this.releaseGroups = var1; // L: 32 - this.shallowFiles = var2; // L: 33 - } // L: 34 + this.releaseGroups = var1; + this.shallowFiles = var2; + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "341986030" + garbageValue = "1300418650" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1768582746" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("loadGroup") void loadGroup(int var1) { - } // L: 204 + } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1362561714" + descriptor = "(IB)I", + garbageValue = "-50" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "619109968" + garbageValue = "1823098736" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = ItemLayer.method3863(var1, var1.length); // L: 37 - Buffer var2 = new Buffer(class106.decompressBytes(var1)); // L: 38 - int var3 = var2.readUnsignedByte(); // L: 39 - if (var3 >= 5 && var3 <= 7) { // L: 40 - if (var3 >= 6) { // L: 41 - var2.readInt(); // L: 42 + this.hash = PacketBufferNode.method4418(var1, var1.length); + Buffer var2 = new Buffer(GrandExchangeOfferOwnWorldComparator.decompressBytes(var1)); + int var3 = var2.readUnsignedByte(); + if (var3 >= 5 && var3 <= 7) { + if (var3 >= 6) { + var2.readInt(); } int var4 = var2.readUnsignedByte(); if (var3 >= 7) { - this.groupCount = var2.method6629(); + this.groupCount = var2.method6838(); } else { - this.groupCount = var2.readUnsignedShort(); // L: 47 + this.groupCount = var2.readUnsignedShort(); } - int var5 = 0; // L: 48 - int var6 = -1; // L: 49 - this.groupIds = new int[this.groupCount]; // L: 50 + int var5 = 0; + int var6 = -1; + this.groupIds = new int[this.groupCount]; int var7; - if (var3 >= 7) { // L: 51 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52 - this.groupIds[var7] = var5 += var2.method6629(); // L: 53 - if (this.groupIds[var7] > var6) { // L: 54 + if (var3 >= 7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.method6838(); + if (this.groupIds[var7] > var6) { var6 = this.groupIds[var7]; } } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58 - this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59 - if (this.groupIds[var7] > var6) { // L: 60 + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.readUnsignedShort(); + if (this.groupIds[var7] > var6) { var6 = this.groupIds[var7]; } } } - this.groupCrcs = new int[var6 + 1]; // L: 63 - this.groupVersions = new int[var6 + 1]; // L: 64 - this.fileCounts = new int[var6 + 1]; // L: 65 - this.fileIds = new int[var6 + 1][]; // L: 66 - this.groups = new Object[var6 + 1]; // L: 67 - this.files = new Object[var6 + 1][]; // L: 68 - if (var4 != 0) { // L: 69 - this.groupNameHashes = new int[var6 + 1]; // L: 70 + this.groupCrcs = new int[var6 + 1]; + this.groupVersions = new int[var6 + 1]; + this.fileCounts = new int[var6 + 1]; + this.fileIds = new int[var6 + 1][]; + this.groups = new Object[var6 + 1]; + this.files = new Object[var6 + 1][]; + if (var4 != 0) { + this.groupNameHashes = new int[var6 + 1]; - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71 + for (var7 = 0; var7 < this.groupCount; ++var7) { this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); } - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72 + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74 + for (var7 = 0; var7 < this.groupCount; ++var7) { this.groupCrcs[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75 + for (var7 = 0; var7 < this.groupCount; ++var7) { this.groupVersions[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76 + for (var7 = 0; var7 < this.groupCount; ++var7) { this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); } @@ -201,22 +189,22 @@ public abstract class AbstractArchive { int var10; int var11; int var12; - if (var3 >= 7) { // L: 77 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78 - var8 = this.groupIds[var7]; // L: 79 - var9 = this.fileCounts[var8]; // L: 80 - var5 = 0; // L: 81 - var10 = -1; // L: 82 - this.fileIds[var8] = new int[var9]; // L: 83 + if (var3 >= 7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; + var5 = 0; + var10 = -1; + this.fileIds[var8] = new int[var9]; - for (var11 = 0; var11 < var9; ++var11) { // L: 84 - var12 = this.fileIds[var8][var11] = var5 += var2.method6629(); // L: 85 - if (var12 > var10) { // L: 86 + for (var11 = 0; var11 < var9; ++var11) { + var12 = this.fileIds[var8][var11] = var5 += var2.method6838(); + if (var12 > var10) { var10 = var12; } } - this.files[var8] = new Object[var10 + 1]; // L: 88 + this.files[var8] = new Object[var10 + 1]; } } else { for (var7 = 0; var7 < this.groupCount; ++var7) { @@ -224,9 +212,9 @@ public abstract class AbstractArchive { var9 = this.fileCounts[var8]; var5 = 0; var10 = -1; - this.fileIds[var8] = new int[var9]; // L: 97 + this.fileIds[var8] = new int[var9]; - for (var11 = 0; var11 < var9; ++var11) { // L: 98 + for (var11 = 0; var11 < var9; ++var11) { var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); if (var12 > var10) { var10 = var12; @@ -238,13 +226,13 @@ public abstract class AbstractArchive { } if (var4 != 0) { - this.fileNameHashes = new int[var6 + 1][]; // L: 106 - this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107 + this.fileNameHashes = new int[var6 + 1][]; + this.fileNameHashTables = new IntHashTable[var6 + 1]; for (var7 = 0; var7 < this.groupCount; ++var7) { var8 = this.groupIds[var7]; var9 = this.fileCounts[var8]; - this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111 + this.fileNameHashes[var8] = new int[this.files[var8].length]; for (var10 = 0; var10 < var9; ++var10) { this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); @@ -259,28 +247,28 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("aj") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IIS)[B", - garbageValue = "-23090" + descriptor = "(III)[B", + garbageValue = "-1913425709" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II[II)[B", - garbageValue = "456038683" + descriptor = "(II[IB)[B", + garbageValue = "9" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125 - if (this.files[var1][var2] == null) { // L: 126 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { + if (this.files[var1][var2] == null) { boolean var4 = this.buildFiles(var1, var3); - if (!var4) { // L: 128 - this.loadGroup(var1); // L: 129 + if (!var4) { + this.loadGroup(var1); var4 = this.buildFiles(var1, var3); if (!var4) { return null; @@ -288,7 +276,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = class304.method5597(this.files[var1][var2], false); + byte[] var5 = MusicPatchNode.method4683(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } @@ -299,17 +287,17 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "974691239" + garbageValue = "-1899581217" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { - if (this.files[var1][var2] != null) { // L: 141 + if (this.files[var1][var2] != null) { return true; - } else if (this.groups[var1] != null) { // L: 142 + } else if (this.groups[var1] != null) { return true; } else { this.loadGroup(var1); @@ -320,29 +308,29 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("au") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "14" + descriptor = "(IS)Z", + garbageValue = "1775" ) - public boolean method5071(int var1) { + public boolean method5025(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { - return this.tryLoadFile(var1, 0); // L: 150 + return this.tryLoadFile(var1, 0); } else { - throw new RuntimeException(); // L: 151 + throw new RuntimeException(); } } - @ObfuscatedName("ay") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "14" + descriptor = "(IS)Z", + garbageValue = "2421" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { // L: 155 + if (this.groups[var1] != null) { return true; } else { this.loadGroup(var1); @@ -350,17 +338,17 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("am") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1206998992" + garbageValue = "109860486" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { boolean var1 = true; - for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163 - int var3 = this.groupIds[var2]; // L: 164 + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { + int var3 = this.groupIds[var2]; if (this.groups[var3] == null) { this.loadGroup(var3); if (this.groups[var3] == null) { @@ -369,13 +357,13 @@ public abstract class AbstractArchive { } } - return var1; // L: 170 + return var1; } - @ObfuscatedName("aa") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-1122798118" + garbageValue = "-2038224126" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -388,497 +376,349 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ai") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "1973943836" + garbageValue = "-2031467917" ) @Export("getFile") public byte[] getFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { if (this.files[var1][var2] == null) { - boolean var3 = this.buildFiles(var1, (int[])null); // L: 187 - if (!var3) { // L: 188 - this.loadGroup(var1); // L: 189 - var3 = this.buildFiles(var1, (int[])null); // L: 190 - if (!var3) { // L: 191 + boolean var3 = this.buildFiles(var1, (int[])null); + if (!var3) { + this.loadGroup(var1); + var3 = this.buildFiles(var1, (int[])null); + if (!var3) { return null; } } } - byte[] var4 = class304.method5597(this.files[var1][var2], false); // L: 194 - return var4; // L: 195 + byte[] var4 = MusicPatchNode.method4683(this.files[var1][var2], false); + return var4; } else { return null; } } - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "2061465489" + descriptor = "(IS)[B", + garbageValue = "31367" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { // L: 199 + if (this.files.length == 1) { return this.getFile(0, var1); } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); // L: 200 + return this.getFile(var1, 0); } else { - throw new RuntimeException(); // L: 201 + throw new RuntimeException(); } } - @ObfuscatedName("ax") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1723486034" + garbageValue = "1157862093" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { - return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210 + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("ar") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-404024789" + garbageValue = "108747634" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { - return this.files[var1].length; // L: 214 + return this.files[var1].length; } - @ObfuscatedName("af") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-95" + descriptor = "(I)I", + garbageValue = "-697151227" ) @Export("getGroupCount") public int getGroupCount() { - return this.files.length; // L: 218 + return this.files.length; } - @ObfuscatedName("bq") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "102" + garbageValue = "55" ) @Export("clearGroups") public void clearGroups() { - for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222 + for (int var1 = 0; var1 < this.groups.length; ++var1) { this.groups[var1] = null; } - } // L: 223 + } - @ObfuscatedName("bx") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "282074373" + garbageValue = "-1610512339" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { this.files[var1][var2] = null; } - } // L: 227 + } - @ObfuscatedName("bi") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-952876246" + descriptor = "(B)V", + garbageValue = "-6" ) @Export("clearFiles") public void clearFiles() { - for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230 - if (this.files[var1] != null) { // L: 231 - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232 + for (int var1 = 0; var1 < this.files.length; ++var1) { + if (this.files[var1] != null) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { this.files[var1][var2] = null; } } } - } // L: 235 + } - @ObfuscatedName("bz") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(I[IB)Z", - garbageValue = "0" + garbageValue = "-1" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { // L: 238 + if (this.groups[var1] == null) { return false; } else { - int var3 = this.fileCounts[var1]; // L: 239 - int[] var4 = this.fileIds[var1]; // L: 240 - Object[] var5 = this.files[var1]; // L: 241 - boolean var6 = true; // L: 242 + int var3 = this.fileCounts[var1]; + int[] var4 = this.fileIds[var1]; + Object[] var5 = this.files[var1]; + boolean var6 = true; - for (int var7 = 0; var7 < var3; ++var7) { // L: 243 - if (var5[var4[var7]] == null) { // L: 244 - var6 = false; // L: 245 + for (int var7 = 0; var7 < var3; ++var7) { + if (var5[var4[var7]] == null) { + var6 = false; break; } } - if (var6) { // L: 249 + if (var6) { return true; } else { byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251 - var21 = class304.method5597(this.groups[var1], false); // L: 256 + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { + var21 = MusicPatchNode.method4683(this.groups[var1], false); } else { - var21 = class304.method5597(this.groups[var1], true); // L: 252 - Buffer var8 = new Buffer(var21); // L: 253 - var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254 + var21 = MusicPatchNode.method4683(this.groups[var1], true); + Buffer var8 = new Buffer(var21); + var8.xteaDecrypt(var2, 5, var8.array.length); } - byte[] var25 = class106.decompressBytes(var21); // L: 259 - if (this.releaseGroups) { // L: 264 + byte[] var25 = GrandExchangeOfferOwnWorldComparator.decompressBytes(var21); + if (this.releaseGroups) { this.groups[var1] = null; } int var10; - if (var3 > 1) { // L: 265 - int var22 = var25.length; // L: 266 - --var22; // L: 267 + if (var3 > 1) { + int var22 = var25.length; + --var22; var10 = var25[var22] & 255; - var22 -= var3 * var10 * 4; // L: 268 - Buffer var11 = new Buffer(var25); // L: 269 - int[] var12 = new int[var3]; // L: 270 - var11.offset = var22; // L: 271 + var22 -= var10 * var3 * 4; + Buffer var11 = new Buffer(var25); + int[] var12 = new int[var3]; + var11.offset = var22; int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { // L: 272 - var14 = 0; // L: 273 + for (int var13 = 0; var13 < var10; ++var13) { + var14 = 0; - for (var15 = 0; var15 < var3; ++var15) { // L: 274 - var14 += var11.readInt(); // L: 275 - var12[var15] += var14; // L: 276 + for (var15 = 0; var15 < var3; ++var15) { + var14 += var11.readInt(); + var12[var15] += var14; } } - byte[][] var23 = new byte[var3][]; // L: 279 + byte[][] var23 = new byte[var3][]; - for (var14 = 0; var14 < var3; ++var14) { // L: 280 - var23[var14] = new byte[var12[var14]]; // L: 281 - var12[var14] = 0; // L: 282 + for (var14 = 0; var14 < var3; ++var14) { + var23[var14] = new byte[var12[var14]]; + var12[var14] = 0; } - var11.offset = var22; // L: 284 - var14 = 0; // L: 285 + var11.offset = var22; + var14 = 0; int var17; - for (var15 = 0; var15 < var10; ++var15) { // L: 286 - int var24 = 0; // L: 287 + for (var15 = 0; var15 < var10; ++var15) { + int var24 = 0; - for (var17 = 0; var17 < var3; ++var17) { // L: 288 - var24 += var11.readInt(); // L: 289 - System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 290 - var12[var17] += var24; // L: 291 - var14 += var24; // L: 292 + for (var17 = 0; var17 < var3; ++var17) { + var24 += var11.readInt(); + System.arraycopy(var25, var14, var23[var17], var12[var17], var24); + var12[var17] += var24; + var14 += var24; } } - for (var15 = 0; var15 < var3; ++var15) { // L: 295 - if (!this.shallowFiles) { // L: 296 - var17 = var4[var15]; // L: 298 - byte[] var19 = var23[var15]; // L: 300 + for (var15 = 0; var15 < var3; ++var15) { + if (!this.shallowFiles) { + var17 = var4[var15]; + byte[] var19 = var23[var15]; Object var18; - if (var19 == null) { // L: 302 - var18 = null; // L: 303 - } else if (var19.length > 136) { // L: 306 - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 308 - var20.set(var19); // L: 309 - var18 = var20; // L: 310 + if (var19 == null) { + var18 = null; + } else if (var19.length > 136) { + DirectByteArrayCopier var20 = new DirectByteArrayCopier(); + var20.set(var19); + var18 = var20; } else { - var18 = var19; // L: 315 + var18 = var19; } - var5[var17] = var18; // L: 317 + var5[var17] = var18; } else { - var5[var4[var15]] = var23[var15]; // L: 319 + var5[var4[var15]] = var23[var15]; } } - } else if (!this.shallowFiles) { // L: 323 - var10 = var4[0]; // L: 325 + } else if (!this.shallowFiles) { + var10 = var4[0]; Object var26; - if (var25 == null) { // L: 328 - var26 = null; // L: 329 - } else if (var25.length > 136) { // L: 332 - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 334 - var27.set(var25); // L: 335 - var26 = var27; // L: 336 + if (var25 == null) { + var26 = null; + } else if (var25.length > 136) { + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); + var27.set(var25); + var26 = var27; } else { - var26 = var25; // L: 341 + var26 = var25; } - var5[var10] = var26; // L: 343 + var5[var10] = var26; } else { - var5[var4[0]] = var25; // L: 345 + var5[var4[0]] = var25; } - return true; // L: 347 + return true; } } } - @ObfuscatedName("bb") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "48" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-2121805494" ) @Export("getGroupId") public int getGroupId(String var1) { - var1 = var1.toLowerCase(); // L: 351 - return this.groupNameHashTable.get(FontName.hashString(var1)); // L: 352 + var1 = var1.toLowerCase(); + return this.groupNameHashTable.get(GameEngine.hashString(var1)); } - @ObfuscatedName("bv") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)I", - garbageValue = "1136247668" + descriptor = "(ILjava/lang/String;B)I", + garbageValue = "59" ) @Export("getFileId") public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 356 - return this.fileNameHashTables[var1].get(FontName.hashString(var2)); // L: 357 + var2 = var2.toLowerCase(); + return this.fileNameHashTables[var1].get(GameEngine.hashString(var2)); } - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "-116" + garbageValue = "59" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 361 - var2 = var2.toLowerCase(); // L: 362 - int var3 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 363 - if (var3 < 0) { // L: 364 + var1 = var1.toLowerCase(); + var2 = var2.toLowerCase(); + int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(FontName.hashString(var2)); // L: 365 - return var4 >= 0; // L: 366 + int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2)); + return var4 >= 0; } } - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "1041405463" + garbageValue = "318235535" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 371 - var2 = var2.toLowerCase(); // L: 372 - int var3 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 373 - int var4 = this.fileNameHashTables[var3].get(FontName.hashString(var2)); // L: 374 - return this.takeFile(var3, var4); // L: 375 + var1 = var1.toLowerCase(); + var2 = var2.toLowerCase(); + int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2)); + return this.takeFile(var3, var4); + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "-997373263" + ) + @Export("tryLoadFileByNames") + public boolean tryLoadFileByNames(String var1, String var2) { + var1 = var1.toLowerCase(); + var2 = var2.toLowerCase(); + int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2)); + return this.tryLoadFile(var3, var4); } @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "1893660482" - ) - @Export("tryLoadFileByNames") - public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 379 - var2 = var2.toLowerCase(); // L: 380 - int var3 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 381 - int var4 = this.fileNameHashTables[var3].get(FontName.hashString(var2)); // L: 382 - return this.tryLoadFile(var3, var4); // L: 383 - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "2073972058" + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "1" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); // L: 387 - int var2 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 388 - return this.tryLoadGroup(var2); // L: 389 + var1 = var1.toLowerCase(); + int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + return this.tryLoadGroup(var2); } - @ObfuscatedName("br") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2081300499" + garbageValue = "-1368245074" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); // L: 393 - int var2 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 394 - if (var2 >= 0) { // L: 395 - this.loadRegionFromGroup(var2); // L: 396 + var1 = var1.toLowerCase(); + int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + if (var2 >= 0) { + this.loadRegionFromGroup(var2); } - } // L: 397 + } - @ObfuscatedName("bw") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "366192275" + garbageValue = "1304244240" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); // L: 400 - int var2 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 401 - return this.groupLoadPercent(var2); // L: 402 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lns;B)V", - garbageValue = "101" - ) - static final void method5160(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.field1372[var5] & 1) == 0) { // L: 93 - if (var1 > 0) { // L: 94 - --var1; // L: 95 - var10000 = Players.field1372; // L: 96 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 99 - if (var4 == 0) { // L: 100 - var1 = class244.method4805(var0); // L: 101 - var10000 = Players.field1372; // L: 102 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - GrandExchangeOfferWorldComparator.readPlayerUpdate(var0, var5); // L: 105 - } - } - } - } - - 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.field1372[var5] & 1) != 0) { // L: 115 - if (var1 > 0) { // L: 116 - --var1; // L: 117 - var10000 = Players.field1372; // L: 118 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 121 - if (var4 == 0) { // L: 122 - var1 = class244.method4805(var0); // L: 123 - var10000 = Players.field1372; // L: 124 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - GrandExchangeOfferWorldComparator.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.field1372[var5] & 1) != 0) { // L: 137 - if (var1 > 0) { // L: 138 - --var1; // L: 139 - var10000 = Players.field1372; // L: 140 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 143 - if (var4 == 0) { // L: 144 - var1 = class244.method4805(var0); // L: 145 - var10000 = Players.field1372; // L: 146 - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (class35.updateExternalPlayer(var0, var5)) { // L: 149 - var10000 = Players.field1372; - 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.field1372[var5] & 1) == 0) { // L: 159 - if (var1 > 0) { // L: 160 - --var1; // L: 161 - var10000 = Players.field1372; // L: 162 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 165 - if (var4 == 0) { // L: 166 - var1 = class244.method4805(var0); // L: 167 - var10000 = Players.field1372; // L: 168 - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (class35.updateExternalPlayer(var0, var5)) { // L: 171 - var10000 = Players.field1372; - 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.field1372; // 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("j") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1724921062" - ) - @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 + var1 = var1.toLowerCase(); + int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + return this.groupLoadPercent(var2); } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 391bb86774..64c8420385 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -3,29 +3,101 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("ig") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("b") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - AbstractByteArrayCopier() { - } // L: 4 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "895258324" + descriptor = "(B)[B", + garbageValue = "124" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "894306984" + garbageValue = "138258898" ) @Export("set") public abstract void set(byte[] var1); + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1662367088" + ) + public static void method4860() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "188753094" + ) + static final void method4858() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints > 0) { + --var0.hitpoints; + } + + if (var0.hitpoints == 0) { + if (var0.objectId < 0 || class127.method2561(var0.objectId, var0.field1009)) { + Renderable.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1012, var0.field1009); + var0.remove(); + } + } else { + if (var0.delay > 0) { + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { + if (var0.id >= 0) { + int var2 = var0.id; + int var3 = var0.field1016; + ObjectComposition var4 = ClanChannel.getObjectDefinition(var2); + if (var3 == 11) { + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { + var3 = 4; + } + + boolean var1 = var4.method2993(var3); + if (!var1) { + continue; + } + } + + Renderable.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1016); + var0.delay = -1; + if (var0.objectId == var0.id && var0.objectId == -1) { + var0.remove(); + } else if (var0.objectId == var0.id && var0.field1012 == var0.orientation && var0.field1009 == var0.field1016) { + var0.remove(); + } + } + } + } + + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1787819457" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + class171.method3555(); + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.invalidateIgnoreds(); + } + + } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index c8b855dce0..57683cc624 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,244 +4,244 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("kb") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "[Lof;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("AbstractFont_underline") static int AbstractFont_underline; @ObfuscatedName("k") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("pixels") byte[][] pixels; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("advances") int[] advances; @ObfuscatedName("v") @Export("widths") int[] widths; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("heights") int[] heights; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("topBearings") int[] topBearings; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("ascent") public int ascent; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("kerning") byte[] kerning; static { - AbstractFont_strike = -1; // L: 23 - AbstractFont_underline = -1; // L: 24 - AbstractFont_previousShadow = -1; // L: 25 - AbstractFont_shadow = -1; // L: 26 - AbstractFont_previousColor = 0; // L: 27 - AbstractFont_color = 0; // L: 28 - AbstractFont_alpha = 256; // L: 29 - AbstractFont_justificationTotal = 0; // L: 30 - AbstractFont_justificationCurrent = 0; // L: 31 - AbstractFont_random = new Random(); // L: 32 - AbstractFont_lines = new String[100]; // L: 33 + AbstractFont_strike = -1; + AbstractFont_underline = -1; + AbstractFont_previousShadow = -1; + AbstractFont_shadow = -1; + AbstractFont_previousColor = 0; + AbstractFont_color = 0; + AbstractFont_alpha = 256; + AbstractFont_justificationTotal = 0; + AbstractFont_justificationCurrent = 0; + AbstractFont_random = new Random(); + AbstractFont_lines = new String[100]; } AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { this.pixels = new byte[256][]; this.ascent = 0; - this.leftBearings = var2; // L: 36 - this.topBearings = var3; // L: 37 - this.widths = var4; // L: 38 - this.heights = var5; // L: 39 - this.readMetrics(var1); // L: 40 - this.pixels = var7; // L: 41 - int var8 = Integer.MAX_VALUE; // L: 42 - int var9 = Integer.MIN_VALUE; // L: 43 + this.leftBearings = var2; + this.topBearings = var3; + this.widths = var4; + this.heights = var5; + this.readMetrics(var1); + this.pixels = var7; + int var8 = Integer.MAX_VALUE; + int var9 = Integer.MIN_VALUE; - for (int var10 = 0; var10 < 256; ++var10) { // L: 44 - if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { // L: 45 + for (int var10 = 0; var10 < 256; ++var10) { + if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { var8 = this.topBearings[var10]; } - if (this.topBearings[var10] + this.heights[var10] > var9) { // L: 46 + if (this.topBearings[var10] + this.heights[var10] > var9) { var9 = this.topBearings[var10] + this.heights[var10]; } } - this.maxAscent = this.ascent - var8; // L: 48 - this.maxDescent = var9 - this.ascent; // L: 49 - } // L: 50 + this.maxAscent = this.ascent - var8; + this.maxDescent = var9 - this.ascent; + } AbstractFont(byte[] var1) { - this.pixels = new byte[256][]; // L: 12 - this.ascent = 0; // L: 18 - this.readMetrics(var1); // L: 53 - } // L: 54 + this.pixels = new byte[256][]; + this.ascent = 0; + this.readMetrics(var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("readMetrics") void readMetrics(byte[] var1) { - this.advances = new int[256]; // L: 57 + this.advances = new int[256]; int var2; - if (var1.length == 257) { // L: 58 - for (var2 = 0; var2 < this.advances.length; ++var2) { // L: 59 + if (var1.length == 257) { + for (var2 = 0; var2 < this.advances.length; ++var2) { this.advances[var2] = var1[var2] & 255; } - this.ascent = var1[256] & 255; // L: 60 + this.ascent = var1[256] & 255; } else { - var2 = 0; // L: 63 + var2 = 0; - for (int var3 = 0; var3 < 256; ++var3) { // L: 64 + for (int var3 = 0; var3 < 256; ++var3) { this.advances[var3] = var1[var2++] & 255; } - int[] var10 = new int[256]; // L: 65 - int[] var4 = new int[256]; // L: 66 + int[] var10 = new int[256]; + int[] var4 = new int[256]; int var5; - for (var5 = 0; var5 < 256; ++var5) { // L: 67 + for (var5 = 0; var5 < 256; ++var5) { var10[var5] = var1[var2++] & 255; } - for (var5 = 0; var5 < 256; ++var5) { // L: 68 + for (var5 = 0; var5 < 256; ++var5) { var4[var5] = var1[var2++] & 255; } - byte[][] var11 = new byte[256][]; // L: 69 + byte[][] var11 = new byte[256][]; int var8; - for (int var6 = 0; var6 < 256; ++var6) { // L: 70 - var11[var6] = new byte[var10[var6]]; // L: 71 - byte var7 = 0; // L: 72 + for (int var6 = 0; var6 < 256; ++var6) { + var11[var6] = new byte[var10[var6]]; + byte var7 = 0; - for (var8 = 0; var8 < var11[var6].length; ++var8) { // L: 73 - var7 += var1[var2++]; // L: 74 - var11[var6][var8] = var7; // L: 75 + for (var8 = 0; var8 < var11[var6].length; ++var8) { + var7 += var1[var2++]; + var11[var6][var8] = var7; } } - byte[][] var12 = new byte[256][]; // L: 78 + byte[][] var12 = new byte[256][]; int var13; - for (var13 = 0; var13 < 256; ++var13) { // L: 79 - var12[var13] = new byte[var10[var13]]; // L: 80 - byte var14 = 0; // L: 81 + for (var13 = 0; var13 < 256; ++var13) { + var12[var13] = new byte[var10[var13]]; + byte var14 = 0; - for (int var9 = 0; var9 < var12[var13].length; ++var9) { // L: 82 - var14 += var1[var2++]; // L: 83 - var12[var13][var9] = var14; // L: 84 + for (int var9 = 0; var9 < var12[var13].length; ++var9) { + var14 += var1[var2++]; + var12[var13][var9] = var14; } } - this.kerning = new byte[65536]; // L: 87 + this.kerning = new byte[65536]; - for (var13 = 0; var13 < 256; ++var13) { // L: 88 - if (var13 != 32 && var13 != 160) { // L: 89 - for (var8 = 0; var8 < 256; ++var8) { // L: 90 - if (var8 != 32 && var8 != 160) { // L: 91 - this.kerning[var8 + (var13 << 8)] = (byte)method5476(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 + for (var13 = 0; var13 < 256; ++var13) { + if (var13 != 32 && var13 != 160) { + for (var8 = 0; var8 < 256; ++var8) { + if (var8 != 32 && var8 != 160) { + this.kerning[var8 + (var13 << 8)] = (byte)method5448(var11, var12, var4, this.advances, var10, var13, var8); } } } } - this.ascent = var4[32] + var10[32]; // L: 95 + this.ascent = var4[32] + var10[32]; } - } // L: 97 + } - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("charWidth") int charWidth(char var1) { - if (var1 == 160) { // L: 122 + if (var1 == 160) { var1 = ' '; } - return this.advances[class125.charToByteCp1252(var1) & 255]; // L: 123 + return this.advances[ArchiveDiskActionHandler.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("stringWidth") public int stringWidth(String var1) { - if (var1 == null) { // L: 127 + if (var1 == null) { return 0; } else { - int var2 = -1; // L: 128 - int var3 = -1; // L: 129 - int var4 = 0; // L: 130 + int var2 = -1; + int var3 = -1; + int var4 = 0; - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 131 - char var6 = var1.charAt(var5); // L: 132 - if (var6 == '<') { // L: 133 - var2 = var5; // L: 134 + for (int var5 = 0; var5 < var1.length(); ++var5) { + char var6 = var1.charAt(var5); + if (var6 == '<') { + var2 = var5; } else { - if (var6 == '>' && var2 != -1) { // L: 137 - String var7 = var1.substring(var2 + 1, var5); // L: 138 - var2 = -1; // L: 139 - if (var7.equals("lt")) { // L: 140 + if (var6 == '>' && var2 != -1) { + String var7 = var1.substring(var2 + 1, var5); + var2 = -1; + if (var7.equals("lt")) { var6 = '<'; } else { - if (!var7.equals("gt")) { // L: 141 - if (var7.startsWith("img=")) { // L: 142 + if (!var7.equals("gt")) { + if (var7.startsWith("img=")) { try { - int var8 = FontName.method6335(var7.substring(4)); // L: 144 - var4 += AbstractFont_modIconSprites[var8].width; // L: 145 - var3 = -1; // L: 146 - } catch (Exception var10) { // L: 148 + int var8 = NetCache.method5088(var7.substring(4)); + var4 += AbstractFont_modIconSprites[var8].width; + var3 = -1; + } catch (Exception var10) { } } continue; @@ -251,426 +251,434 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var6 == 160) { // L: 153 + if (var6 == 160) { var6 = ' '; } - if (var2 == -1) { // L: 154 - var4 += this.advances[(char)(class125.charToByteCp1252(var6) & 255)]; // L: 155 - if (this.kerning != null && var3 != -1) { // L: 156 + if (var2 == -1) { + var4 += this.advances[(char)(ArchiveDiskActionHandler.charToByteCp1252(var6) & 255)]; + if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } - var3 = var6; // L: 157 + var3 = var6; } } } - return var4; // L: 160 + return var4; } } - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { - if (var1 == null) { // L: 164 + if (var1 == null) { return 0; } else { - int var4 = 0; // L: 165 - int var5 = 0; // L: 166 - StringBuilder var6 = new StringBuilder(100); // L: 167 - int var7 = -1; // L: 168 - int var8 = 0; // L: 169 - byte var9 = 0; // L: 170 - int var10 = -1; // L: 171 - char var11 = 0; // L: 172 - int var12 = 0; // L: 173 - int var13 = var1.length(); // L: 174 + int var4 = 0; + int var5 = 0; + StringBuilder var6 = new StringBuilder(100); + int var7 = -1; + int var8 = 0; + byte var9 = 0; + int var10 = -1; + char var11 = 0; + int var12 = 0; + int var13 = var1.length(); - for (int var14 = 0; var14 < var13; ++var14) { // L: 175 - char var15 = var1.charAt(var14); // L: 176 - if (var15 == '<') { // L: 177 - var10 = var14; // L: 178 + for (int var14 = 0; var14 < var13; ++var14) { + char var15 = var1.charAt(var14); + if (var15 == '<') { + var10 = var14; } else { - if (var15 == '>' && var10 != -1) { // L: 181 - String var16 = var1.substring(var10 + 1, var14); // L: 182 - var10 = -1; // L: 183 - var6.append('<'); // L: 184 - var6.append(var16); // L: 185 - var6.append('>'); // L: 186 - if (var16.equals("br")) { // L: 187 - var3[var12] = var6.toString().substring(var5, var6.length()); // L: 188 - ++var12; // L: 189 - var5 = var6.length(); // L: 190 - var4 = 0; // L: 191 - var7 = -1; // L: 192 - var11 = 0; // L: 193 - } else if (var16.equals("lt")) { // L: 195 - var4 += this.charWidth('<'); // L: 196 - if (this.kerning != null && var11 != -1) { // L: 197 + if (var15 == '>' && var10 != -1) { + String var16 = var1.substring(var10 + 1, var14); + var10 = -1; + var6.append('<'); + var6.append(var16); + var6.append('>'); + if (var16.equals("br")) { + var3[var12] = var6.toString().substring(var5, var6.length()); + ++var12; + var5 = var6.length(); + var4 = 0; + var7 = -1; + var11 = 0; + } else if (var16.equals("lt")) { + var4 += this.charWidth('<'); + if (this.kerning != null && var11 != -1) { var4 += this.kerning[(var11 << '\b') + 60]; } - var11 = '<'; // L: 198 - } else if (var16.equals("gt")) { // L: 200 - var4 += this.charWidth('>'); // L: 201 - if (this.kerning != null && var11 != -1) { // L: 202 + var11 = '<'; + } else if (var16.equals("gt")) { + var4 += this.charWidth('>'); + if (this.kerning != null && var11 != -1) { var4 += this.kerning[(var11 << '\b') + 62]; } - var11 = '>'; // L: 203 - } else if (var16.startsWith("img=")) { // L: 205 + var11 = '>'; + } else if (var16.startsWith("img=")) { try { - int var17 = FontName.method6335(var16.substring(4)); // L: 207 - var4 += AbstractFont_modIconSprites[var17].width; // L: 208 - var11 = 0; // L: 209 - } catch (Exception var20) { // L: 211 + int var17 = NetCache.method5088(var16.substring(4)); + var4 += AbstractFont_modIconSprites[var17].width; + var11 = 0; + } catch (Exception var20) { } } - var15 = 0; // L: 213 + var15 = 0; } - if (var10 == -1) { // L: 215 - if (var15 != 0) { // L: 216 - var6.append(var15); // L: 217 - var4 += this.charWidth(var15); // L: 218 - if (this.kerning != null && var11 != -1) { // L: 219 + if (var10 == -1) { + if (var15 != 0) { + var6.append(var15); + var4 += this.charWidth(var15); + if (this.kerning != null && var11 != -1) { var4 += this.kerning[var15 + (var11 << '\b')]; } - var11 = var15; // L: 220 + var11 = var15; } - if (var15 == ' ') { // L: 222 - var7 = var6.length(); // L: 223 - var8 = var4; // L: 224 - var9 = 1; // L: 225 + if (var15 == ' ') { + var7 = var6.length(); + var8 = var4; + var9 = 1; } - if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { // L: 227 - var3[var12] = var6.toString().substring(var5, var7 - var9); // L: 228 - ++var12; // L: 229 - var5 = var7; // L: 230 - var7 = -1; // L: 231 - var4 -= var8; // L: 232 - var11 = 0; // L: 233 + if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { + var3[var12] = var6.toString().substring(var5, var7 - var9); + ++var12; + var5 = var7; + var7 = -1; + var4 -= var8; + var11 = 0; } - if (var15 == '-') { // L: 235 - var7 = var6.length(); // L: 236 - var8 = var4; // L: 237 - var9 = 0; // L: 238 + if (var15 == '-') { + var7 = var6.length(); + var8 = var4; + var9 = 0; } } } } - String var19 = var6.toString(); // L: 242 - if (var19.length() > var5) { // L: 243 + String var19 = var6.toString(); + if (var19.length() > var5) { var3[var12++] = var19.substring(var5, var19.length()); } - return var12; // L: 244 + return var12; } } - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("lineWidth") public int lineWidth(String var1, int var2) { - int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248 - int var4 = 0; // L: 249 + int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + int var4 = 0; - for (int var5 = 0; var5 < var3; ++var5) { // L: 250 - int var6 = this.stringWidth(AbstractFont_lines[var5]); // L: 251 - if (var6 > var4) { // L: 252 + for (int var5 = 0; var5 < var3; ++var5) { + int var6 = this.stringWidth(AbstractFont_lines[var5]); + if (var6 > var4) { var4 = var6; } } - return var4; // L: 254 + return var4; } @ObfuscatedName("k") @Export("lineCount") public int lineCount(String var1, int var2) { - return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258 + return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { // L: 279 - this.reset(var4, var5); // L: 280 - this.draw0(var1, var2, var3); // L: 281 + if (var1 != null) { + this.reset(var4, var5); + this.draw0(var1, var2, var3); } - } // L: 282 - - @ObfuscatedName("x") - @Export("drawAlpha") - public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 285 - this.reset(var4, var5); // L: 286 - AbstractFont_alpha = var6; // L: 287 - this.draw0(var1, var2, var3); // L: 288 - } - } // L: 289 + } @ObfuscatedName("u") + @Export("drawAlpha") + public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { + if (var1 != null) { + this.reset(var4, var5); + AbstractFont_alpha = var6; + this.draw0(var1, var2, var3); + } + } + + @ObfuscatedName("e") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { // L: 292 - this.reset(var4, var5); // L: 293 - this.draw0(var1, var2 - this.stringWidth(var1), var3); // L: 294 + if (var1 != null) { + this.reset(var4, var5); + this.draw0(var1, var2 - this.stringWidth(var1), var3); } - } // L: 295 + } - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { // L: 298 - this.reset(var4, var5); // L: 299 - this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); // L: 300 + if (var1 != null) { + this.reset(var4, var5); + this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); } - } // L: 301 + } - @ObfuscatedName("s") + @ObfuscatedName("i") @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: 304 + if (var1 == null) { return 0; } else { - this.reset(var6, var7); // L: 305 - if (var10 == 0) { // L: 306 + this.reset(var6, var7); + if (var10 == 0) { var10 = this.ascent; } - int[] var11 = new int[]{var4}; // L: 307 - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { // L: 308 + int[] var11 = new int[]{var4}; + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { var11 = null; } - int var12 = this.breakLines(var1, var11, AbstractFont_lines); // L: 309 - if (var9 == 3 && var12 == 1) { // L: 311 + int var12 = this.breakLines(var1, var11, AbstractFont_lines); + if (var9 == 3 && var12 == 1) { var9 = 1; } int var13; int var14; - if (var9 == 0) { // L: 312 + if (var9 == 0) { var13 = var3 + this.maxAscent; - } else if (var9 == 1) { // L: 313 + } else if (var9 == 1) { var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { // L: 314 + } else if (var9 == 2) { var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); // L: 316 - if (var14 < 0) { // L: 317 + var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); + if (var14 < 0) { var14 = 0; } - var13 = var3 + var14 + this.maxAscent; // L: 318 - var10 += var14; // L: 319 + var13 = var3 + var14 + this.maxAscent; + var10 += var14; } - for (var14 = 0; var14 < var12; ++var14) { // L: 321 + for (var14 = 0; var14 < var12; ++var14) { if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); // L: 322 - } else if (var8 == 1) { // L: 323 + this.draw0(AbstractFont_lines[var14], var2, var13); + } else if (var8 == 1) { this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { // L: 324 + } else if (var8 == 2) { this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if (var14 == var12 - 1) { // L: 326 + } else if (var14 == var12 - 1) { this.draw0(AbstractFont_lines[var14], var2, var13); } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); // L: 328 - this.draw0(AbstractFont_lines[var14], var2, var13); // L: 329 - AbstractFont_justificationTotal = 0; // L: 330 + this.calculateLineJustification(AbstractFont_lines[var14], var4); + this.draw0(AbstractFont_lines[var14], var2, var13); + AbstractFont_justificationTotal = 0; } - var13 += var10; // L: 333 + var13 += var10; } - return var12; // L: 335 + return var12; } } - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 339 - this.reset(var4, var5); // L: 340 - int[] var7 = new int[var1.length()]; // L: 341 + if (var1 != null) { + this.reset(var4, var5); + int[] var7 = new int[var1.length()]; - for (int var8 = 0; var8 < var1.length(); ++var8) { // L: 342 + for (int var8 = 0; var8 < var1.length(); ++var8) { var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); // L: 343 + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); } - } // L: 344 + } - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 347 - this.reset(var4, var5); // L: 348 - int[] var7 = new int[var1.length()]; // L: 349 - int[] var8 = new int[var1.length()]; // L: 350 + if (var1 != null) { + this.reset(var4, var5); + int[] var7 = new int[var1.length()]; + int[] var8 = new int[var1.length()]; - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 351 - var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); // L: 352 - var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); // L: 353 + for (int var9 = 0; var9 < var1.length(); ++var9) { + var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); + var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); // L: 355 + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); } - } // L: 356 + } - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 != null) { // L: 359 - this.reset(var4, var5); // L: 360 - double var8 = 7.0D - (double)var7 / 8.0D; // L: 361 - if (var8 < 0.0D) { // L: 362 + if (var1 != null) { + this.reset(var4, var5); + double var8 = 7.0D - (double)var7 / 8.0D; + if (var8 < 0.0D) { var8 = 0.0D; } - int[] var10 = new int[var1.length()]; // L: 363 + int[] var10 = new int[var1.length()]; - for (int var11 = 0; var11 < var1.length(); ++var11) { // L: 364 + for (int var11 = 0; var11 < var1.length(); ++var11) { var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); // L: 365 + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); } - } // L: 366 + } - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 369 - this.reset(var4, var5); // L: 370 - AbstractFont_random.setSeed((long)var6); // L: 371 - AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); // L: 372 - int[] var7 = new int[var1.length()]; // L: 373 - int var8 = 0; // L: 374 + if (var1 != null) { + this.reset(var4, var5); + AbstractFont_random.setSeed((long)var6); + AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); + int[] var7 = new int[var1.length()]; + int var8 = 0; - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 375 - var7[var9] = var8; // L: 376 - if ((AbstractFont_random.nextInt() & 3) == 0) { // L: 377 + for (int var9 = 0; var9 < var1.length(); ++var9) { + var7[var9] = var8; + if ((AbstractFont_random.nextInt() & 3) == 0) { ++var8; } } - this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); // L: 379 + this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); } - } // L: 380 + } - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("reset") void reset(int var1, int var2) { - AbstractFont_strike = -1; // L: 383 - AbstractFont_underline = -1; // L: 384 - AbstractFont_previousShadow = var2; // L: 385 + AbstractFont_strike = -1; + AbstractFont_underline = -1; + AbstractFont_previousShadow = var2; AbstractFont_shadow = var2; - AbstractFont_previousColor = var1; // L: 386 + AbstractFont_previousColor = var1; AbstractFont_color = var1; - AbstractFont_alpha = 256; // L: 387 - AbstractFont_justificationTotal = 0; // L: 388 - AbstractFont_justificationCurrent = 0; // L: 389 - } // L: 390 + AbstractFont_alpha = 256; + AbstractFont_justificationTotal = 0; + AbstractFont_justificationCurrent = 0; + } - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("decodeTag") void decodeTag(String var1) { try { - if (var1.startsWith("col=")) { // L: 394 - AbstractFont_color = ItemContainer.method2183(var1.substring(4), 16); - } else if (var1.equals("/col")) { // L: 395 + if (var1.startsWith("col=")) { + AbstractFont_color = class125.method2540(var1.substring(4), 16); + } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { // L: 396 - AbstractFont_strike = ItemContainer.method2183(var1.substring(4), 16); - } else if (var1.equals("str")) { // L: 397 - AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { // L: 398 - AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { // L: 399 - AbstractFont_underline = ItemContainer.method2183(var1.substring(2), 16); - } else if (var1.equals("u")) { // L: 400 - AbstractFont_underline = 0; - } else if (var1.equals("/u")) { // L: 401 - AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { // L: 402 - AbstractFont_shadow = ItemContainer.method2183(var1.substring(5), 16); - } else if (var1.equals("shad")) { // L: 403 - AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { // L: 404 - AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { // L: 405 - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); + } else { + int var2; + String var3; + if (var1.startsWith("str=")) { + var3 = var1.substring(4); + var2 = ScriptFrame.method852(var3, 16, true); + AbstractFont_strike = var2; + } else if (var1.equals("str")) { + AbstractFont_strike = 8388608; + } else if (var1.equals("/str")) { + AbstractFont_strike = -1; + } else if (var1.startsWith("u=")) { + AbstractFont_underline = class125.method2540(var1.substring(2), 16); + } else if (var1.equals("u")) { + AbstractFont_underline = 0; + } else if (var1.equals("/u")) { + AbstractFont_underline = -1; + } else if (var1.startsWith("shad=")) { + var3 = var1.substring(5); + var2 = ScriptFrame.method852(var3, 16, true); + AbstractFont_shadow = var2; + } else if (var1.equals("shad")) { + AbstractFont_shadow = 0; + } else if (var1.equals("/shad")) { + AbstractFont_shadow = AbstractFont_previousShadow; + } else if (var1.equals("br")) { + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); + } } - } catch (Exception var3) { // L: 407 + } catch (Exception var5) { } - } // L: 408 + } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; // L: 411 - boolean var4 = false; // L: 412 + int var3 = 0; + boolean var4 = false; - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 413 - char var6 = var1.charAt(var5); // L: 414 - if (var6 == '<') { // L: 415 + for (int var5 = 0; var5 < var1.length(); ++var5) { + char var6 = var1.charAt(var5); + if (var6 == '<') { var4 = true; - } else if (var6 == '>') { // L: 416 + } else if (var6 == '>') { var4 = false; - } else if (!var4 && var6 == ' ') { // L: 417 + } else if (!var4 && var6 == ' ') { ++var3; } } - if (var3 > 0) { // L: 419 + if (var3 > 0) { AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } // L: 420 + } - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; // L: 423 - int var4 = -1; // L: 424 - int var5 = -1; // L: 425 + var3 -= this.ascent; + int var4 = -1; + int var5 = -1; - for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 426 - if (var1.charAt(var6) != 0) { // L: 427 - char var7 = (char)(class125.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428 - if (var7 == '<') { // L: 429 - var4 = var6; // L: 430 + for (int var6 = 0; var6 < var1.length(); ++var6) { + if (var1.charAt(var6) != 0) { + char var7 = (char)(ArchiveDiskActionHandler.charToByteCp1252(var1.charAt(var6)) & 255); + if (var7 == '<') { + var4 = var6; } else { int var9; - if (var7 == '>' && var4 != -1) { // L: 433 - String var8 = var1.substring(var4 + 1, var6); // L: 434 - var4 = -1; // L: 435 - if (var8.equals("lt")) { // L: 436 + if (var7 == '>' && var4 != -1) { + String var8 = var1.substring(var4 + 1, var6); + var4 = -1; + if (var8.equals("lt")) { var7 = '<'; } else { - if (!var8.equals("gt")) { // L: 437 - if (var8.startsWith("img=")) { // L: 438 + if (!var8.equals("gt")) { + if (var8.startsWith("img=")) { try { - var9 = FontName.method6335(var8.substring(4)); // L: 440 - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 441 - var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 442 - var2 += var10.width; // L: 443 - var5 = -1; // L: 444 - } catch (Exception var14) { // L: 446 + var9 = NetCache.method5088(var8.substring(4)); + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; + var10.drawAt(var2, var3 + this.ascent - var10.height); + var2 += var10.width; + var5 = -1; + } catch (Exception var14) { } } else { - this.decodeTag(var8); // L: 450 + this.decodeTag(var8); } continue; } @@ -679,103 +687,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { // L: 454 + if (var7 == 160) { var7 = ' '; } - if (var4 == -1) { // L: 455 - if (this.kerning != null && var5 != -1) { // L: 456 + if (var4 == -1) { + if (this.kerning != null && var5 != -1) { var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; // L: 457 - var9 = this.heights[var7]; // L: 458 - if (var7 != ' ') { // L: 459 - if (AbstractFont_alpha == 256) { // L: 460 - if (AbstractFont_shadow != -1) { // L: 461 + int var12 = this.widths[var7]; + var9 = this.heights[var7]; + if (var7 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 462 + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); } else { - if (AbstractFont_shadow != -1) { // L: 465 + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 466 + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); } - } else if (AbstractFont_justificationTotal > 0) { // L: 470 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 471 - var2 += AbstractFont_justificationCurrent >> 8; // L: 472 - AbstractFont_justificationCurrent &= 255; // L: 473 + } else if (AbstractFont_justificationTotal > 0) { + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; + var2 += AbstractFont_justificationCurrent >> 8; + AbstractFont_justificationCurrent &= 255; } - int var13 = this.advances[var7]; // L: 476 - if (AbstractFont_strike != -1) { // L: 477 + int var13 = this.advances[var7]; + if (AbstractFont_strike != -1) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 478 + if (AbstractFont_underline != -1) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; // L: 479 - var5 = var7; // L: 480 + var2 += var13; + var5 = var7; } } } } - } // L: 483 + } - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; // L: 486 - int var6 = -1; // L: 487 - int var7 = -1; // L: 488 - int var8 = 0; // L: 489 + var3 -= this.ascent; + int var6 = -1; + int var7 = -1; + int var8 = 0; - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 490 - if (var1.charAt(var9) != 0) { // L: 491 - char var10 = (char)(class125.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492 - if (var10 == '<') { // L: 493 - var6 = var9; // L: 494 + for (int var9 = 0; var9 < var1.length(); ++var9) { + if (var1.charAt(var9) != 0) { + char var10 = (char)(ArchiveDiskActionHandler.charToByteCp1252(var1.charAt(var9)) & 255); + if (var10 == '<') { + var6 = var9; } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { // L: 497 - String var11 = var1.substring(var6 + 1, var9); // L: 498 - var6 = -1; // L: 499 - if (var11.equals("lt")) { // L: 500 + if (var10 == '>' && var6 != -1) { + String var11 = var1.substring(var6 + 1, var9); + var6 = -1; + if (var11.equals("lt")) { var10 = '<'; } else { - if (!var11.equals("gt")) { // L: 501 - if (var11.startsWith("img=")) { // L: 502 + if (!var11.equals("gt")) { + if (var11.startsWith("img=")) { try { - if (var4 != null) { // L: 505 + if (var4 != null) { var12 = var4[var8]; } else { - var12 = 0; // L: 506 + var12 = 0; } - if (var5 != null) { // L: 508 + if (var5 != null) { var13 = var5[var8]; } else { - var13 = 0; // L: 509 + var13 = 0; } - ++var8; // L: 510 - var14 = FontName.method6335(var11.substring(4)); // L: 511 - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 512 - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 513 - var2 += var15.width; // L: 514 - var7 = -1; // L: 515 - } catch (Exception var19) { // L: 517 + ++var8; + var14 = NetCache.method5088(var11.substring(4)); + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); + var2 += var15.width; + var7 = -1; + } catch (Exception var19) { } } else { - this.decodeTag(var11); // L: 521 + this.decodeTag(var11); } continue; } @@ -784,284 +792,284 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { // L: 525 + if (var10 == 160) { var10 = ' '; } - if (var6 == -1) { // L: 526 - if (this.kerning != null && var7 != -1) { // L: 527 + if (var6 == -1) { + if (this.kerning != null && var7 != -1) { var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; // L: 528 - var12 = this.heights[var10]; // L: 529 - if (var4 != null) { // L: 531 + int var17 = this.widths[var10]; + var12 = this.heights[var10]; + if (var4 != null) { var13 = var4[var8]; } else { - var13 = 0; // L: 532 + var13 = 0; } - if (var5 != null) { // L: 534 + if (var5 != null) { var14 = var5[var8]; } else { - var14 = 0; // L: 535 + var14 = 0; } - ++var8; // L: 536 - if (var10 != ' ') { // L: 537 - if (AbstractFont_alpha == 256) { // L: 538 - if (AbstractFont_shadow != -1) { // L: 539 + ++var8; + if (var10 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 540 + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); } else { - if (AbstractFont_shadow != -1) { // L: 543 + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 544 + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); } - } else if (AbstractFont_justificationTotal > 0) { // L: 548 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 549 - var2 += AbstractFont_justificationCurrent >> 8; // L: 550 - AbstractFont_justificationCurrent &= 255; // L: 551 + } else if (AbstractFont_justificationTotal > 0) { + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; + var2 += AbstractFont_justificationCurrent >> 8; + AbstractFont_justificationCurrent &= 255; } - int var18 = this.advances[var10]; // L: 554 - if (AbstractFont_strike != -1) { // L: 555 + int var18 = this.advances[var10]; + if (AbstractFont_strike != -1) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 556 + if (AbstractFont_underline != -1) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; // L: 557 - var7 = var10; // L: 558 + var2 += var18; + var7 = var10; } } } } - } // L: 561 + } - @ObfuscatedName("h") - static int method5476(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { - int var7 = var2[var5]; // L: 100 - int var8 = var7 + var4[var5]; // L: 101 - int var9 = var2[var6]; // L: 102 - int var10 = var9 + var4[var6]; // L: 103 - int var11 = var7; // L: 104 - if (var9 > var7) { // L: 105 + @ObfuscatedName("o") + static int method5448(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + int var7 = var2[var5]; + int var8 = var7 + var4[var5]; + int var9 = var2[var6]; + int var10 = var9 + var4[var6]; + int var11 = var7; + if (var9 > var7) { var11 = var9; } - int var12 = var8; // L: 106 - if (var10 < var8) { // L: 107 + int var12 = var8; + if (var10 < var8) { var12 = var10; } - int var13 = var3[var5]; // L: 108 - if (var3[var6] < var13) { // L: 109 + int var13 = var3[var5]; + if (var3[var6] < var13) { var13 = var3[var6]; } - byte[] var14 = var1[var5]; // L: 110 - byte[] var15 = var0[var6]; // L: 111 - int var16 = var11 - var7; // L: 112 - int var17 = var11 - var9; // L: 113 + byte[] var14 = var1[var5]; + byte[] var15 = var0[var6]; + int var16 = var11 - var7; + int var17 = var11 - var9; - for (int var18 = var11; var18 < var12; ++var18) { // L: 114 - int var19 = var14[var16++] + var15[var17++]; // L: 115 - if (var19 < var13) { // L: 116 + for (int var18 = var11; var18 < var12; ++var18) { + int var19 = var14[var16++] + var15[var17++]; + if (var19 < var13) { var13 = var19; } } - return -var13; // L: 118 + return -var13; } - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("escapeBrackets") public static String escapeBrackets(String var0) { - int var1 = var0.length(); // L: 262 - int var2 = 0; // L: 263 + int var1 = var0.length(); + int var2 = 0; - for (int var3 = 0; var3 < var1; ++var3) { // L: 264 - char var4 = var0.charAt(var3); // L: 265 + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); if (var4 == '<' || var4 == '>') { - var2 += 3; // L: 266 + var2 += 3; } } - StringBuilder var6 = new StringBuilder(var1 + var2); // L: 268 + StringBuilder var6 = new StringBuilder(var1 + var2); - for (int var7 = 0; var7 < var1; ++var7) { // L: 269 - char var5 = var0.charAt(var7); // L: 270 + for (int var7 = 0; var7 < var1; ++var7) { + char var5 = var0.charAt(var7); if (var5 == '<') { - var6.append(""); // L: 271 - } else if (var5 == '>') { // L: 272 + var6.append(""); + } else if (var5 == '>') { var6.append(""); } else { - var6.append(var5); // L: 273 + var6.append(var5); } } - return var6.toString(); // L: 275 + return var6.toString(); } - @ObfuscatedName("at") + @ObfuscatedName("al") @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: 567 - int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 568 - int var8 = 0; // L: 569 - int var9 = 0; // L: 570 + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var7 = Rasterizer2D.Rasterizer2D_width - var3; + int var8 = 0; + int var9 = 0; int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 571 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 572 - var4 -= var10; // L: 573 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 574 - var9 += var3 * var10; // L: 575 - var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 576 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var10; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var9 += var3 * var10; + var6 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 578 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 579 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 580 - var3 -= var10; // L: 581 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 582 - var9 += var10; // L: 583 - var6 += var10; // L: 584 - var8 += var10; // L: 585 - var7 += var10; // L: 586 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var10; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var9 += var10; + var6 += var10; + var8 += var10; + var7 += var10; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 588 - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 589 - var3 -= var10; // L: 590 - var8 += var10; // L: 591 - var7 += var10; // L: 592 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var10; + var8 += var10; + var7 += var10; } - if (var3 > 0 && var4 > 0) { // L: 594 - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 595 + if (var3 > 0 && var4 > 0) { + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); } - } // L: 596 + } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @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: 599 - var5 = -(var5 & 3); // L: 600 + int var9 = -(var5 >> 2); + var5 = -(var5 & 3); - for (int var10 = -var6; var10 < 0; ++var10) { // L: 601 + for (int var10 = -var6; var10 < 0; ++var10) { int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 602 - if (var1[var3++] != 0) { // L: 603 + for (var11 = var9; var11 < 0; ++var11) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 604 + ++var4; } - if (var1[var3++] != 0) { // L: 605 + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 606 + ++var4; } - if (var1[var3++] != 0) { // L: 607 + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 608 + ++var4; } - if (var1[var3++] != 0) { // L: 609 + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 610 + ++var4; } } - for (var11 = var5; var11 < 0; ++var11) { // L: 612 - if (var1[var3++] != 0) { // L: 613 + for (var11 = var5; var11 < 0; ++var11) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 614 + ++var4; } } - var4 += var7; // L: 616 - var3 += var8; // L: 617 + var4 += var7; + var3 += var8; } - } // L: 619 + } - @ObfuscatedName("az") + @ObfuscatedName("aa") @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: 622 - int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 623 - int var9 = 0; // L: 624 - int var10 = 0; // L: 625 + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var8 = Rasterizer2D.Rasterizer2D_width - var3; + int var9 = 0; + int var10 = 0; int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 626 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 627 - var4 -= var11; // L: 628 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 629 - var10 += var3 * var11; // L: 630 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 631 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var11; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var10 += var3 * var11; + var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 633 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 634 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 635 - var3 -= var11; // L: 636 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 637 - var10 += var11; // L: 638 - var7 += var11; // L: 639 - var9 += var11; // L: 640 - var8 += var11; // L: 641 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var11; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var10 += var11; + var7 += var11; + var9 += var11; + var8 += var11; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 643 - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 644 - var3 -= var11; // L: 645 - var9 += var11; // L: 646 - var8 += var11; // L: 647 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var11; + var9 += var11; + var8 += var11; } - if (var3 > 0 && var4 > 0) { // L: 649 - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 650 + if (var3 > 0 && var4 > 0) { + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); } - } // L: 651 + } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @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: 654 - var9 = 256 - var9; // L: 655 + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; + var9 = 256 - var9; - for (int var10 = -var6; var10 < 0; ++var10) { // L: 656 - for (int var11 = -var5; var11 < 0; ++var11) { // L: 657 - if (var1[var3++] != 0) { // L: 658 - int var12 = var0[var4]; // L: 659 - var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 660 + for (int var10 = -var6; var10 < 0; ++var10) { + for (int var11 = -var5; var11 < 0; ++var11) { + if (var1[var3++] != 0) { + int var12 = var0[var4]; + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; } else { - ++var4; // L: 662 + ++var4; } } - var4 += var7; // L: 664 - var3 += var8; // L: 665 + var4 += var7; + var3 += var8; } - } // L: 667 + } } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index c51ed81005..775474b11e 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,51 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("om") +@ObfuscatedName("ox") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { @ObfuscatedName("v") @Export("pixels") public int[] pixels; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1710221011 + intValue = -691531169 ) @Export("width") public int width; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2113427401 + intValue = 1766666421 ) @Export("height") public int height; protected AbstractRasterProvider() { - } // L: 8 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-474214385" + descriptor = "(IIB)V", + garbageValue = "-13" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "640" + descriptor = "(IIIII)V", + garbageValue = "-984138546" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-832848769" + descriptor = "(B)V", + garbageValue = "45" ) @Export("apply") public final void apply() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 - } // L: 12 + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "16" + ) + public static void method7053() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + } } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 098e639356..44a8899a79 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -1,92 +1,77 @@ 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("lk") +@ObfuscatedName("lp") @Implements("AbstractSocket") public abstract class AbstractSocket { - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "Lkj;" + @ObfuscatedName("rz") + @ObfuscatedGetter( + intValue = 352918735 ) - @Export("fontPlain12") - static Font fontPlain12; + static int field3874; protected AbstractSocket() { - } // L: 7 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1854440694" + descriptor = "(S)V", + garbageValue = "-27454" ) @Export("close") public abstract void close(); - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "574875272" + garbageValue = "1311148246" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2063198043" + descriptor = "(B)I", + garbageValue = "88" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2019948581" + descriptor = "(IB)Z", + garbageValue = "-60" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-334344092" + garbageValue = "1814286008" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1206684972" + descriptor = "([BIIB)V", + garbageValue = "-30" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("r") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Loa;", - garbageValue = "-2039946675" + descriptor = "(B)V", + garbageValue = "88" ) - static SpritePixels method5940() { - SpritePixels var0 = new SpritePixels(); // L: 124 - var0.width = class397.SpriteBuffer_spriteWidth; // L: 125 - var0.height = class244.SpriteBuffer_spriteHeight; // L: 126 - var0.xOffset = class397.SpriteBuffer_xOffsets[0]; // L: 127 - var0.yOffset = class26.SpriteBuffer_yOffsets[0]; // L: 128 - var0.subWidth = Canvas.SpriteBuffer_spriteWidths[0]; // L: 129 - var0.subHeight = Clock.SpriteBuffer_spriteHeights[0]; // L: 130 - int var1 = var0.subHeight * var0.subWidth; // L: 131 - byte[] var2 = class126.SpriteBuffer_pixels[0]; // L: 132 - var0.pixels = new int[var1]; // L: 133 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 134 - var0.pixels[var3] = class397.SpriteBuffer_spritePalette[var2[var3] & 255]; - } - - ArchiveDisk.method5993(); // L: 135 - return var0; // L: 136 + static void method5924() { + Login.loginIndex = 24; + Client.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index d96d5bd5c7..1c191c1e01 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,13 +2,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bj") +@ObfuscatedName("aj") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("position") int position; AbstractSound() { - } // L: 10 + } } diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 4738d3dab3..1ed4722106 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -4,42 +4,59 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("ly") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("e") + @ObfuscatedName("n") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("t") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { - } // L: 8 + } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "809923869" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "118" ) @Export("addComparator") final void addComparator(Comparator var1) { - if (this.nextComparator == null) { // L: 11 - this.nextComparator = var1; // L: 12 - } else if (this.nextComparator instanceof AbstractUserComparator) { // L: 14 - ((AbstractUserComparator)this.nextComparator).addComparator(var1); // L: 15 + if (this.nextComparator == null) { + this.nextComparator = var1; + } else if (this.nextComparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.nextComparator).addComparator(var1); } - } // L: 17 + } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Llf;Llf;B)I", - garbageValue = "62" + descriptor = "(Llm;Llm;I)I", + garbageValue = "1954626737" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { - return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); // L: 20 21 + return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 25 + return super.equals(var1); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "427246269" + ) + public static String method5813(CharSequence var0) { + String var1 = Varcs.base37DecodeLong(class287.method5201(var0)); + if (var1 == null) { + var1 = ""; + } + + return var1; } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index b062d08691..8f7acce065 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -5,248 +5,231 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fk") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1453035113 + intValue = 189428749 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1514255955 + intValue = -443583549 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -721187647 + intValue = -2120803321 ) @Export("regionX") int regionX; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -338323933 + intValue = -1865243023 ) @Export("regionY") int regionY; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -75895465 + intValue = 851664485 ) @Export("minPlane") int minPlane; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1081572037 + intValue = 1526795569 ) @Export("planes") int planes; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -418249645 + intValue = 734373105 ) @Export("groupId") int groupId; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 873736715 + intValue = -1590073095 ) @Export("fileId") int fileId; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; @ObfuscatedName("k") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("g") - byte[][][] field2068; - @ObfuscatedName("t") - byte[][][] field2074; - @ObfuscatedName("x") + @ObfuscatedName("a") + byte[][][] field2056; + @ObfuscatedName("q") + byte[][][] field2057; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[[[[Lfw;" + descriptor = "[[[[Lfl;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("u") - boolean field2066; - @ObfuscatedName("q") - boolean field2073; + @ObfuscatedName("e") + boolean field2059; + @ObfuscatedName("c") + boolean field2055; AbstractWorldMapData() { - this.groupId = -1; // L: 14 - this.fileId = -1; // L: 15 + this.groupId = -1; + this.fileId = -1; new LinkedList(); - this.field2066 = false; // L: 26 - this.field2073 = false; // L: 27 - } // L: 29 + this.field2059 = false; + this.field2055 = false; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1563875465" + descriptor = "(Lnv;I)V", + garbageValue = "-1489554607" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1807805876" + descriptor = "(B)Z", + garbageValue = "-64" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2066 && this.field2073; // L: 32 + return this.field2059 && this.field2055; } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "39585450" + descriptor = "(Ljy;I)V", + garbageValue = "-882466387" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { - if (!this.isFullyLoaded()) { // L: 36 - byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 - if (var2 != null) { // L: 38 - this.readGeography(new Buffer(var2)); // L: 39 - this.field2066 = true; // L: 40 - this.field2073 = true; // L: 41 + if (!this.isFullyLoaded()) { + byte[] var2 = var1.takeFile(this.groupId, this.fileId); + if (var2 != null) { + this.readGeography(new Buffer(var2)); + this.field2059 = true; + this.field2055 = true; } } - } // L: 43 + } - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "84" + descriptor = "(I)V", + garbageValue = "1710471414" ) @Export("reset") void reset() { - this.floorUnderlayIds = null; // L: 46 - this.floorOverlayIds = null; // L: 47 - this.field2068 = null; // L: 48 - this.field2074 = null; // L: 49 - this.decorations = null; // L: 50 - this.field2066 = false; // L: 51 - this.field2073 = false; // L: 52 - } // L: 53 + this.floorUnderlayIds = null; + this.floorOverlayIds = null; + this.field2056 = null; + this.field2057 = null; + this.decorations = null; + this.field2059 = false; + this.field2055 = false; + } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IILnt;B)V", - garbageValue = "-90" + descriptor = "(IILnv;B)V", + garbageValue = "80" ) @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.method3683(var1, var2, var3, var4); // L: 61 + int var4 = var3.readUnsignedByte(); + if (var4 != 0) { + if ((var4 & 1) != 0) { + this.method3615(var1, var2, var3, var4); } else { - this.method3693(var1, var2, var3, var4); // L: 64 + this.method3614(var1, var2, var3, var4); } } - } // L: 58 66 + } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IILnt;IB)V", - garbageValue = "-56" + descriptor = "(IILnv;II)V", + garbageValue = "-657714466" ) - void method3683(int var1, int var2, Buffer var3, int var4) { - boolean var5 = (var4 & 2) != 0; // L: 69 - if (var5) { // L: 70 - this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71 + void method3615(int var1, int var2, Buffer var3, int var4) { + boolean var5 = (var4 & 2) != 0; + if (var5) { + this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 - } // L: 74 + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + } - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IILnt;II)V", - garbageValue = "-1310691805" + descriptor = "(IILnv;IB)V", + garbageValue = "127" ) - void method3693(int var1, int var2, Buffer var3, int var4) { - int var5 = ((var4 & 24) >> 3) + 1; // L: 77 - boolean var6 = (var4 & 2) != 0; // L: 78 - boolean var7 = (var4 & 4) != 0; // L: 79 - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 + void method3614(int var1, int var2, Buffer var3, int var4) { + int var5 = ((var4 & 24) >> 3) + 1; + boolean var6 = (var4 & 2) != 0; + boolean var7 = (var4 & 4) != 0; + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); int var8; int var9; int var11; - if (var6) { // L: 81 - var8 = var3.readUnsignedByte(); // L: 82 + if (var6) { + var8 = var3.readUnsignedByte(); - for (var9 = 0; var9 < var8; ++var9) { // L: 83 - int var14 = var3.readUnsignedByte(); // L: 84 - if (var14 != 0) { // L: 85 - this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 - var11 = var3.readUnsignedByte(); // L: 87 - this.field2068[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field2074[var9][var1][var2] = (byte)(var11 & 3); + for (var9 = 0; var9 < var8; ++var9) { + int var14 = var3.readUnsignedByte(); + if (var14 != 0) { + this.floorOverlayIds[var9][var1][var2] = (short)var14; + var11 = var3.readUnsignedByte(); + this.field2056[var9][var1][var2] = (byte)(var11 >> 2); + this.field2057[var9][var1][var2] = (byte)(var11 & 3); } } } - if (var7) { // L: 93 - for (var8 = 0; var8 < var5; ++var8) { // L: 94 - var9 = var3.readUnsignedByte(); // L: 95 - if (var9 != 0) { // L: 96 - WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 + if (var7) { + for (var8 = 0; var8 < var5; ++var8) { + var9 = var3.readUnsignedByte(); + if (var9 != 0) { + WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; - for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method6630(); // L: 101 - int var13 = var3.readUnsignedByte(); // L: 102 - var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 + for (var11 = 0; var11 < var9; ++var11) { + int var12 = var3.method6674(); + int var13 = var3.readUnsignedByte(); + var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } } } } - } // L: 107 + } - @ObfuscatedName("aw") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1191625155" + descriptor = "(B)I", + garbageValue = "-98" ) @Export("getRegionX") int getRegionX() { - return this.regionX; // L: 112 + return this.regionX; } - @ObfuscatedName("ak") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "210506971" + garbageValue = "-750308465" ) @Export("getRegionY") int getRegionY() { - return this.regionY; // L: 116 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljava/lang/String;Ljava/lang/String;I)Lkj;", - garbageValue = "907646932" - ) - public static Font method3696(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); // L: 89 - int var5 = var0.getFileId(var4, var3); // L: 90 - return Bounds.method6034(var0, var1, var4, var5); // L: 91 + return this.regionY; } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index ea82ca4a59..14d3ac5ffd 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,249 +4,1011 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gr") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lij;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lij;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1204437349 + intValue = -1062254253 ) @Export("screenX") int screenX; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -525287981 + intValue = 800966133 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Liw;Liw;)V" + descriptor = "(Lij;Lij;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { - this.coord1 = var1; // L: 13 - this.coord2 = var2; // L: 14 - } // L: 15 + this.coord1 = var1; + this.coord2 = var2; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1717389517" + garbageValue = "995404902" ) @Export("getElement") public abstract int getElement(); @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lfd;", - garbageValue = "1736510941" + descriptor = "(B)Lff;", + garbageValue = "5" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-60" + descriptor = "(I)I", + garbageValue = "1077868698" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-401407374" + garbageValue = "-1851510146" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("n") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "370652147" + descriptor = "(IIB)Z", + garbageValue = "-67" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { - if (this.elementFitsScreen(var1, var2)) { // L: 18 - return true; // L: 19 + if (this.elementFitsScreen(var1, var2)) { + return true; } else { - return this.labelFitsScreen(var1, var2); // L: 21 + return this.labelFitsScreen(var1, var2); } } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "53" + descriptor = "(I)Z", + garbageValue = "808950261" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "-88" + garbageValue = "2" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { - if (!this.hasValidElement()) { // L: 37 + if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = Archive.WorldMapElement_get(this.getElement()); // L: 38 - int var4 = this.getSubWidth(); // L: 39 - int var5 = this.getSubHeight(); // L: 40 - switch(var3.horizontalAlignment.value) { // L: 41 + WorldMapElement var3 = HealthBarUpdate.WorldMapElement_get(this.getElement()); + int var4 = this.getSubWidth(); + int var5 = this.getSubHeight(); + switch(var3.horizontalAlignment.value) { case 0: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 44 + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { + break; + } + + return false; + case 1: + if (var1 >= this.screenX && var1 < var4 + this.screenX) { + break; + } + + return false; + case 2: + if (var1 <= this.screenX - var4 || var1 > this.screenX) { + return false; + } + } + + switch(var3.verticalAlignment.value) { + case 0: + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { return false; } break; case 1: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 54 + if (var2 > this.screenY - var5 && var2 <= this.screenY) { break; } return false; case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 49 + if (var2 < this.screenY || var2 >= var5 + this.screenY) { return false; } } - switch(var3.verticalAlignment.value) { // L: 58 - case 0: - if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 66 - break; - } - - return false; - case 1: - if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 71 - break; - } - - return false; - case 2: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 61 - return false; - } - } - - return true; // L: 75 + return true; } } - @ObfuscatedName("a") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-663056522" + garbageValue = "2093916255" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { - WorldMapLabel var3 = this.getLabel(); // L: 79 - if (var3 == null) { // L: 80 - return false; // L: 81 - } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83 - return var2 >= this.screenY && var2 <= this.screenY + var3.height; // L: 84 + WorldMapLabel var3 = this.getLabel(); + if (var3 == null) { + return false; + } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { + return var2 >= this.screenY && var2 <= this.screenY + var3.height; } else { - return false; // L: 85 + return false; } } - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "-860022326" + descriptor = "(Ljy;Ljy;ZLkt;B)V", + garbageValue = "67" ) - public static int method3787(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 25 - int var6 = var3; // L: 26 - var3 = var4; // L: 27 - var4 = var6; // L: 28 - } + public static void method3719(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + SoundSystem.ItemDefinition_archive = var0; + class339.ItemDefinition_modelArchive = var1; + class144.ItemDefinition_inMembersWorld = var2; + FloorUnderlayDefinition.ItemDefinition_fileCount = SoundSystem.ItemDefinition_archive.getGroupFileCount(10); + ArchiveLoader.ItemDefinition_fontPlain11 = var3; + } - var2 &= 3; // L: 30 - if (var2 == 0) { // L: 31 - return var0; - } else if (var2 == 1) { // L: 32 - return var1; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "-81" + ) + static final boolean method3714(char var0) { + if (Character.isISOControl(var0)) { + return false; + } else if (class267.isAlphaNumeric(var0)) { + return true; } else { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 33 34 - } - } + char[] var1 = class367.field4124; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1784757970" - ) - public static int method3785(int var0, int var1, int var2) { - int var3 = UserComparator2.method6890(var2 - var1 + 1); // L: 51 - var3 <<= var1; // L: 52 - return var0 & ~var3; // L: 53 - } - - @ObfuscatedName("fz") - @ObfuscatedSignature( - descriptor = "(Liv;III)V", - garbageValue = "605397793" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3812 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3813 - SpriteMask var3 = var0.getSpriteMask(true); // L: 3814 - if (var3 == null) { // L: 3815 - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3816 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3817 - if (var3.contains(var4, var5)) { // L: 3818 - var4 -= var3.width / 2; // L: 3819 - var5 -= var3.height / 2; // L: 3820 - int var6 = Client.camAngleY & 2047; // L: 3821 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3822 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3823 - int var9 = var5 * var7 + var4 * var8 >> 11; // L: 3824 - int var10 = var5 * var8 - var4 * var7 >> 11; // L: 3825 - int var11 = var9 + class262.localPlayer.x >> 7; // L: 3826 - int var12 = class262.localPlayer.y - var10 >> 7; // L: 3827 - PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); // L: 3829 - var13.packetBuffer.writeByte(18); // L: 3830 - var13.packetBuffer.writeShort(var12 + WorldMapSprite.baseY); // L: 3831 - var13.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3832 - var13.packetBuffer.method6649(var11 + class15.baseX); // L: 3833 - var13.packetBuffer.writeByte(var4); // L: 3834 - var13.packetBuffer.writeByte(var5); // L: 3835 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 3836 - var13.packetBuffer.writeByte(57); // L: 3837 - var13.packetBuffer.writeByte(0); // L: 3838 - var13.packetBuffer.writeByte(0); // L: 3839 - var13.packetBuffer.writeByte(89); // L: 3840 - var13.packetBuffer.writeShort(class262.localPlayer.x); // L: 3841 - var13.packetBuffer.writeShort(class262.localPlayer.y); // L: 3842 - var13.packetBuffer.writeByte(63); // L: 3843 - Client.packetWriter.addNode(var13); // L: 3844 - Client.destinationX = var11; // L: 3845 - Client.destinationY = var12; // L: 3846 + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; } } + var1 = class367.field4126; + + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + + return false; } - } // L: 3849 + } + + @ObfuscatedName("ew") + @ObfuscatedSignature( + descriptor = "(I)Lmr;", + garbageValue = "-1758491092" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return PcmPlayer.worldMap; + } + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1049971110" + ) + @Export("load") + static void load() { + int var21; + if (Client.titleLoadingStage == 0) { + WorldMapIcon_1.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var21 = 0; var21 < 4; ++var21) { + Client.collisionMaps[var21] = new CollisionMap(104, 104); + } + + class376.sceneMinimapSprite = new SpritePixels(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.titleLoadingStage = 20; + } else if (Client.titleLoadingStage == 20) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.titleLoadingStage = 30; + } else if (Client.titleLoadingStage == 30) { + class120.archive0 = UserComparator5.newArchive(0, false, true, true); + Language.archive1 = UserComparator5.newArchive(1, false, true, true); + ItemLayer.archive2 = UserComparator5.newArchive(2, true, false, true); + Decimator.archive3 = UserComparator5.newArchive(3, false, true, true); + InvDefinition.archive4 = UserComparator5.newArchive(4, false, true, true); + Skeleton.archive5 = UserComparator5.newArchive(5, true, true, true); + class108.archive6 = UserComparator5.newArchive(6, true, true, true); + class74.archive7 = UserComparator5.newArchive(7, false, true, true); + class270.archive8 = UserComparator5.newArchive(8, false, true, true); + class126.archive9 = UserComparator5.newArchive(9, false, true, true); + ClanChannelMember.archive10 = UserComparator5.newArchive(10, false, true, true); + class339.archive11 = UserComparator5.newArchive(11, false, true, true); + ApproximateRouteStrategy.archive12 = UserComparator5.newArchive(12, false, true, true); + ClanChannel.archive13 = UserComparator5.newArchive(13, true, false, true); + ItemLayer.archive14 = UserComparator5.newArchive(14, false, true, true); + Tiles.archive15 = UserComparator5.newArchive(15, false, true, true); + GameEngine.archive17 = UserComparator5.newArchive(17, true, true, true); + class15.archive18 = UserComparator5.newArchive(18, false, true, true); + Decimator.archive19 = UserComparator5.newArchive(19, false, true, true); + ClanMate.archive20 = UserComparator5.newArchive(20, false, true, true); + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.titleLoadingStage = 40; + } else if (Client.titleLoadingStage != 40) { + Archive var12; + Archive var13; + Archive var14; + if (Client.titleLoadingStage == 45) { + ArchiveLoader.method1781(22050, !Client.isLowDetail, 2); + MidiPcmStream var19 = new MidiPcmStream(); + var19.method4481(9, 128); + WorldMapDecoration.pcmPlayer0 = NetSocket.method2634(GameEngine.taskHandler, 0, 22050); + WorldMapDecoration.pcmPlayer0.setStream(var19); + var12 = Tiles.archive15; + var13 = ItemLayer.archive14; + var14 = InvDefinition.archive4; + class234.musicPatchesArchive = var12; + class234.musicSamplesArchive = var13; + class234.soundEffectsArchive = var14; + class234.midiPcmStream = var19; + VarcInt.pcmPlayer1 = NetSocket.method2634(GameEngine.taskHandler, 1, 2048); + TileItem.pcmStreamMixer = new PcmStreamMixer(); + VarcInt.pcmPlayer1.setStream(TileItem.pcmStreamMixer); + FloorOverlayDefinition.decimator = new Decimator(22050, GrandExchangeOfferAgeComparator.field3633); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + ClientPacket.WorldMapElement_fonts = new Fonts(class270.archive8, ClanChannel.archive13); + } else { + int var1; + if (Client.titleLoadingStage == 50) { + FontName[] var18 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13}; + var1 = var18.length; + Fonts var22 = ClientPacket.WorldMapElement_fonts; + FontName[] var23 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13}; + Client.fontsMap = var22.createMap(var23); + if (Client.fontsMap.size() < var1) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; + Login.Login_loadingPercent = 40; + } else { + GrandExchangeOfferOwnWorldComparator.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + WorldMapDecorationType.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + TaskHandler.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + ServerPacket.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; + } + } else { + int var3; + if (Client.titleLoadingStage == 60) { + var12 = ClanChannelMember.archive10; + var13 = class270.archive8; + var3 = 0; + if (var12.tryLoadFileByNames("title.jpg", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("logo", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("logo_deadman_mode", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("logo_seasonal_mode", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("titlebox", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("titlebutton", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("runes", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("title_mute", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("options_radio_buttons,0", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("options_radio_buttons,2", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("options_radio_buttons,4", "")) { + ++var3; + } + + if (var13.tryLoadFileByNames("options_radio_buttons,6", "")) { + ++var3; + } + + var13.tryLoadFileByNames("sl_back", ""); + var13.tryLoadFileByNames("sl_flags", ""); + var13.tryLoadFileByNames("sl_arrows", ""); + var13.tryLoadFileByNames("sl_stars", ""); + var13.tryLoadFileByNames("sl_button", ""); + byte var20 = 12; + if (var3 < var20) { + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var20 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + class16.updateGameState(5); + Client.titleLoadingStage = 70; + } + } else if (Client.titleLoadingStage == 70) { + if (!ItemLayer.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + ItemLayer.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else { + Archive var17 = ItemLayer.archive2; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var17; + Projectile.method1702(ItemLayer.archive2); + var12 = ItemLayer.archive2; + var13 = class74.archive7; + KitDefinition.KitDefinition_archive = var12; + ClientPreferences.KitDefinition_modelsArchive = var13; + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + class110.method2318(ItemLayer.archive2, class74.archive7, Client.isLowDetail); + var14 = ItemLayer.archive2; + Archive var15 = class74.archive7; + NPCComposition.NpcDefinition_archive = var14; + NPCComposition.NpcDefinition_modelArchive = var15; + Archive var5 = ItemLayer.archive2; + StructComposition.StructDefinition_archive = var5; + method3719(ItemLayer.archive2, class74.archive7, Client.isMembersWorld, GrandExchangeOfferOwnWorldComparator.fontPlain11); + Archive var6 = ItemLayer.archive2; + Archive var7 = class120.archive0; + Archive var8 = Language.archive1; + SequenceDefinition.SequenceDefinition_archive = var6; + SequenceDefinition.SequenceDefinition_animationsArchive = var7; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var8; + UrlRequest.method2141(ItemLayer.archive2, class74.archive7); + FriendSystem.method1452(ItemLayer.archive2); + World.method1403(ItemLayer.archive2); + class137.method2686(Decimator.archive3, class74.archive7, class270.archive8, ClanChannel.archive13); + class78.method1969(ItemLayer.archive2); + Archive var9 = ItemLayer.archive2; + EnumComposition.EnumDefinition_archive = var9; + Archive var10 = ItemLayer.archive2; + VarcInt.VarcInt_archive = var10; + BufferedNetSocket.method5956(ItemLayer.archive2); + class99.field1271 = new class371(MouseRecorder.field975, 54, GrandExchangeOfferWorldComparator.clientLanguage, ItemLayer.archive2); + GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites = new class371(MouseRecorder.field975, 47, GrandExchangeOfferWorldComparator.clientLanguage, ItemLayer.archive2); + Decimator.varcs = new Varcs(); + ModeWhere.method5251(ItemLayer.archive2, class270.archive8, ClanChannel.archive13); + ModeWhere.method5237(ItemLayer.archive2, class270.archive8); + class370.method6509(ItemLayer.archive2, class270.archive8); + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; + } + } else if (Client.titleLoadingStage == 80) { + var21 = 0; + if (ObjectSound.compass == null) { + ObjectSound.compass = ViewportMouse.SpriteBuffer_getSprite(class270.archive8, WorldMapAreaData.spriteIds.compass, 0); + } else { + ++var21; + } + + if (class144.redHintArrowSprite == null) { + class144.redHintArrowSprite = ViewportMouse.SpriteBuffer_getSprite(class270.archive8, WorldMapAreaData.spriteIds.field3915, 0); + } else { + ++var21; + } + + if (NetFileRequest.mapSceneSprites == null) { + NetFileRequest.mapSceneSprites = FileSystem.method2628(class270.archive8, WorldMapAreaData.spriteIds.mapScenes, 0); + } else { + ++var21; + } + + if (UserComparator4.headIconPkSprites == null) { + UserComparator4.headIconPkSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.headIconsPk, 0); + } else { + ++var21; + } + + if (StudioGame.headIconPrayerSprites == null) { + StudioGame.headIconPrayerSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3910, 0); + } else { + ++var21; + } + + if (SpotAnimationDefinition.headIconHintSprites == null) { + SpotAnimationDefinition.headIconHintSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3912, 0); + } else { + ++var21; + } + + if (FloorUnderlayDefinition.mapMarkerSprites == null) { + FloorUnderlayDefinition.mapMarkerSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3908, 0); + } else { + ++var21; + } + + if (Varcs.crossSprites == null) { + Varcs.crossSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3914, 0); + } else { + ++var21; + } + + if (class126.mapDotSprites == null) { + class126.mapDotSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3913, 0); + } else { + ++var21; + } + + if (Message.scrollBarSprites == null) { + Message.scrollBarSprites = FileSystem.method2628(class270.archive8, WorldMapAreaData.spriteIds.field3911, 0); + } else { + ++var21; + } + + if (class249.modIconSprites == null) { + class249.modIconSprites = FileSystem.method2628(class270.archive8, WorldMapAreaData.spriteIds.field3917, 0); + } else { + ++var21; + } + + if (var21 < 11) { + Login.Login_loadingText = "Loading sprites - " + var21 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = class249.modIconSprites; + class144.redHintArrowSprite.normalize(); + var1 = (int)(Math.random() * 21.0D) - 10; + int var2 = (int)(Math.random() * 21.0D) - 10; + var3 = (int)(Math.random() * 21.0D) - 10; + int var4 = (int)(Math.random() * 41.0D) - 20; + NetFileRequest.mapSceneSprites[0].shiftColors(var4 + var1, var4 + var2, var3 + var4); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; + } + } else if (Client.titleLoadingStage == 90) { + if (!class126.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + WorldMapSprite.textureProvider = new TextureProvider(class126.archive9, class270.archive8, 20, Decimator.clientPreferences.field1117, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(WorldMapSprite.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(Decimator.clientPreferences.field1117); + Client.titleLoadingStage = 100; + } + } else if (Client.titleLoadingStage == 100) { + var21 = WorldMapSprite.textureProvider.getLoadedPercentage(); + if (var21 < 100) { + Login.Login_loadingText = "Loading textures - " + var21 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.titleLoadingStage = 110; + } + } else if (Client.titleLoadingStage == 110) { + class6.mouseRecorder = new MouseRecorder(); + GameEngine.taskHandler.newThreadTask(class6.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!ClanChannelMember.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var0 = new Huffman(ClanChannelMember.archive10.takeFileByNames("huffman", "")); + class101.method2229(var0); + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; + } + } else if (Client.titleLoadingStage == 130) { + if (!Decimator.archive3.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + Decimator.archive3.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!ApproximateRouteStrategy.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + ApproximateRouteStrategy.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!ClanChannel.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + ClanChannel.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; + } else { + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + Client.titleLoadingStage = 140; + } + } else if (Client.titleLoadingStage == 140) { + Login.Login_loadingPercent = 100; + if (!Decimator.archive19.tryLoadGroupByName(WorldMapCacheName.field2117.name)) { + Login.Login_loadingText = "Loading world map - " + Decimator.archive19.groupLoadPercentByName(WorldMapCacheName.field2117.name) / 10 + "%"; + } else { + if (PcmPlayer.worldMap == null) { + PcmPlayer.worldMap = new WorldMap(); + PcmPlayer.worldMap.init(Decimator.archive19, class15.archive18, ClanMate.archive20, TaskHandler.fontBold12, Client.fontsMap, NetFileRequest.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; + } + } else if (Client.titleLoadingStage == 150) { + class16.updateGameState(10); + } + } + } + } else { + byte var11 = 0; + var21 = var11 + class120.archive0.percentage() * 4 / 100; + var21 += Language.archive1.percentage() * 4 / 100; + var21 += ItemLayer.archive2.percentage() * 2 / 100; + var21 += Decimator.archive3.percentage() * 2 / 100; + var21 += InvDefinition.archive4.percentage() * 6 / 100; + var21 += Skeleton.archive5.percentage() * 4 / 100; + var21 += class108.archive6.percentage() * 2 / 100; + var21 += class74.archive7.percentage() * 56 / 100; + var21 += class270.archive8.percentage() * 2 / 100; + var21 += class126.archive9.percentage() * 2 / 100; + var21 += ClanChannelMember.archive10.percentage() * 2 / 100; + var21 += class339.archive11.percentage() * 2 / 100; + var21 += ApproximateRouteStrategy.archive12.percentage() * 2 / 100; + var21 += ClanChannel.archive13.percentage() * 2 / 100; + var21 += ItemLayer.archive14.percentage() * 2 / 100; + var21 += Tiles.archive15.percentage() * 2 / 100; + var21 += Decimator.archive19.percentage() / 100; + var21 += class15.archive18.percentage() / 100; + var21 += ClanMate.archive20.percentage() / 100; + var21 += GameEngine.archive17.method4955() && GameEngine.archive17.isFullyLoaded() ? 1 : 0; + if (var21 != 100) { + if (var21 != 0) { + Login.Login_loadingText = "Checking for updates - " + var21 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + UserComparator4.method2143(class120.archive0, "Animations"); + UserComparator4.method2143(Language.archive1, "Skeletons"); + UserComparator4.method2143(InvDefinition.archive4, "Sound FX"); + UserComparator4.method2143(Skeleton.archive5, "Maps"); + UserComparator4.method2143(class108.archive6, "Music Tracks"); + UserComparator4.method2143(class74.archive7, "Models"); + UserComparator4.method2143(class270.archive8, "Sprites"); + UserComparator4.method2143(class339.archive11, "Music Jingles"); + UserComparator4.method2143(ItemLayer.archive14, "Music Samples"); + UserComparator4.method2143(Tiles.archive15, "Music Patches"); + UserComparator4.method2143(Decimator.archive19, "World Map"); + UserComparator4.method2143(class15.archive18, "World Map Geography"); + UserComparator4.method2143(ClanMate.archive20, "World Map Ground"); + WorldMapAreaData.spriteIds = new GraphicsDefaults(); + WorldMapAreaData.spriteIds.decode(GameEngine.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; + } + } + } + + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1981855199" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + if (MouseHandler.localPlayer.x >> 7 == Client.destinationX && MouseHandler.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + UserComparator4.method2149(); + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + ApproximateRouteStrategy.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + } + + ClanChannel.addNpcsToScene(true); + int var4 = Players.Players_count; + int[] var5 = Players.Players_indices; + + int var6; + for (var6 = 0; var6 < var4; ++var6) { + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { + ApproximateRouteStrategy.addPlayerToScene(Client.players[var5[var6]], true); + } + } + + ClanChannel.addNpcsToScene(false); + ItemContainer.method1793(); + class52.method1653(); + Interpreter.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + int var7; + int var8; + int var9; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int var18; + int var19; + int var28; + if (!Client.isCameraLocked) { + var4 = Client.camAngleX; + if (Client.field492 / 256 > var4) { + var4 = Client.field492 / 256; + } + + if (Client.field655[4] && Client.field608[4] + 128 > var4) { + var4 = Client.field608[4] + 128; + } + + var28 = Client.camAngleY & 2047; + var6 = KeyHandler.oculusOrbFocalPointX; + var7 = class270.field3532; + var8 = ArchiveDiskAction.oculusOrbFocalPointY; + var9 = var4 * 3 + 600; + var12 = var3 - 334; + if (var12 < 0) { + var12 = 0; + } else if (var12 > 100) { + var12 = 100; + } + + var13 = (Client.zoomWidth - Client.zoomHeight) * var12 / 100 + Client.zoomHeight; + var11 = var13 * var9 / 256; + var12 = 2048 - var4 & 2047; + var13 = 2048 - var28 & 2047; + var14 = 0; + var15 = 0; + var16 = var11; + int var17; + if (var12 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var12]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var19 = var15 * var18 - var11 * var17 >> 16; + var16 = var15 * var17 + var11 * var18 >> 16; + var15 = var19; + } + + if (var13 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var13]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var13]; + var19 = var17 * var16 + var14 * var18 >> 16; + var16 = var16 * var18 - var17 * var14 >> 16; + var14 = var19; + } + + ItemContainer.cameraX = var6 - var14; + Bounds.cameraY = var7 - var15; + WorldMapArchiveLoader.cameraZ = var8 - var16; + class116.cameraPitch = var4; + class117.cameraYaw = var28; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (KeyHandler.oculusOrbFocalPointX >> 7 != MouseHandler.localPlayer.x >> 7 || ArchiveDiskAction.oculusOrbFocalPointY >> 7 != MouseHandler.localPlayer.y >> 7)) { + var17 = MouseHandler.localPlayer.plane; + var18 = (KeyHandler.oculusOrbFocalPointX >> 7) + GrandExchangeOfferNameComparator.baseX; + var19 = (ArchiveDiskAction.oculusOrbFocalPointY >> 7) + NPC.baseY; + class342.method6089(var18, var19, var17, true); + } + } + + if (!Client.isCameraLocked) { + var4 = UserComparator4.method2150(); + } else { + var4 = ItemLayer.method3791(); + } + + var28 = ItemContainer.cameraX; + var6 = Bounds.cameraY; + var7 = WorldMapArchiveLoader.cameraZ; + var8 = class116.cameraPitch; + var9 = class117.cameraYaw; + + int var10; + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field655[var10]) { + var11 = (int)(Math.random() * (double)(Client.field436[var10] * 2 + 1) - (double)Client.field436[var10] + Math.sin((double)Client.field658[var10] / 100.0D * (double)Client.field659[var10]) * (double)Client.field608[var10]); + if (var10 == 0) { + ItemContainer.cameraX += var11; + } + + if (var10 == 1) { + Bounds.cameraY += var11; + } + + if (var10 == 2) { + WorldMapArchiveLoader.cameraZ += var11; + } + + if (var10 == 3) { + class117.cameraYaw = var11 + class117.cameraYaw & 2047; + } + + if (var10 == 4) { + class116.cameraPitch += var11; + if (class116.cameraPitch < 128) { + class116.cameraPitch = 128; + } + + if (class116.cameraPitch > 383) { + class116.cameraPitch = 383; + } + } + } + } + + var10 = MouseHandler.MouseHandler_x; + var11 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var10 = MouseHandler.MouseHandler_lastPressedX; + var11 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { + var12 = var10 - var0; + var13 = var11 - var1; + ViewportMouse.ViewportMouse_x = var12; + ViewportMouse.ViewportMouse_y = var13; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; + } else { + ItemContainer.method1783(); + } + + class262.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class262.playPcmPlayers(); + var12 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + WorldMapIcon_1.scene.draw(ItemContainer.cameraX, Bounds.cameraY, WorldMapArchiveLoader.cameraZ, class116.cameraPitch, class117.cameraYaw, var4); + Rasterizer3D.Rasterizer3D_zoom = var12; + class262.playPcmPlayers(); + WorldMapIcon_1.scene.clearTempGameObjects(); + Client.overheadTextCount = 0; + boolean var32 = false; + var14 = -1; + var15 = -1; + var16 = Players.Players_count; + int[] var29 = Players.Players_indices; + + for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { + Object var31; + if (var18 < var16) { + var31 = Client.players[var29[var18]]; + if (var29[var18] == Client.combatTargetPlayerIndex) { + var32 = true; + var14 = var18; + continue; + } + + if (var31 == MouseHandler.localPlayer) { + var15 = var18; + continue; + } + } else { + var31 = Client.npcs[Client.npcIndices[var18 - var16]]; + } + + VertexNormal.drawActor2d((Actor)var31, var18, var0, var1, var2, var3); + } + + if (Client.renderSelf && var15 != -1) { + VertexNormal.drawActor2d(MouseHandler.localPlayer, var15, var0, var1, var2, var3); + } + + if (var32) { + VertexNormal.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); + } + + for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { + var19 = Client.overheadTextXs[var18]; + int var20 = Client.overheadTextYs[var18]; + int var21 = Client.overheadTextXOffsets[var18]; + int var22 = Client.overheadTextAscents[var18]; + boolean var23 = true; + + while (var23) { + var23 = false; + + for (int var30 = 0; var30 < var18; ++var30) { + if (var20 + 2 > Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] && var20 - var22 < Client.overheadTextYs[var30] + 2 && var19 - var21 < Client.overheadTextXOffsets[var30] + Client.overheadTextXs[var30] && var19 + var21 > Client.overheadTextXs[var30] - Client.overheadTextXOffsets[var30] && Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] < var20) { + var20 = Client.overheadTextYs[var30] - Client.overheadTextAscents[var30]; + var23 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var18]; + Client.viewportTempY = Client.overheadTextYs[var18] = var20; + String var24 = Client.overheadText[var18]; + if (Client.chatEffects == 0) { + int var25 = 16776960; + if (Client.overheadTextColors[var18] < 6) { + var25 = Client.field626[Client.overheadTextColors[var18]]; + } + + if (Client.overheadTextColors[var18] == 6) { + var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var18] == 7) { + var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var18] == 8) { + var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var26; + if (Client.overheadTextColors[var18] == 9) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 1280 + 16711680; + } else if (var26 < 100) { + var25 = 16776960 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var18] == 10) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 5 + 16711680; + } else if (var26 < 100) { + var25 = 16711935 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; + } + } + + if (Client.overheadTextColors[var18] == 11) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = 16777215 - var26 * 327685; + } else if (var26 < 100) { + var25 = (var26 - 50) * 327685 + 65280; + } else if (var26 < 150) { + var25 = 16777215 - (var26 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var18] == 0) { + TaskHandler.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); + } + + if (Client.overheadTextEffects[var18] == 1) { + TaskHandler.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 2) { + TaskHandler.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 3) { + TaskHandler.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); + } + + if (Client.overheadTextEffects[var18] == 4) { + var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (TaskHandler.fontBold12.stringWidth(var24) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + TaskHandler.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var18] == 5) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + int var27 = 0; + if (var26 < 25) { + var27 = var26 - 25; + } else if (var26 > 125) { + var27 = var26 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - TaskHandler.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + TaskHandler.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + TaskHandler.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + + if (Client.hintArrowType == 2) { + FriendLoginUpdate.worldToScreen((Client.hintArrowX - GrandExchangeOfferNameComparator.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - NPC.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + SpotAnimationDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field555); + Client.field521 = 0; + var13 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; + var14 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; + if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { + Client.field521 = 1; + } + + if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { + Client.field521 = 1; + } + + if (Client.field521 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { + Client.field521 = 0; + } + + ItemContainer.cameraX = var28; + Bounds.cameraY = var6; + WorldMapArchiveLoader.cameraZ = var7; + class116.cameraPitch = var8; + class117.cameraYaw = var9; + if (Client.isLoading) { + byte var33 = 0; + var14 = var33 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; + if (var14 == 0) { + Client.isLoading = false; + } + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait.", false); + } + + } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index bf7b640bd0..c056ecc040 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,147 +9,131 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") +@ObfuscatedName("nx") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("y") - static byte[][][] field4098; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("file") RandomAccessFile file; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 3438090752021469399L + longValue = 2753236496434466989L ) @Export("maxSize") final long maxSize; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 5591435214435484409L + longValue = 8595229954339447849L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (var3 == -1L) { // L: 11 + if (-1L == var3) { var3 = Long.MAX_VALUE; } - if (var1.length() > var3) { // L: 12 - var1.delete(); // L: 13 + if (var1.length() > var3) { + var1.delete(); } - this.file = new RandomAccessFile(var1, var2); // L: 15 - this.maxSize = var3; // L: 16 - this.offset = 0L; // L: 17 - int var5 = this.file.read(); // L: 18 - if (var5 != -1 && !var2.equals("r")) { // L: 19 - this.file.seek(0L); // L: 20 - this.file.write(var5); // L: 21 + this.file = new RandomAccessFile(var1, var2); + this.maxSize = var3; + this.offset = 0L; + int var5 = this.file.read(); + if (var5 != -1 && !var2.equals("r")) { + this.file.seek(0L); + this.file.write(var5); } - this.file.seek(0L); // L: 23 - } // L: 24 + this.file.seek(0L); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("seek") final void seek(long var1) throws IOException { - this.file.seek(var1); // L: 27 - this.offset = var1; // L: 28 - } // L: 29 + this.file.seek(var1); + this.offset = var1; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "53562428" + garbageValue = "-472511501" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.offset > this.maxSize) { // L: 32 - this.file.seek(this.maxSize); // L: 33 - this.file.write(1); // L: 34 - throw new EOFException(); // L: 35 + if ((long)var3 + this.offset > this.maxSize) { + this.file.seek(this.maxSize); + this.file.write(1); + throw new EOFException(); } else { - this.file.write(var1, var2, var3); // L: 37 - this.offset += (long)var3; // L: 38 + this.file.write(var1, var2, var3); + this.offset += (long)var3; } - } // L: 39 + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1532680077" + garbageValue = "65280" ) @Export("close") public final void close() throws IOException { - this.closeSync(false); // L: 42 - } // L: 43 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "31" - ) - @Export("closeSync") - public final void closeSync(boolean var1) throws IOException { - if (this.file != null) { // L: 46 - if (var1) { // L: 47 - try { - this.file.getFD().sync(); // L: 49 - } catch (SyncFailedException var3) { // L: 51 - } - } - - this.file.close(); // L: 53 - this.file = null; // L: 54 - } - - } // L: 56 + this.closeSync(false); + } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-267600325" + ) + @Export("closeSync") + public final void closeSync(boolean var1) throws IOException { + if (this.file != null) { + if (var1) { + try { + this.file.getFD().sync(); + } catch (SyncFailedException var3) { + } + } + + this.file.close(); + this.file = null; + } + + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "-419220313" + garbageValue = "800722102" ) @Export("length") public final long length() throws IOException { - return this.file.length(); // L: 59 + return this.file.length(); } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-803541857" + descriptor = "([BIIB)I", + garbageValue = "3" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); // L: 63 + int var4 = this.file.read(var1, var2, var3); if (var4 > 0) { - this.offset += (long)var4; // L: 64 + this.offset += (long)var4; } - return var4; // L: 65 + return var4; } protected void finalize() throws Throwable { - if (this.file != null) { // L: 69 - System.out.println(""); // L: 70 - this.close(); // L: 71 + if (this.file != null) { + System.out.println(""); + this.close(); } - } // L: 73 - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "715885494" - ) - static final void method6437(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7760 - 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: 7761 - Client.field831[var4] = true; - } - } - - } // L: 7763 + } } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 83f2e26707..5400c37b67 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -3,438 +3,439 @@ 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("cl") +@ObfuscatedName("bx") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("ah") + @ObfuscatedName("an") + @Export("isWalking") + boolean isWalking; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1424519155 + intValue = 1978015279 ) @Export("x") int x; - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 936237979 + intValue = -2029968485 ) @Export("y") int y; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 874219119 + intValue = 197746791 ) @Export("rotation") int rotation; - @ObfuscatedName("ag") - @Export("isWalking") - boolean isWalking; - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1485342149 + intValue = -98605829 ) - int field1225; - @ObfuscatedName("aq") + int field1023; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -509558101 + intValue = -55774215 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ae") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1206124803 + intValue = 1367478127 ) @Export("idleSequence") int idleSequence; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 202553539 + intValue = -1558763 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("an") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -133909051 + intValue = -584031907 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1178791293 + intValue = 755646491 ) @Export("walkSequence") int walkSequence; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1446612939 + intValue = 869838055 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1219850051 + intValue = 1223187209 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 474611297 + intValue = 1436374353 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1091145941 + intValue = 1731805391 ) @Export("runSequence") int runSequence; @ObfuscatedName("ay") @Export("overheadText") String overheadText; - @ObfuscatedName("am") + @ObfuscatedName("ap") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("aa") - boolean field1253; - @ObfuscatedName("ai") + @ObfuscatedName("ah") + boolean field1079; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 158954669 + intValue = -1097782901 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 217502675 + intValue = -1483909439 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ax") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1564304399 + intValue = 668210335 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("af") + @ObfuscatedName("aw") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("bq") + @ObfuscatedName("bt") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bx") + @ObfuscatedName("bk") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bi") + @ObfuscatedName("br") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bz") + @ObfuscatedName("by") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bb") + @ObfuscatedName("bv") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lkk;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1033786515 + intValue = -200885153 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("be") + @ObfuscatedName("bg") @Export("false0") boolean false0; - @ObfuscatedName("ba") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -340306785 + intValue = -890883463 ) - int field1280; - @ObfuscatedName("bs") + int field1048; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -556285409 + intValue = -1594285789 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("br") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -565094245 + intValue = -973182859 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1564505139 + intValue = -242541553 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("by") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -2104532797 + intValue = 760989061 ) @Export("sequence") int sequence; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 115504749 + intValue = -1588711653 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bg") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -460250755 + intValue = 1689420355 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1967513789 + intValue = -2102439421 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bj") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 971305057 + intValue = 655116259 ) - int field1258; - @ObfuscatedName("bo") + int field1056; + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 1049041031 + intValue = 604747837 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bn") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1411850169 + intValue = 1097211523 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bu") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1298560263 + intValue = -2043114549 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bl") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 469123257 + intValue = 1626664047 ) - int field1262; - @ObfuscatedName("bd") + int field1060; + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1144657861 + intValue = 1777264679 ) - int field1263; + int field1061; + @ObfuscatedName("bc") + @ObfuscatedGetter( + intValue = -1921017577 + ) + int field1062; @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1464146757 + intValue = 584135247 ) - int field1264; - @ObfuscatedName("bk") - @ObfuscatedGetter( - intValue = 610282849 - ) - int field1265; + int field1063; @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 847021677 + intValue = -754676609 ) - int field1268; - @ObfuscatedName("bf") + int field1064; + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1338394283 + intValue = 1614280993 ) - int field1267; - @ObfuscatedName("cm") + int field1065; + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 927939297 + intValue = -669523835 ) - int field1276; - @ObfuscatedName("cx") + int field1073; + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -406517487 + intValue = -1177596115 ) - int field1269; - @ObfuscatedName("cq") + int field1067; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -1759311977 + intValue = 1387618969 ) - int field1270; - @ObfuscatedName("cz") + int field1050; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -429335855 + intValue = 321793587 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cc") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 191753551 + intValue = -772435111 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cu") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 2031424695 + intValue = 1826498157 ) @Export("orientation") int orientation; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1087482181 + intValue = 472572481 ) - int field1274; - @ObfuscatedName("cv") + int field1072; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 731045615 + intValue = -293816803 ) - int field1275; - @ObfuscatedName("cf") + int field1074; + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 1585830935 + intValue = -1119314223 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cb") + @ObfuscatedName("cd") @Export("pathX") int[] pathX; - @ObfuscatedName("cg") + @ObfuscatedName("co") @Export("pathY") int[] pathY; - @ObfuscatedName("ca") + @ObfuscatedName("cm") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cd") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 1081774257 + intValue = -515644987 ) - int field1242; - @ObfuscatedName("ce") + int field1078; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 815259821 + intValue = -1840571553 ) - int field1281; + int field1066; Actor() { - this.isWalking = false; // L: 13 - this.field1225 = 1; // L: 14 - this.idleSequence = -1; // L: 16 - this.turnLeftSequence = -1; // L: 17 - this.turnRightSequence = -1; // L: 18 - this.walkSequence = -1; // L: 19 - this.walkBackSequence = -1; // L: 20 - this.walkLeftSequence = -1; // L: 21 - this.walkRightSequence = -1; // L: 22 - this.runSequence = -1; // L: 23 - this.overheadText = null; // L: 24 - this.field1253 = false; // L: 26 - this.overheadTextCyclesRemaining = 100; // L: 27 - this.overheadTextColor = 0; // L: 28 - this.overheadTextEffect = 0; // L: 29 - this.hitSplatCount = 0; // L: 31 - this.hitSplatTypes = new int[4]; // L: 32 - this.hitSplatValues = new int[4]; // L: 33 - this.hitSplatCycles = new int[4]; // L: 34 - this.hitSplatTypes2 = new int[4]; // L: 35 - this.hitSplatValues2 = new int[4]; // L: 36 - this.healthBars = new IterableNodeDeque(); // L: 37 - this.targetIndex = -1; // L: 38 - this.false0 = false; // L: 39 - this.field1280 = -1; // L: 40 - this.movementSequence = -1; // L: 41 - this.movementFrame = 0; // L: 42 - this.movementFrameCycle = 0; // L: 43 - this.sequence = -1; // L: 44 - this.sequenceFrame = 0; // L: 45 - this.sequenceFrameCycle = 0; // L: 46 - this.sequenceDelay = 0; // L: 47 - this.field1258 = 0; // L: 48 - this.spotAnimation = -1; // L: 49 - this.spotAnimationFrame = 0; // L: 50 - this.spotAnimationFrameCycle = 0; // L: 51 - this.npcCycle = 0; // L: 61 - this.defaultHeight = 200; // L: 62 - this.field1274 = 0; // L: 64 - this.field1275 = 32; // L: 65 - this.pathLength = 0; // L: 66 - this.pathX = new int[10]; // L: 67 - this.pathY = new int[10]; // L: 68 - this.pathTraversed = new byte[10]; // L: 69 - this.field1242 = 0; // L: 70 - this.field1281 = 0; // L: 71 + this.isWalking = false; + this.field1023 = 1; + this.idleSequence = -1; + this.turnLeftSequence = -1; + this.turnRightSequence = -1; + this.walkSequence = -1; + this.walkBackSequence = -1; + this.walkLeftSequence = -1; + this.walkRightSequence = -1; + this.runSequence = -1; + this.overheadText = null; + this.field1079 = false; + this.overheadTextCyclesRemaining = 100; + this.overheadTextColor = 0; + this.overheadTextEffect = 0; + this.hitSplatCount = 0; + this.hitSplatTypes = new int[4]; + this.hitSplatValues = new int[4]; + this.hitSplatCycles = new int[4]; + this.hitSplatTypes2 = new int[4]; + this.hitSplatValues2 = new int[4]; + this.healthBars = new IterableNodeDeque(); + this.targetIndex = -1; + this.false0 = false; + this.field1048 = -1; + this.movementSequence = -1; + this.movementFrame = 0; + this.movementFrameCycle = 0; + this.sequence = -1; + this.sequenceFrame = 0; + this.sequenceFrameCycle = 0; + this.sequenceDelay = 0; + this.field1056 = 0; + this.spotAnimation = -1; + this.spotAnimationFrame = 0; + this.spotAnimationFrameCycle = 0; + this.npcCycle = 0; + this.defaultHeight = 200; + this.field1072 = 0; + this.field1074 = 32; + this.pathLength = 0; + this.pathX = new int[10]; + this.pathY = new int[10]; + this.pathTraversed = new byte[10]; + this.field1078 = 0; + this.field1066 = 0; } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "3" + garbageValue = "74" ) @Export("isVisible") boolean isVisible() { - return false; // L: 81 + return false; } - @ObfuscatedName("bi") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2136835932" + garbageValue = "1689225091" ) - final void method2263() { + final void method1872() { this.pathLength = 0; - this.field1281 = 0; // L: 77 - } // L: 78 + this.field1066 = 0; + } - @ObfuscatedName("bz") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(IIIIIIB)V", - garbageValue = "-22" + garbageValue = "46" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 85 - boolean var8 = true; // L: 86 + boolean var7 = true; + boolean var8 = true; int var9; - for (var9 = 0; var9 < 4; ++var9) { // L: 87 - if (this.hitSplatCycles[var9] > var5) { // L: 88 + for (var9 = 0; var9 < 4; ++var9) { + if (this.hitSplatCycles[var9] > var5) { var7 = false; } else { - var8 = false; // L: 89 + var8 = false; } } - var9 = -1; // L: 91 - int var10 = -1; // L: 92 - int var11 = 0; // L: 93 - if (var1 >= 0) { // L: 94 - HitSplatDefinition var12 = Decimator.method1171(var1); // L: 95 - var10 = var12.field1747; // L: 96 - var11 = var12.field1738; // L: 97 + var9 = -1; + int var10 = -1; + int var11 = 0; + if (var1 >= 0) { + HitSplatDefinition var12 = ObjectComposition.method3044(var1); + var10 = var12.field1725; + var11 = var12.field1716; } int var14; - if (var8) { // L: 99 - if (var10 == -1) { // L: 100 + if (var8) { + if (var10 == -1) { return; } - var9 = 0; // L: 101 - var14 = 0; // L: 102 - if (var10 == 0) { // L: 103 + var9 = 0; + var14 = 0; + if (var10 == 0) { var14 = this.hitSplatCycles[0]; - } else if (var10 == 1) { // L: 104 + } else if (var10 == 1) { var14 = this.hitSplatValues[0]; } - for (int var13 = 1; var13 < 4; ++var13) { // L: 105 - if (var10 == 0) { // L: 106 - if (this.hitSplatCycles[var13] < var14) { // L: 107 - var9 = var13; // L: 108 - var14 = this.hitSplatCycles[var13]; // L: 109 + for (int var13 = 1; var13 < 4; ++var13) { + if (var10 == 0) { + if (this.hitSplatCycles[var13] < var14) { + var9 = var13; + var14 = this.hitSplatCycles[var13]; } - } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 112 113 - var9 = var13; // L: 114 - var14 = this.hitSplatValues[var13]; // L: 115 + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { + var9 = var13; + var14 = this.hitSplatValues[var13]; } } @@ -456,235 +457,460 @@ public abstract class Actor extends Renderable { } } - if (var9 >= 0) { // L: 132 + if (var9 >= 0) { this.hitSplatTypes[var9] = var1; - this.hitSplatValues[var9] = var2; // L: 134 - this.hitSplatTypes2[var9] = var3; // L: 135 - this.hitSplatValues2[var9] = var4; // L: 136 - this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 137 + this.hitSplatValues[var9] = var2; + this.hitSplatTypes2[var9] = var3; + this.hitSplatValues2[var9] = var4; + this.hitSplatCycles[var9] = var5 + var11 + var6; } - } // L: 138 + } - @ObfuscatedName("bb") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "1" + descriptor = "(IIIIIII)V", + garbageValue = "1867872828" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = class287.method5260(var1); // L: 141 - HealthBar var8 = null; // L: 142 - HealthBar var9 = null; // L: 143 - int var10 = var7.int2; // L: 144 - int var11 = 0; // L: 145 + HealthBarDefinition var7 = GraphicsObject.method1647(var1); + HealthBar var8 = null; + HealthBar var9 = null; + int var10 = var7.int2; + int var11 = 0; HealthBar var12; - for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 146 - ++var11; // L: 147 - if (var12.definition.field1602 == var7.field1602) { // L: 148 - var12.put(var2 + var4, var5, var6, var3); // L: 149 - return; // L: 150 + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { + ++var11; + if (var12.definition.field1578 == var7.field1578) { + var12.put(var2 + var4, var5, var6, var3); + return; } - if (var12.definition.int1 <= var7.int1) { // L: 152 + if (var12.definition.int1 <= var7.int1) { var8 = var12; } - if (var12.definition.int2 > var10) { // L: 153 - var9 = var12; // L: 154 - var10 = var12.definition.int2; // L: 155 + if (var12.definition.int2 > var10) { + var9 = var12; + var10 = var12.definition.int2; } } - if (var9 != null || var11 < 4) { // L: 158 - var12 = new HealthBar(var7); // L: 159 - if (var8 == null) { // L: 160 + if (var9 != null || var11 < 4) { + var12 = new HealthBar(var7); + if (var8 == null) { this.healthBars.addLast(var12); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 161 + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); } - var12.put(var2 + var4, var5, var6, var3); // L: 162 - if (var11 >= 4) { // L: 163 + var12.put(var2 + var4, var5, var6, var3); + if (var11 >= 4) { var9.remove(); } } - } // L: 164 + } - @ObfuscatedName("bv") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1204819993" + garbageValue = "798953019" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = class287.method5260(var1); // L: 167 + HealthBarDefinition var2 = GraphicsObject.method1647(var1); - for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 168 - if (var2 == var3.definition) { // L: 169 - var3.remove(); // L: 170 - return; // L: 171 + for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { + if (var2 == var3.definition) { + var3.remove(); + return; } } - } // L: 174 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;ZI)V", - garbageValue = "1669535387" - ) - public static void method2262(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectComposition.ObjectDefinition_archive = var0; // L: 73 - ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74 - ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75 - } // L: 76 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "13" - ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; // L: 117 - - try { - var0 = class262.getPreferencesFile("", class182.field2114.name, true); // L: 119 - Buffer var1 = class4.clientPreferences.toBuffer(); // L: 120 - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } // L: 130 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "-81" - ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 121 - int var4 = 0; // L: 122 - - for (int var5 = 0; var5 < var2; ++var5) { // L: 123 - int var6 = var0[var5 + var1] & 255; // L: 124 - if (var6 != 0) { // L: 125 - if (var6 >= 128 && var6 < 160) { // L: 126 - char var7 = class302.cp1252AsciiExtension[var6 - 128]; // L: 127 - if (var7 == 0) { // L: 128 - var7 = '?'; - } - - var6 = var7; // L: 129 - } - - var3[var4++] = (char)var6; // L: 131 - } - } - - return new String(var3, 0, var4); // L: 133 } - @ObfuscatedName("ij") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lcj;IIII)V", - garbageValue = "55903720" + descriptor = "(Ljy;IIB)[Lom;", + garbageValue = "49" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class262.localPlayer != var0) { // L: 9282 - if (Client.menuOptionsCount < 400) { // L: 9283 - String var4; - int var7; - if (var0.skillLevel == 0) { // L: 9285 - String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9286 - var7 = var0.combatLevel; // L: 9288 - int var8 = class262.localPlayer.combatLevel; // L: 9289 - int var9 = var8 - var7; // L: 9291 - String var6; - if (var9 < -9) { // L: 9292 - var6 = SecureRandomFuture.colorStartTag(16711680); // L: 9293 - } else if (var9 < -6) { // L: 9296 - var6 = SecureRandomFuture.colorStartTag(16723968); // L: 9297 - } else if (var9 < -3) { // L: 9300 - var6 = SecureRandomFuture.colorStartTag(16740352); // L: 9301 - } else if (var9 < 0) { // L: 9304 - var6 = SecureRandomFuture.colorStartTag(16756736); // L: 9305 - } else if (var9 > 9) { // L: 9308 - var6 = SecureRandomFuture.colorStartTag(65280); // L: 9309 - } else if (var9 > 6) { // L: 9312 - var6 = SecureRandomFuture.colorStartTag(4259584); // L: 9313 - } else if (var9 > 3) { // L: 9316 - var6 = SecureRandomFuture.colorStartTag(8453888); // L: 9317 - } else if (var9 > 0) { // L: 9320 - var6 = SecureRandomFuture.colorStartTag(12648192); // L: 9321 - } else { - var6 = SecureRandomFuture.colorStartTag(16776960); // L: 9324 - } + public static SpritePixels[] method1884(AbstractArchive var0, int var1, int var2) { + return !class290.method5208(var0, var1, var2) ? null : class163.method3229(); + } - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9326 - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9328 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-1455646950" + ) + static int method1887(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { + var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + class120.addGameMessage(0, "", var7); + return 1; + } else if (var0 == ScriptOpcodes.ANIM) { + Interpreter.Interpreter_intStackSize -= 2; + ParamComposition.performPlayerAnimation(MouseHandler.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field740) { + Interpreter.field752 = true; + } + + return 1; + } else { + int var16; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var16 = 0; + if (class249.isNumber(var7)) { + var16 = NetCache.method5088(var7); } - int var10; - if (Client.isItemSelected == 1) { // L: 9329 - class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9330 - } else if (Client.isSpellSelected) { // L: 9333 - if ((LoginPacket.selectedSpellFlags & 8) == 8) { // L: 9334 - class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9335 - } + PacketBufferNode var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeInt(var16); + Client.packetWriter.addNode(var14); + return 1; + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var7.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var7); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2637, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var7.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var7); + Client.packetWriter.addNode(var12); + return 1; } else { - for (var10 = 7; var10 >= 0; --var10) { // L: 9340 - if (Client.playerMenuActions[var10] != null) { // L: 9341 - short var11 = 0; // L: 9342 - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9343 - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9344 - continue; - } + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + class108.method2304(var10, var4); + return 1; + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 3; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Widget var15 = UrlRequester.getWidget(var9); + ItemContainer.clickWidget(var15, var10, var16); + return 1; + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Widget var13 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + ItemContainer.clickWidget(var13, var10, var16); + return 1; + } else if (var0 == ScriptOpcodes.MOUSECAM) { + class310.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + Decimator.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + MilliClock.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + InvDefinition.openURL(var7, var8, false); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + class1.Interpreter_stringStackSize -= 2; + var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; + if (var4.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var4) + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + var6.packetBuffer.method6685(var10); + var6.packetBuffer.writeStringCp1252NullTerminated(var4); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class262.localPlayer.combatLevel) { // L: 9345 - var11 = 2000; // L: 9346 - } + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } - if (class262.localPlayer.team != 0 && var0.team != 0) { // L: 9348 - if (var0.team == class262.localPlayer.team) { // L: 9349 - var11 = 2000; - } else { - var11 = 0; // L: 9350 - } - } else if (var0.isClanMember()) { // L: 9352 - var11 = 2000; // L: 9353 - } - } else if (Client.playerOptionsPriorities[var10]) { // L: 9356 - var11 = 2000; + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; + } + + return 1; + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + class15.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ReflectionCheck.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == 3129) { + Interpreter.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.canvasWidth; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.canvasHeight; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field569 = 3; + Client.field483 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field569 = 2; + Client.field483 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field569 = 0; + return 1; + } else if (var0 == 3139) { + Client.field569 = 1; + return 1; + } else if (var0 == 3140) { + Client.field569 = 3; + Client.field483 = var2 ? GrandExchangeOffer.scriptDotWidget.id * -1996852661 * 611927907 : Interpreter.scriptActiveWidget.id * -1996852661 * 611927907; + return 1; + } else { + boolean var11; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Decimator.clientPreferences.hideUsername = var11; + MilliClock.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var11; + if (!var11) { + Decimator.clientPreferences.rememberedUsername = ""; + MilliClock.savePreferences(); } - boolean var12 = false; // L: 9357 - var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9358 - class22.insertMenuItemNoShift(Client.playerMenuActions[var10], SecureRandomFuture.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9359 + return 1; + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { + return 1; + } else if (var0 == 3146) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (var11 == Decimator.clientPreferences.titleMusicDisabled) { + Decimator.clientPreferences.titleMusicDisabled = !var11; + MilliClock.savePreferences(); + } + + return 1; + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptEvent.method1807(); + return 1; + } else if (var0 == 3155) { + --class1.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --class1.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --class1.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --class1.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3181) { + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100); + BuddyRankComparator.method2200((double)(0.5F + (float)var10 / 200.0F)); + return 1; + } else if (var0 == 3182) { + float var3 = ((float)Decimator.clientPreferences.field1117 - 0.5F) * 200.0F; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 100 - Math.round(var3); + return 1; + } else if (var0 != 3183 && var0 != 3184) { + return 2; + } else { + --Interpreter.Interpreter_intStackSize; + return 1; } } } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9364 - if (Client.menuOpcodes[var10] == 23) { // L: 9365 - Client.menuTargets[var10] = SecureRandomFuture.colorStartTag(16777215) + var4; // L: 9366 - break; - } - } - } } - } // L: 9370 + } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 50c8fcc603..4b89bee203 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,130 +3,130 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gp") @Implements("Animation") public class Animation { - @ObfuscatedName("f") - static int[] field2231; - @ObfuscatedName("e") - static int[] field2224; + @ObfuscatedName("s") + static int[] field2220; + @ObfuscatedName("t") + static int[] field2212; @ObfuscatedName("v") - static int[] field2226; - @ObfuscatedName("y") - static int[] field2227; + static int[] field2213; @ObfuscatedName("j") + static int[] field2214; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgj;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("transformCount") int transformCount; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("transformXs") int[] transformXs; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("transformYs") int[] transformYs; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("transformZs") int[] transformZs; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2231 = new int[500]; // L: 8 - field2224 = new int[500]; // L: 9 - field2226 = new int[500]; // L: 10 - field2227 = new int[500]; // L: 11 + field2220 = new int[500]; + field2212 = new int[500]; + field2213 = new int[500]; + field2214 = new int[500]; } @ObfuscatedSignature( - descriptor = "([BLgb;)V" + descriptor = "([BLgj;)V" ) Animation(byte[] var1, Skeleton var2) { - this.skeleton = null; // L: 12 - this.transformCount = -1; // L: 13 - this.hasAlphaTransform = false; // L: 18 - this.skeleton = var2; // L: 21 - Buffer var3 = new Buffer(var1); // L: 22 - Buffer var4 = new Buffer(var1); // L: 23 - var3.offset = 2; // L: 24 - int var5 = var3.readUnsignedByte(); // L: 25 - int var6 = -1; // L: 26 - int var7 = 0; // L: 27 - var4.offset = var5 + var3.offset; // L: 28 + this.skeleton = null; + this.transformCount = -1; + this.hasAlphaTransform = false; + this.skeleton = var2; + Buffer var3 = new Buffer(var1); + Buffer var4 = new Buffer(var1); + var3.offset = 2; + int var5 = var3.readUnsignedByte(); + int var6 = -1; + int var7 = 0; + var4.offset = var5 + var3.offset; int var8; - for (var8 = 0; var8 < var5; ++var8) { // L: 29 - int var9 = var3.readUnsignedByte(); // L: 30 - if (var9 > 0) { // L: 31 - if (this.skeleton.transformTypes[var8] != 0) { // L: 32 - for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33 - if (this.skeleton.transformTypes[var10] == 0) { // L: 34 - field2231[var7] = var10; // L: 35 - field2224[var7] = 0; // L: 36 - field2226[var7] = 0; // L: 37 - field2227[var7] = 0; // L: 38 - ++var7; // L: 39 + for (var8 = 0; var8 < var5; ++var8) { + int var9 = var3.readUnsignedByte(); + if (var9 > 0) { + if (this.skeleton.transformTypes[var8] != 0) { + for (int var10 = var8 - 1; var10 > var6; --var10) { + if (this.skeleton.transformTypes[var10] == 0) { + field2220[var7] = var10; + field2212[var7] = 0; + field2213[var7] = 0; + field2214[var7] = 0; + ++var7; break; } } } - field2231[var7] = var8; // L: 44 - short var11 = 0; // L: 45 - if (this.skeleton.transformTypes[var8] == 3) { // L: 46 + field2220[var7] = var8; + short var11 = 0; + if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } - if ((var9 & 1) != 0) { // L: 47 - field2224[var7] = var4.readShortSmart(); + if ((var9 & 1) != 0) { + field2212[var7] = var4.readShortSmart(); } else { - field2224[var7] = var11; // L: 48 + field2212[var7] = var11; } - if ((var9 & 2) != 0) { // L: 49 - field2226[var7] = var4.readShortSmart(); + if ((var9 & 2) != 0) { + field2213[var7] = var4.readShortSmart(); } else { - field2226[var7] = var11; // L: 50 + field2213[var7] = var11; } - if ((var9 & 4) != 0) { // L: 51 - field2227[var7] = var4.readShortSmart(); + if ((var9 & 4) != 0) { + field2214[var7] = var4.readShortSmart(); } else { - field2227[var7] = var11; // L: 52 + field2214[var7] = var11; } - var6 = var8; // L: 53 - ++var7; // L: 54 - if (this.skeleton.transformTypes[var8] == 5) { // L: 55 + var6 = var8; + ++var7; + if (this.skeleton.transformTypes[var8] == 5) { this.hasAlphaTransform = true; } } } - if (var1.length != var4.offset) { // L: 58 - throw new RuntimeException(); // L: 59 + if (var1.length != var4.offset) { + throw new RuntimeException(); } else { - this.transformCount = var7; // L: 61 - this.transformSkeletonLabels = new int[var7]; // L: 62 - this.transformXs = new int[var7]; // L: 63 - this.transformYs = new int[var7]; // L: 64 - this.transformZs = new int[var7]; // L: 65 + this.transformCount = var7; + this.transformSkeletonLabels = new int[var7]; + this.transformXs = new int[var7]; + this.transformYs = new int[var7]; + this.transformZs = new int[var7]; - for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field2231[var8]; // L: 67 - this.transformXs[var8] = field2224[var8]; // L: 68 - this.transformYs[var8] = field2226[var8]; // L: 69 - this.transformZs[var8] = field2227[var8]; // L: 70 + for (var8 = 0; var8 < var7; ++var8) { + this.transformSkeletonLabels[var8] = field2220[var8]; + this.transformXs[var8] = field2212[var8]; + this.transformYs[var8] = field2213[var8]; + this.transformZs[var8] = field2214[var8]; } } - } // L: 72 + } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 15a80398e8..7ae3578e6e 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,54 +1,249 @@ 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("bd") +@ObfuscatedName("ap") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("tj") - @ObfuscatedGetter( - intValue = -1879997491 + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "[Lof;" ) - @Export("foundItemIdCount") - static int foundItemIdCount; + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive12") + static Archive archive12; ApproximateRouteStrategy() { - } // L: 11765 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIILfl;B)Z", - garbageValue = "11" + descriptor = "(IIILfy;I)Z", + garbageValue = "-1237332144" ) @Export("hasArrived") - public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11768 + protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2082645900" - ) - public static boolean method1269() { - return class233.musicPlayerStatus != 0 ? true : class233.midiPcmStream.isReady(); // L: 70 71 + @ObfuscatedName("j") + public static int method880(long var0) { + return (int)(var0 >>> 0 & 127L); } - @ObfuscatedName("fp") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1872242824" + descriptor = "(B)[Lou;", + garbageValue = "50" ) - static final void method1268() { - if (Client.logoutTimer > 0) { // L: 3170 - PcmPlayer.logOut(); // L: 3171 - } else { - Client.timer.method5672(); // L: 3174 - Projectile.updateGameState(40); // L: 3175 - DefaultsGroup.field3887 = Client.packetWriter.getSocket(); // L: 3176 - Client.packetWriter.removeSocket(); // L: 3177 + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4256, FillMode.SOLID, FillMode.field4255}; + } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(Lbb;ZI)V", + garbageValue = "-2147483639" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = class171.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = class122.getTileHeight(var0.x, var0.y, GrandExchangeEvent.Client_plane); + var0.playerCycle = Client.cycle; + WorldMapIcon_1.scene.addNullableObject(GrandExchangeEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = class122.getTileHeight(var0.x, var0.y, GrandExchangeEvent.Client_plane); + var0.playerCycle = Client.cycle; + WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } } - } // L: 3172 3178 + + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-514166571" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ObjectSound.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + UserComparator10.runScriptEvent(var5); + } + + Client.field564 = var3; + Client.isSpellSelected = true; + PcmPlayer.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + ViewportMouse.selectedSpellFlags = var2; + AttackOption.invalidateWidget(var4); + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "-26736" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class107.method2291(); + VarcInt.method2741(); + int var1 = FriendSystem.VarpDefinition_get(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { + BuddyRankComparator.method2200(0.9D); + } + + if (var2 == 2) { + BuddyRankComparator.method2200(0.8D); + } + + if (var2 == 3) { + BuddyRankComparator.method2200(0.7D); + } + + if (var2 == 4) { + BuddyRankComparator.method2200(0.6D); + } + } + + if (var1 == 3) { + if (var2 == 0) { + TaskHandler.method2582(255); + } + + if (var2 == 1) { + TaskHandler.method2582(192); + } + + if (var2 == 2) { + TaskHandler.method2582(128); + } + + if (var2 == 3) { + TaskHandler.method2582(64); + } + + if (var2 == 4) { + TaskHandler.method2582(0); + } + } + + if (var1 == 4) { + if (var2 == 0) { + class98.updateSoundEffectVolume(127); + } + + if (var2 == 1) { + class98.updateSoundEffectVolume(96); + } + + if (var2 == 2) { + class98.updateSoundEffectVolume(64); + } + + if (var2 == 3) { + class98.updateSoundEffectVolume(32); + } + + if (var2 == 4) { + class98.updateSoundEffectVolume(0); + } + } + + if (var1 == 5) { + Client.leftClickOpensMenu = var2; + } + + if (var1 == 6) { + Client.chatEffects = var2; + } + + if (var1 == 9) { + Client.field654 = var2; + } + + if (var1 == 10) { + if (var2 == 0) { + class16.method175(127); + } + + if (var2 == 1) { + class16.method175(96); + } + + if (var2 == 2) { + class16.method175(64); + } + + if (var2 == 3) { + class16.method175(32); + } + + if (var2 == 4) { + class16.method175(0); + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + if (var1 == 18) { + Client.playerAttackOption = (AttackOption)Huffman.findEnumerated(Language.method5233(), var2); + if (Client.playerAttackOption == null) { + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { + if (var2 == -1) { + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; + } + } + + if (var1 == 22) { + Client.npcAttackOption = (AttackOption)Huffman.findEnumerated(Language.method5233(), var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 47944d25f1..ef74bc41c0 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,484 +5,493 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("js") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("Archive_crc") static CRC32 Archive_crc; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lln;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lln;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 935537311 + intValue = -1432717399 ) @Export("index") int index; - @ObfuscatedName("o") - volatile boolean field3562; - @ObfuscatedName("m") + @ObfuscatedName("n") + volatile boolean field3570; + @ObfuscatedName("w") boolean field3566; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 449580407 + intValue = -889459967 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1844159497 + intValue = 1415267029 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1224107027 + intValue = -621429149 ) - int field3572; + int field3571; static { - Archive_crc = new CRC32(); // L: 17 + Archive_crc = new CRC32(); } @ObfuscatedSignature( - descriptor = "(Lla;Lla;IZZZ)V" + descriptor = "(Lln;Lln;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { - super(var4, var5); // L: 23 - this.field3562 = false; // L: 14 - this.field3566 = false; // L: 15 - this.field3572 = -1; // L: 20 - this.archiveDisk = var1; // L: 24 - this.masterDisk = var2; // L: 25 - this.index = var3; // L: 26 - this.field3566 = var6; // L: 27 - int var8 = this.index; // L: 29 - if (UserComparator6.NetCache_reference != null) { // L: 31 - UserComparator6.NetCache_reference.offset = var8 * 8 + 5; // L: 32 - int var9 = UserComparator6.NetCache_reference.readInt(); - int var10 = UserComparator6.NetCache_reference.readInt(); + super(var4, var5); + this.field3570 = false; + this.field3566 = false; + this.field3571 = -1; + this.archiveDisk = var1; + this.masterDisk = var2; + this.index = var3; + this.field3566 = var6; + int var8 = this.index; + if (NetCache.NetCache_reference != null) { + NetCache.NetCache_reference.offset = var8 * 8 + 5; + int var9 = NetCache.NetCache_reference.readInt(); + int var10 = NetCache.NetCache_reference.readInt(); this.loadIndex(var9, var10); } else { - MenuAction.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetSocket.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); NetCache.NetCache_archives[var8] = this; } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1162495531" + garbageValue = "2054889339" ) - public boolean method5044() { - return this.field3562; + public boolean method4955() { + return this.field3570; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "976210931" + garbageValue = "887560465" ) @Export("percentage") public int percentage() { - if (this.field3562) { // L: 48 + if (this.field3570) { return 100; - } else if (super.groups != null) { // L: 49 + } else if (super.groups != null) { return 99; } else { - int var2 = this.index; // L: 51 - long var3 = (long)(var2 + 16711680); // L: 53 + int var2 = this.index; + long var3 = (long)(var2 + 16711680); int var1; - if (class34.NetCache_currentResponse != null && var3 == class34.NetCache_currentResponse.key) { // L: 54 - var1 = class254.NetCache_responseArchiveBuffer.offset * 99 / (class254.NetCache_responseArchiveBuffer.array.length - class34.NetCache_currentResponse.padding) + 1; // L: 58 + if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var3) { + var1 = UserComparator9.NetCache_responseArchiveBuffer.offset * 99 / (UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; } else { - var1 = 0; // L: 55 + var1 = 0; } - int var5 = var1; // L: 60 - if (var1 >= 100) { // L: 61 + int var5 = var1; + if (var1 >= 100) { var5 = 99; } - return var5; // L: 62 + return var5; } } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "341986030" + garbageValue = "1300418650" ) @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("y") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1768582746" - ) - @Export("loadGroup") - void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 76 - PendingSpawn.method2261(var1, this.archiveDisk, this); - } else { - MenuAction.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 77 - } - - } // L: 78 + Clock.method2673(this.index, var1); + } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { + ArchiveDisk var2 = this.archiveDisk; + byte[] var4 = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) { + var4 = var6.data; + break; + } + } + } + + if (var4 != null) { + this.load(var2, var1, var4, true); + } else { + byte[] var5 = var2.read(var1); + this.load(var2, var1, var5, true); + } + } else { + NetSocket.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + } + + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1807724358" + garbageValue = "1584411353" ) @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 - PendingSpawn.method2261(this.index, this.masterDisk, this); + this.indexCrc = var1; + this.indexVersion = var2; + if (this.masterDisk != null) { + int var3 = this.index; + ArchiveDisk var4 = this.masterDisk; + byte[] var6 = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { + var6 = var8.data; + break; + } + } + } + + if (var6 != null) { + this.load(var4, var3, var6, true); + } else { + byte[] var7 = var4.read(var3); + this.load(var4, var3, var7, true); + } } else { - MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 84 + NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } - } // L: 85 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I[BZZI)V", - garbageValue = "1456040345" + garbageValue = "-1722711821" ) @Export("write") public void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 88 - if (this.field3562) { // L: 89 - throw new RuntimeException(); // L: 90 + if (var3) { + if (this.field3570) { + throw new RuntimeException(); } - 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 + if (this.masterDisk != null) { + int var5 = this.index; + ArchiveDisk var6 = this.masterDisk; + ArchiveDiskAction var7 = new ArchiveDiskAction(); + var7.type = 0; + var7.key = (long)var5; + var7.data = var2; + var7.archiveDisk = var6; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); + } - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 105 - if (ArchiveDiskActionHandler.field3557 == 0) { // L: 106 - class305.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 107 - class305.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 108 - class305.ArchiveDiskActionHandler_thread.start(); // L: 109 - class305.ArchiveDiskActionHandler_thread.setPriority(5); // L: 110 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3556 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); } - ArchiveDiskActionHandler.field3557 = 600; // L: 112 + ArchiveDiskActionHandler.field3556 = 600; } } - this.decodeIndex(var2); // L: 117 - this.loadAllLocal(); // L: 118 + this.decodeIndex(var2); + this.loadAllLocal(); } 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.field3557 == 0) { // L: 136 - class305.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 137 - class305.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 138 - class305.ArchiveDiskActionHandler_thread.start(); // L: 139 - class305.ArchiveDiskActionHandler_thread.setPriority(5); // L: 140 - } - - ArchiveDiskActionHandler.field3557 = 600; // L: 142 + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); + var2[var2.length - 1] = (byte)super.groupVersions[var1]; + if (this.archiveDisk != null) { + ArchiveDisk var13 = this.archiveDisk; + ArchiveDiskAction var19 = new ArchiveDiskAction(); + var19.type = 0; + var19.key = (long)var1; + var19.data = var2; + var19.archiveDisk = var13; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var19); } - this.validGroups[var1] = true; // L: 146 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3556 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3556 = 600; + } + + this.validGroups[var1] = true; } - if (var4) { // L: 148 - Object[] var21 = super.groups; // L: 149 + if (var4) { + Object[] var21 = super.groups; Object var20; if (var2 == null) { - 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 + var20 = null; + } else if (var2.length > 136) { + DirectByteArrayCopier var8 = new DirectByteArrayCopier(); + var8.set(var2); + var20 = var8; } else { - var20 = var2; // L: 166 + var20 = var2; } - var21[var1] = var20; // L: 168 + var21[var1] = var20; } } - } // L: 171 + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lla;I[BZI)V", - garbageValue = "2098263983" + descriptor = "(Lln;I[BZI)V", + garbageValue = "-1758928614" ) @Export("load") void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; - if (var1 == this.masterDisk) { // L: 174 - if (this.field3562) { - throw new RuntimeException(); // L: 176 + if (var1 == this.masterDisk) { + if (this.field3570) { + throw new RuntimeException(); } - if (var3 == null) { // L: 178 - MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 179 - return; // L: 180 + if (var3 == null) { + NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - Archive_crc.reset(); // L: 182 - Archive_crc.update(var3, 0, var3.length); // L: 183 - var5 = (int)Archive_crc.getValue(); // L: 184 - if (var5 != this.indexCrc) { // L: 185 - MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 186 - return; // L: 187 + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length); + var5 = (int)Archive_crc.getValue(); + if (var5 != this.indexCrc) { + NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - Buffer var11 = new Buffer(class106.decompressBytes(var3)); // L: 189 - int var12 = var11.readUnsignedByte(); // L: 190 - if (var12 != 5 && var12 != 6) { // L: 191 + Buffer var11 = new Buffer(GrandExchangeOfferOwnWorldComparator.decompressBytes(var3)); + int var12 = var11.readUnsignedByte(); + if (var12 != 5 && var12 != 6) { throw new RuntimeException(var12 + "," + this.index + "," + var2); } - int var8 = 0; // L: 192 - if (var12 >= 6) { // L: 193 + int var8 = 0; + if (var12 >= 6) { var8 = var11.readInt(); } - if (var8 != this.indexVersion) { // L: 194 - MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 195 - return; // L: 196 + if (var8 != this.indexVersion) { + NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - this.decodeIndex(var3); // L: 198 - this.loadAllLocal(); // L: 199 + this.decodeIndex(var3); + this.loadAllLocal(); } else { - if (!var4 && var2 == this.field3572) { // L: 202 - this.field3562 = true; // L: 203 + if (!var4 && var2 == this.field3571) { + this.field3570 = true; } - if (var3 == null || var3.length <= 2) { // L: 205 - this.validGroups[var2] = false; // L: 206 - if (this.field3566 || var4) { // L: 207 - MenuAction.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (var3 == null || var3.length <= 2) { + this.validGroups[var2] = false; + if (this.field3566 || var4) { + NetSocket.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 208 + return; } - 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.field3566 || var4) { // L: 216 - MenuAction.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length - 2); + var5 = (int)Archive_crc.getValue(); + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { + this.validGroups[var2] = false; + if (this.field3566 || var4) { + NetSocket.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 217 + return; } - this.validGroups[var2] = true; // L: 219 - if (var4) { // L: 220 - Object[] var7 = super.groups; // L: 221 + this.validGroups[var2] = true; + if (var4) { + Object[] var7 = super.groups; 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 + if (var3 == null) { + var9 = null; + } else if (var3.length > 136) { + DirectByteArrayCopier var10 = new DirectByteArrayCopier(); + var10.set(var3); + var9 = var10; } else { - var9 = var3; // L: 238 + var9 = var3; } - var7[var2] = var9; // L: 240 + var7[var2] = var9; } } - } // L: 243 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" - ) - @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.field3562 = true; // L: 249 - } else { - this.field3572 = -1; // L: 252 - - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 253 - if (super.fileCounts[var1] > 0) { // L: 254 - MouseHandler.method727(var1, this.archiveDisk, this); // L: 255 - this.field3572 = var1; // L: 256 - } - } - - if (this.field3572 == -1) { // L: 259 - this.field3562 = true; - } - - } - } // L: 250 260 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1362561714" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 263 - return 100; - } else { - return this.validGroups[var1] ? 100 : class248.method4915(this.index, var1); // L: 264 265 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1991091922" - ) - public boolean method5030(int var1) { - return this.validGroups[var1]; // L: 269 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "14" - ) - public boolean method5031(int var1) { - return this.getGroupFileIds(var1) != null; // L: 273 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "21" - ) - @Export("loadPercent") - public int loadPercent() { - int var1 = 0; // L: 277 - int var2 = 0; // L: 278 - - int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 279 - if (super.fileCounts[var3] > 0) { // L: 280 - var1 += 100; // L: 281 - var2 += this.groupLoadPercent(var3); // L: 282 - } - } - - if (var1 == 0) { // L: 285 - return 100; - } else { - var3 = var2 * 100 / var1; // L: 286 - return var3; // L: 287 - } } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lek;", - garbageValue = "681923343" + descriptor = "(I)V", + garbageValue = "2142497817" ) - @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 45 - } + @Export("loadAllLocal") + void loadAllLocal() { + this.validGroups = new boolean[super.groups.length]; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(ZZI)Lof;", - garbageValue = "447770531" - ) - static IndexedSprite method5021(boolean var0, boolean var1) { - return var0 ? (var1 ? Login.field1005 : WorldMapCacheName.options_buttons_2Sprite) : (var1 ? NetFileRequest.field3577 : Login.options_buttons_0Sprite); // L: 175 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-64" - ) - public static void method5060(int var0, int var1) { - VarbitComposition var2 = WorldMapSection2.method3329(var0); // L: 33 - int var3 = var2.baseVar; // L: 34 - int var4 = var2.startBit; // L: 35 - int var5 = var2.endBit; // L: 36 - int var6 = Varps.Varps_masks[var5 - var4]; // L: 37 - if (var1 < 0 || var1 > var6) { // L: 38 - var1 = 0; + int var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { + this.validGroups[var1] = false; } - var6 <<= var4; // L: 39 - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40 - } // L: 41 + if (this.archiveDisk == null) { + this.field3570 = true; + } else { + this.field3571 = -1; - @ObfuscatedName("j") + for (var1 = 0; var1 < this.validGroups.length; ++var1) { + if (super.fileCounts[var1] > 0) { + ArchiveDisk var2 = this.archiveDisk; + ArchiveDiskAction var4 = new ArchiveDiskAction(); + var4.type = 1; + var4.key = (long)var1; + var4.archiveDisk = var2; + var4.archive = this; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); + } + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3556 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3556 = 600; + } + + this.field3571 = var1; + } + } + + if (this.field3571 == -1) { + this.field3570 = true; + } + + } + } + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZZI)I", - garbageValue = "-513021878" + descriptor = "(IB)I", + garbageValue = "-50" ) - public static int method5061(boolean var0, boolean var1) { - byte var2 = 0; // L: 151 - int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 152 - return var3; // L: 153 + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + if (super.groups[var1] != null) { + return 100; + } else if (this.validGroups[var1]) { + return 100; + } else { + int var3 = this.index; + long var4 = (long)((var3 << 16) + var1); + int var2; + if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) { + var2 = UserComparator9.NetCache_responseArchiveBuffer.offset * 99 / (UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; + } else { + var2 = 0; + } + + return var2; + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-2066469038" + ) + public boolean method4964(int var1) { + return this.validGroups[var1]; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "722138687" + ) + public boolean method4956(int var1) { + return this.getGroupFileIds(var1) != null; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1676168398" + ) + @Export("loadPercent") + public int loadPercent() { + int var1 = 0; + int var2 = 0; + + int var3; + for (var3 = 0; var3 < super.groups.length; ++var3) { + if (super.fileCounts[var3] > 0) { + var1 += 100; + var2 += this.groupLoadPercent(var3); + } + } + + if (var1 == 0) { + return 100; + } else { + var3 = var2 * 100 / var1; + return var3; + } } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index af41f1c3c7..1f9a616334 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -1,327 +1,331 @@ import java.io.EOFException; import java.io.IOException; +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("la") +@ObfuscatedName("ln") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("e") + @ObfuscatedName("f") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lna;" + descriptor = "Lnh;" ) @Export("datFile") BufferedFile datFile; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lna;" + descriptor = "Lnh;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1822948391 + intValue = 2088353051 ) @Export("archive") int archive; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1175009945 + intValue = 1820040305 ) @Export("maxEntrySize") int maxEntrySize; static { - ArchiveDisk_buffer = new byte[520]; // L: 7 + ArchiveDisk_buffer = new byte[520]; } @ObfuscatedSignature( - descriptor = "(ILna;Lna;I)V" + descriptor = "(ILnh;Lnh;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { - this.datFile = null; // L: 8 - this.idxFile = null; // L: 9 - this.maxEntrySize = 65000; // L: 11 - this.archive = var1; // L: 14 - this.datFile = var2; // L: 15 - this.idxFile = var3; // L: 16 - this.maxEntrySize = var4; // L: 17 - } // L: 18 + this.datFile = null; + this.idxFile = null; + this.maxEntrySize = 65000; + this.archive = var1; + this.datFile = var2; + this.idxFile = var3; + this.maxEntrySize = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-1703583799" + descriptor = "(IB)[B", + garbageValue = "40" ) @Export("read") public byte[] read(int var1) { - synchronized(this.datFile) { // L: 21 + synchronized(this.datFile) { try { Object var10000; - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 23 + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { var10000 = null; return (byte[])var10000; } else { - this.idxFile.seek((long)(var1 * 6)); // L: 24 - this.idxFile.read(ArchiveDisk_buffer, 0, 6); // L: 25 - int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); // L: 26 - int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 27 - if (var3 < 0 || var3 > this.maxEntrySize) { // L: 28 + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); + int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var3 < 0 || var3 > this.maxEntrySize) { var10000 = null; return (byte[])var10000; - } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { // L: 29 + } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { var10000 = null; return (byte[])var10000; } else { - byte[] var5 = new byte[var3]; // L: 30 - int var6 = 0; // L: 31 + byte[] var5 = new byte[var3]; + int var6 = 0; - for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65 - if (var4 == 0) { // L: 34 + for (int var7 = 0; var6 < var3; ++var7) { + if (var4 == 0) { var10000 = null; return (byte[])var10000; } - this.datFile.seek((long)var4 * 520L); // L: 35 - int var8 = var3 - var6; // L: 36 + this.datFile.seek(520L * (long)var4); + int var8 = var3 - var6; int var9; int var10; int var11; int var12; byte var13; - if (var1 > 65535) { // L: 42 - if (var8 > 510) { // L: 43 + if (var1 > 65535) { + if (var8 > 510) { var8 = 510; } - var13 = 10; // L: 44 - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 45 - var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 46 - var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 47 - var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 48 - var12 = ArchiveDisk_buffer[9] & 255; // L: 49 + var13 = 10; + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); + var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); + var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); + var12 = ArchiveDisk_buffer[9] & 255; } else { - if (var8 > 512) { // L: 52 + if (var8 > 512) { var8 = 512; } - var13 = 8; // L: 53 - 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 - var12 = ArchiveDisk_buffer[7] & 255; // L: 58 + var13 = 8; + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); + var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 + if (var9 != var1 || var10 != var7 || var12 != this.archive) { var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61 + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { var10000 = null; return (byte[])var10000; } - int var14 = var8 + var13; // L: 62 + int var14 = var13 + var8; - for (int var15 = var13; var15 < var14; ++var15) { // L: 63 + for (int var15 = var13; var15 < var14; ++var15) { var5[var6++] = ArchiveDisk_buffer[var15]; } - var4 = var11; // L: 64 + var4 = var11; } byte[] var20 = var5; - return var20; // L: 67 + return var20; } } - } catch (IOException var18) { // L: 69 - return null; // L: 70 + } catch (IOException var18) { + return null; } } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I[BII)Z", - garbageValue = "53032426" + descriptor = "(I[BIB)Z", + garbageValue = "86" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { - synchronized(this.datFile) { // L: 76 - if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77 - boolean var5 = this.write0(var1, var2, var3, true); // L: 80 + synchronized(this.datFile) { + if (var3 >= 0 && var3 <= this.maxEntrySize) { + boolean var5 = this.write0(var1, var2, var3, true); if (!var5) { - var5 = this.write0(var1, var2, var3, false); // L: 81 + var5 = this.write0(var1, var2, var3, false); } - return var5; // L: 82 + return var5; } else { - throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); // L: 78 + throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); } } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I[BIZB)Z", - garbageValue = "-96" + descriptor = "(I[BIZI)Z", + garbageValue = "1190557700" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { - synchronized(this.datFile) { // L: 87 + synchronized(this.datFile) { try { int var6; boolean var10000; - if (var4) { // L: 90 - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 91 + if (var4) { + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { var10000 = false; return var10000; } - this.idxFile.seek((long)(var1 * 6)); // L: 92 - this.idxFile.read(ArchiveDisk_buffer, 0, 6); // L: 93 - var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 94 - if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { // L: 95 + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { var10000 = false; return var10000; } } else { - var6 = (int)((this.datFile.length() + 519L) / 520L); // L: 98 - if (var6 == 0) { // L: 99 + var6 = (int)((this.datFile.length() + 519L) / 520L); + if (var6 == 0) { var6 = 1; } } - ArchiveDisk_buffer[0] = (byte)(var3 >> 16); // L: 101 - ArchiveDisk_buffer[1] = (byte)(var3 >> 8); // L: 102 - ArchiveDisk_buffer[2] = (byte)var3; // L: 103 - ArchiveDisk_buffer[3] = (byte)(var6 >> 16); // L: 104 - ArchiveDisk_buffer[4] = (byte)(var6 >> 8); // L: 105 - ArchiveDisk_buffer[5] = (byte)var6; // L: 106 - this.idxFile.seek((long)(var1 * 6)); // L: 107 - this.idxFile.write(ArchiveDisk_buffer, 0, 6); // L: 108 - int var7 = 0; // L: 109 - int var8 = 0; // L: 110 + ArchiveDisk_buffer[0] = (byte)(var3 >> 16); + ArchiveDisk_buffer[1] = (byte)(var3 >> 8); + ArchiveDisk_buffer[2] = (byte)var3; + ArchiveDisk_buffer[3] = (byte)(var6 >> 16); + ArchiveDisk_buffer[4] = (byte)(var6 >> 8); + ArchiveDisk_buffer[5] = (byte)var6; + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.write(ArchiveDisk_buffer, 0, 6); + int var7 = 0; + int var8 = 0; while (true) { - if (var7 < var3) { // L: 111 - label171: { - int var9 = 0; // L: 112 + if (var7 < var3) { + label169: { + int var9 = 0; int var10; - if (var4) { // L: 113 - this.datFile.seek(520L * (long)var6); // L: 114 + if (var4) { + this.datFile.seek((long)var6 * 520L); int var11; int var12; - if (var1 > 65535) { // L: 118 + if (var1 > 65535) { try { - this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 - } catch (EOFException var17) { // L: 122 - break label171; // L: 123 + this.datFile.read(ArchiveDisk_buffer, 0, 10); + } catch (EOFException var17) { + break label169; } - var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 - var11 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 126 - var9 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 127 - var12 = ArchiveDisk_buffer[9] & 255; // L: 128 + var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var11 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); + var9 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); + var12 = ArchiveDisk_buffer[9] & 255; } else { try { - this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 - } catch (EOFException var16) { // L: 134 - break label171; // L: 135 + this.datFile.read(ArchiveDisk_buffer, 0, 8); + } catch (EOFException var16) { + break label169; } - var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 - var11 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 138 - var9 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 139 - var12 = ArchiveDisk_buffer[7] & 255; // L: 140 + var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + var11 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var9 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + var12 = ArchiveDisk_buffer[7] & 255; } - if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142 + if (var10 != var1 || var8 != var11 || var12 != this.archive) { var10000 = false; return var10000; } - if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { // L: 143 + if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { var10000 = false; return var10000; } } - if (var9 == 0) { // L: 145 - var4 = false; // L: 146 - var9 = (int)((this.datFile.length() + 519L) / 520L); // L: 147 - if (var9 == 0) { // L: 148 + if (var9 == 0) { + var4 = false; + var9 = (int)((this.datFile.length() + 519L) / 520L); + if (var9 == 0) { ++var9; } - if (var9 == var6) { // L: 149 + if (var9 == var6) { ++var9; } } - if (var1 > 65535) { // L: 151 - if (var3 - var7 <= 510) { // L: 152 + if (var1 > 65535) { + if (var3 - var7 <= 510) { var9 = 0; } - ArchiveDisk_buffer[0] = (byte)(var1 >> 24); // L: 153 - ArchiveDisk_buffer[1] = (byte)(var1 >> 16); // L: 154 - ArchiveDisk_buffer[2] = (byte)(var1 >> 8); // L: 155 - ArchiveDisk_buffer[3] = (byte)var1; // L: 156 - ArchiveDisk_buffer[4] = (byte)(var8 >> 8); // L: 157 - ArchiveDisk_buffer[5] = (byte)var8; // L: 158 - ArchiveDisk_buffer[6] = (byte)(var9 >> 16); // L: 159 - ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160 - ArchiveDisk_buffer[8] = (byte)var9; // L: 161 - ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162 - this.datFile.seek((long)var6 * 520L); // L: 163 - this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164 - var10 = var3 - var7; // L: 165 - if (var10 > 510) { // L: 166 + ArchiveDisk_buffer[0] = (byte)(var1 >> 24); + ArchiveDisk_buffer[1] = (byte)(var1 >> 16); + ArchiveDisk_buffer[2] = (byte)(var1 >> 8); + ArchiveDisk_buffer[3] = (byte)var1; + ArchiveDisk_buffer[4] = (byte)(var8 >> 8); + ArchiveDisk_buffer[5] = (byte)var8; + ArchiveDisk_buffer[6] = (byte)(var9 >> 16); + ArchiveDisk_buffer[7] = (byte)(var9 >> 8); + ArchiveDisk_buffer[8] = (byte)var9; + ArchiveDisk_buffer[9] = (byte)this.archive; + this.datFile.seek((long)var6 * 520L); + this.datFile.write(ArchiveDisk_buffer, 0, 10); + var10 = var3 - var7; + if (var10 > 510) { var10 = 510; } - this.datFile.write(var2, var7, var10); // L: 167 - var7 += var10; // L: 168 + this.datFile.write(var2, var7, var10); + var7 += var10; } else { - if (var3 - var7 <= 512) { // L: 171 + if (var3 - var7 <= 512) { var9 = 0; } - ArchiveDisk_buffer[0] = (byte)(var1 >> 8); // L: 172 - ArchiveDisk_buffer[1] = (byte)var1; // L: 173 - ArchiveDisk_buffer[2] = (byte)(var8 >> 8); // L: 174 - ArchiveDisk_buffer[3] = (byte)var8; // L: 175 - ArchiveDisk_buffer[4] = (byte)(var9 >> 16); // L: 176 - ArchiveDisk_buffer[5] = (byte)(var9 >> 8); // L: 177 - ArchiveDisk_buffer[6] = (byte)var9; // L: 178 - ArchiveDisk_buffer[7] = (byte)this.archive; // L: 179 - this.datFile.seek((long)var6 * 520L); // L: 180 - this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181 - var10 = var3 - var7; // L: 182 - if (var10 > 512) { // L: 183 + ArchiveDisk_buffer[0] = (byte)(var1 >> 8); + ArchiveDisk_buffer[1] = (byte)var1; + ArchiveDisk_buffer[2] = (byte)(var8 >> 8); + ArchiveDisk_buffer[3] = (byte)var8; + ArchiveDisk_buffer[4] = (byte)(var9 >> 16); + ArchiveDisk_buffer[5] = (byte)(var9 >> 8); + ArchiveDisk_buffer[6] = (byte)var9; + ArchiveDisk_buffer[7] = (byte)this.archive; + this.datFile.seek(520L * (long)var6); + this.datFile.write(ArchiveDisk_buffer, 0, 8); + var10 = var3 - var7; + if (var10 > 512) { var10 = 512; } - this.datFile.write(var2, var7, var10); // L: 184 - var7 += var10; // L: 185 + this.datFile.write(var2, var7, var10); + var7 += var10; } - var6 = var9; // L: 187 - ++var8; // L: 188 - continue; // L: 189 + var6 = var9; + ++var8; + continue; } } - var10000 = true; // L: 190 + var10000 = true; return var10000; } } catch (IOException var18) { @@ -331,20 +335,6 @@ public final class ArchiveDisk { } public String toString() { - return "" + this.archive; // L: 198 + return "" + this.archive; } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-16" - ) - public static void method5993() { - class397.SpriteBuffer_xOffsets = null; // L: 191 - class26.SpriteBuffer_yOffsets = null; // L: 192 - Canvas.SpriteBuffer_spriteWidths = null; // L: 193 - Clock.SpriteBuffer_spriteHeights = null; // L: 194 - class397.SpriteBuffer_spritePalette = null; // L: 195 - class126.SpriteBuffer_pixels = null; // L: 196 - } // L: 197 } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 8cfc227c02..a55e130ba3 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -3,32 +3,99 @@ 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("jw") +@ObfuscatedName("ji") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("f") + @ObfuscatedName("iu") @ObfuscatedGetter( - intValue = 1353855841 + intValue = -1585386583 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 260859515 ) @Export("type") int type; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("data") byte[] data; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lln;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljs;" ) @Export("archive") Archive archive; ArchiveDiskAction() { - } // L: 12 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-54638218" + ) + static int method4944(int var0, Script var1, boolean var2) { + Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 2610) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 2613) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else if (var0 != 2615 && var0 != 2616) { + return 2; + } else { + ++Interpreter.Interpreter_intStackSize; + return 1; + } + } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index c4188f896e..8449e71bff 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,91 +4,159 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("jd") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 264350285 + intValue = 1211237295 ) - static int field3557; - @ObfuscatedName("y") + static int field3556; + @ObfuscatedName("l") @Export("ArchiveDiskActionHandler_lock") static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; + @ObfuscatedName("n") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; static { - ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 - ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3557 = 0; // L: 11 + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); + field3556 = 0; ArchiveDiskActionHandler_lock = new Object(); - } // L: 12 + } ArchiveDiskActionHandler() { - } // L: 15 + } public void run() { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 72 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 73 - } // L: 74 + synchronized(ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); + } - 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) { + if (var1.type == 0) { + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); + synchronized(ArchiveDiskActionHandler_requestQueue) { + var1.remove(); + } + } else if (var1.type == 1) { + var1.data = var1.archiveDisk.read((int)var1.key); + synchronized(ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler_responseQueue.addFirst(var1); + } } - synchronized(ArchiveDiskActionHandler_lock) { // L: 88 - if (field3557 <= 1) { // L: 89 - field3557 = 0; // L: 90 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 91 - return; // L: 92 + synchronized(ArchiveDiskActionHandler_lock) { + if (field3556 <= 1) { + field3556 = 0; + ArchiveDiskActionHandler_lock.notifyAll(); + return; } - field3557 = 600; // L: 94 + field3556 = 600; } } else { - class18.method272(100L); // L: 98 - synchronized(ArchiveDiskActionHandler_lock) { // L: 99 - if (field3557 <= 1) { // L: 100 - field3557 = 0; // L: 101 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 102 - return; // L: 103 + SceneTilePaint.method4322(100L); + synchronized(ArchiveDiskActionHandler_lock) { + if (field3556 <= 1) { + field3556 = 0; + ArchiveDiskActionHandler_lock.notifyAll(); + return; } - --field3557; // L: 105 + --field3556; } } } - } catch (Exception var13) { // L: 110 - FriendsChat.RunException_sendStackTrace((String)null, var13); // L: 111 + } catch (Exception var13) { + BufferedSink.RunException_sendStackTrace((String)null, var13); } - } // L: 113 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(CI)B", + garbageValue = "765795855" + ) + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { + var1 = (byte)var0; + } else if (var0 == 8364) { + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { + var1 = -117; + } else if (var0 == 338) { + var1 = -116; + } else if (var0 == 381) { + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { + var1 = -105; + } else if (var0 == 732) { + var1 = -104; + } else if (var0 == 8482) { + var1 = -103; + } else if (var0 == 353) { + var1 = -102; + } else if (var0 == 8250) { + var1 = -101; + } else if (var0 == 339) { + var1 = -100; + } else if (var0 == 382) { + var1 = -98; + } else if (var0 == 376) { + var1 = -97; + } else { + var1 = 63; + } + + return var1; + } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index dfa6d163f3..54e4082450 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,74 +4,206 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("ba") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lkt;" ) - @Export("musicTrack") - static MusicTrack musicTrack; - @ObfuscatedName("x") - @Export("cacheParentPaths") - public static String[] cacheParentPaths; - @ObfuscatedName("e") + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljs;" ) @Export("archive") final Archive archive; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1724172575 + intValue = -1698036073 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1090866547 + intValue = 220643987 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Ljf;Ljava/lang/String;)V" + descriptor = "(Ljs;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { - this.loadedCount = 0; // L: 9 - this.archive = var1; // L: 12 - this.groupCount = var1.getGroupCount(); // L: 13 - } // L: 14 + this.loadedCount = 0; + this.archive = var1; + this.groupCount = var1.getGroupCount(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1253534662" + descriptor = "(B)Z", + garbageValue = "-3" ) @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.method5031(var1) || this.archive.method5030(var1)) { - ++this.loadedCount; // L: 19 + for (int var1 = 0; var1 < this.groupCount; ++var1) { + if (!this.archive.method4956(var1) || this.archive.method4964(var1)) { + ++this.loadedCount; } } - return this.loadedCount >= this.groupCount; // L: 21 + return this.loadedCount >= this.groupCount; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Lhg;", - garbageValue = "-283445178" + garbageValue = "-2061376576" ) - public static PacketBufferNode method2162() { - PacketBufferNode var0 = WorldMapData_1.method3583(); // L: 50 - var0.clientPacket = null; // L: 51 - var0.clientPacketLength = 0; // L: 52 - var0.packetBuffer = new PacketBuffer(5000); // L: 53 - return var0; // L: 54 + public static PacketBufferNode method1779() { + PacketBufferNode var0 = CollisionMap.method3205(); + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IZII)V", + garbageValue = "1089471129" + ) + public static final void method1781(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { + GrandExchangeOfferAgeComparator.field3633 = var0; + PcmPlayer.PcmPlayer_stereo = var1; + PcmPlayer.field181 = var2; + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(Lio;IIII)V", + garbageValue = "131255648" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class262.playPcmPlayers(); + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = MouseHandler.localPlayer.x / 32 + 48; + int var7 = 464 - MouseHandler.localPlayer.y / 32; + class376.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var16 = Client.mapIconXs[var8] * 4 + 2 - MouseHandler.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - MouseHandler.localPlayer.y / 32; + class267.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var16 = 0; var16 < 104; ++var16) { + NodeDeque var14 = Client.groundItems[GrandExchangeEvent.Client_plane][var8][var16]; + if (var14 != null) { + var11 = var8 * 4 + 2 - MouseHandler.localPlayer.x / 32; + var12 = var16 * 4 + 2 - MouseHandler.localPlayer.y / 32; + class267.drawSpriteOnMinimap(var1, var2, var11, var12, class126.mapDotSprites[0], var4); + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var9 = Client.npcs[Client.npcIndices[var8]]; + if (var9 != null && var9.isVisible()) { + NPCComposition var18 = var9.definition; + if (var18 != null && var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { + var11 = var9.x / 32 - MouseHandler.localPlayer.x / 32; + var12 = var9.y / 32 - MouseHandler.localPlayer.y / 32; + class267.drawSpriteOnMinimap(var1, var2, var11, var12, class126.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var17 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var15 = Client.players[var17[var10]]; + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != MouseHandler.localPlayer) { + var12 = var15.x / 32 - MouseHandler.localPlayer.x / 32; + int var13 = var15.y / 32 - MouseHandler.localPlayer.y / 32; + if (var15.isFriend()) { + class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[3], var4); + } else if (MouseHandler.localPlayer.team != 0 && var15.team != 0 && var15.team == MouseHandler.localPlayer.team) { + class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { + class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { + class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[6], var4); + } else { + class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; + if (var19 != null) { + var11 = var19.x / 32 - MouseHandler.localPlayer.x / 32; + var12 = var19.y / 32 - MouseHandler.localPlayer.y / 32; + Varcs.worldToMinimap(var1, var2, var11, var12, FloorUnderlayDefinition.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - GrandExchangeOfferNameComparator.baseX * 4 + 2 - MouseHandler.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - NPC.baseY * 4 + 2 - MouseHandler.localPlayer.y / 32; + Varcs.worldToMinimap(var1, var2, var10, var11, FloorUnderlayDefinition.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var20 = Client.players[Client.hintArrowPlayerIndex]; + if (var20 != null) { + var11 = var20.x / 32 - MouseHandler.localPlayer.x / 32; + var12 = var20.y / 32 - MouseHandler.localPlayer.y / 32; + Varcs.worldToMinimap(var1, var2, var11, var12, FloorUnderlayDefinition.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - MouseHandler.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - MouseHandler.localPlayer.y / 32; + class267.drawSpriteOnMinimap(var1, var2, var10, var11, FloorUnderlayDefinition.mapMarkerSprites[0], var4); + } + + if (!MouseHandler.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + Client.field617[var3] = true; + } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index a4b4fa194e..c880aad353 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -1,146 +1,187 @@ -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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dh") +@ObfuscatedName("ce") @Implements("AttackOption") -public enum AttackOption implements Enumerated -{ - @ObfuscatedName("f") +public enum AttackOption implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lce;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lce;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lce;" ) - @Export("AttackOption_leftClickWhereAvailable") - AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("y") + field1156(2), + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lce;" ) @Export("AttackOption_hidden") - AttackOption_hidden(3); + AttackOption_hidden(3), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lce;" + ) + field1157(4); - @ObfuscatedName("rp") + @ObfuscatedName("k") + static int[] field1161; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -31458981 + intValue = 1465894369 ) - static int field1351; - @ObfuscatedName("qv") - @ObfuscatedSignature( - descriptor = "Ly;" - ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("Widget_archive") - static AbstractArchive Widget_archive; + @Export("cacheGamebuild") + static int cacheGamebuild; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2122478907 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -183653165 + intValue = -641800473 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 11723 - } // L: 11724 + this.id = var3; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 11727 + return this.id; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZB)V", - garbageValue = "98" + descriptor = "(II)I", + garbageValue = "-474179746" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { // L: 28 - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 29 - try { - Desktop.getDesktop().browse(new URI(var0)); // L: 31 - return; // L: 52 - } catch (Exception var4) { // L: 34 - } + public static int method2006(int var0) { + return class345.field3941[var0 & 16383]; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-191139997" + ) + static void method2005() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (Decimator.clientPreferences.rememberedUsername != null) { + Login.Login_username = Decimator.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; } - if (class44.field309.startsWith("win")) { // L: 36 - StudioGame.method4982(var0, 0); // L: 38 - } else if (class44.field309.startsWith("mac")) { // L: 42 - HealthBarUpdate.method2284(var0, 1, "openjs"); // L: 43 - } else { - StudioGame.method4982(var0, 2); // L: 46 - } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "148408733" + ) + static int method1994(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + return 1; } else { - StudioGame.method4982(var0, 3); // L: 49 + return 2; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lem;I)Z", + garbageValue = "-1661175610" + ) + static boolean method2003(ObjectComposition var0) { + if (var0.transforms != null) { + int[] var1 = var0.transforms; + + for (int var2 = 0; var2 < var1.length; ++var2) { + int var3 = var1[var2]; + ObjectComposition var4 = ClanChannel.getObjectDefinition(var3); + if (var4.mapIconId != -1) { + return true; + } + } + } else if (var0.mapIconId != -1) { + return true; + } + + return false; + } + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "([Lio;Lio;ZI)V", + garbageValue = "-262719970" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1852896115 * 13396411 : var1.width * 1408116923 * -396764045; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1927321653 * -2086667747 : var1.height * 1272528565 * 1874739101; + FaceNormal.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + FaceNormal.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + int var6 = var5.group; + if (Huffman.loadInterface(var6)) { + FaceNormal.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); + } + } + + if (var1.contentType == 1337) { } } - @ObfuscatedName("r") + @ObfuscatedName("jp") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1819864841" + descriptor = "(Lio;I)V", + garbageValue = "1411916800" ) - static final int method2382(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 801 - int var4 = var0 & var2 - 1; // L: 802 - int var5 = var1 / var2; // L: 803 - int var6 = var1 & var2 - 1; // L: 804 - int var7 = UrlRequester.method2509(var3, var5); // L: 805 - int var8 = UrlRequester.method2509(var3 + 1, var5); // L: 806 - int var9 = UrlRequester.method2509(var3, var5 + 1); // L: 807 - int var10 = UrlRequester.method2509(var3 + 1, var5 + 1); // L: 808 - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 811 - int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 812 - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 817 - int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); // L: 818 - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 823 - int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); // L: 824 - return var15; // L: 826 - } + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field615) { + Client.field616[var0.rootIndex] = true; + } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-2129644810" - ) - static final int method2378(int var0, int var1) { - int var2 = var1 * 57 + var0; // L: 837 - var2 ^= var2 << 13; // L: 838 - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 839 - return var3 >> 19 & 255; // L: 840 } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 1174711bcc..3dfacd942d 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,157 +3,157 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("az") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("o") - static float[][] field532; - @ObfuscatedName("m") + @ObfuscatedName("n") + static float[][] field318; + @ObfuscatedName("w") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("r") - static float field534; - @ObfuscatedName("h") + @ObfuscatedName("f") + static float field311; + @ObfuscatedName("o") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("pairs") int[] pairs; @ObfuscatedName("v") - int[][][] field533; - @ObfuscatedName("y") - int[][][] field530; + int[][][] field313; @ObfuscatedName("j") - int[] field531; + int[][][] field314; + @ObfuscatedName("l") + int[] field315; static { - field532 = new float[2][8]; // L: 13 - coefficients = new int[2][8]; // L: 14 + field318 = new float[2][8]; + coefficients = new int[2][8]; } AudioFilter() { - this.pairs = new int[2]; // L: 8 - this.field533 = new int[2][2][4]; // L: 10 - this.field530 = new int[2][2][4]; // L: 11 - this.field531 = new int[2]; // L: 12 - } // L: 21 + this.pairs = new int[2]; + this.field313 = new int[2][2][4]; + this.field314 = new int[2][2][4]; + this.field315 = new int[2]; + } - @ObfuscatedName("f") - float method1191(int var1, int var2, float var3) { - float var4 = (float)this.field530[var1][0][var2] + var3 * (float)(this.field530[var1][1][var2] - this.field530[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") + float method822(int var1, int var2, float var3) { + float var4 = (float)this.field314[var1][0][var2] + var3 * (float)(this.field314[var1][1][var2] - this.field314[var1][0][var2]); + var4 *= 0.0015258789F; + return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } @ObfuscatedName("v") - float method1177(int var1, int var2, float var3) { - float var4 = (float)this.field533[var1][0][var2] + var3 * (float)(this.field533[var1][1][var2] - this.field533[var1][0][var2]); // L: 35 - var4 *= 1.2207031E-4F; // L: 36 - return normalize(var4); // L: 37 - } - - @ObfuscatedName("y") - @Export("compute") - int compute(int var1, float var2) { - float var3; - if (var1 == 0) { // L: 41 - var3 = (float)this.field531[0] + (float)(this.field531[1] - this.field531[0]) * var2; // L: 42 - var3 *= 0.0030517578F; // L: 43 - field534 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 - forwardMultiplier = (int)(field534 * 65536.0F); // L: 45 - } - - if (this.pairs[var1] == 0) { // L: 47 - return 0; - } else { - var3 = this.method1191(var1, 0, var2); // L: 48 - field532[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1177(var1, 0, var2)); // L: 49 - field532[var1][1] = var3 * var3; // L: 50 - - float[] var10000; - int var4; - for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method1191(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1177(var1, var4, var2)); // L: 53 - float var6 = var3 * var3; // L: 54 - field532[var1][var4 * 2 + 1] = field532[var1][var4 * 2 - 1] * var6; // L: 55 - field532[var1][var4 * 2] = field532[var1][var4 * 2 - 1] * var5 + field532[var1][var4 * 2 - 2] * var6; // L: 56 - - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 - var10000 = field532[var1]; - var10000[var7] += field532[var1][var7 - 1] * var5 + field532[var1][var7 - 2] * var6; - } - - var10000 = field532[var1]; // L: 58 - var10000[1] += field532[var1][0] * var5 + var6; - var10000 = field532[var1]; // L: 59 - var10000[0] += var5; - } - - if (var1 == 0) { // L: 61 - for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field532[0]; - var10000[var4] *= field534; - } - } - - for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field532[var1][var4] * 65536.0F); - } - - return this.pairs[var1] * 2; // L: 63 - } + float method809(int var1, int var2, float var3) { + float var4 = (float)this.field313[var1][0][var2] + var3 * (float)(this.field313[var1][1][var2] - this.field313[var1][0][var2]); + var4 *= 1.2207031E-4F; + return normalize(var4); } @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lnt;Lbx;)V" - ) - final void method1176(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.field531[0] = var1.readUnsignedShort(); // L: 71 - this.field531[1] = var1.readUnsignedShort(); // L: 72 - int var7 = var1.readUnsignedByte(); // L: 73 + @Export("compute") + int compute(int var1, float var2) { + float var3; + if (var1 == 0) { + var3 = (float)this.field315[0] + (float)(this.field315[1] - this.field315[0]) * var2; + var3 *= 0.0030517578F; + field311 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field311 * 65536.0F); + } - int var5; - int var6; - for (var5 = 0; var5 < 2; ++var5) { // L: 74 - for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field533[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field530[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + if (this.pairs[var1] == 0) { + return 0; + } else { + var3 = this.method822(var1, 0, var2); + field318[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method809(var1, 0, var2)); + field318[var1][1] = var3 * var3; + + float[] var10000; + int var4; + for (var4 = 1; var4 < this.pairs[var1]; ++var4) { + var3 = this.method822(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method809(var1, var4, var2)); + float var6 = var3 * var3; + field318[var1][var4 * 2 + 1] = field318[var1][var4 * 2 - 1] * var6; + field318[var1][var4 * 2] = field318[var1][var4 * 2 - 1] * var5 + field318[var1][var4 * 2 - 2] * var6; + + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { + var10000 = field318[var1]; + var10000[var7] += field318[var1][var7 - 1] * var5 + field318[var1][var7 - 2] * var6; + } + + var10000 = field318[var1]; + var10000[1] += field318[var1][0] * var5 + var6; + var10000 = field318[var1]; + var10000[0] += var5; + } + + if (var1 == 0) { + for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { + var10000 = field318[0]; + var10000[var4] *= field311; } } - 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.field533[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field530[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { + coefficients[var1][var4] = (int)(field318[var1][var4] * 65536.0F); + } + + return this.pairs[var1] * 2; + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lnv;Lg;)V" + ) + final void method812(Buffer var1, SoundEnvelope var2) { + int var3 = var1.readUnsignedByte(); + this.pairs[0] = var3 >> 4; + this.pairs[1] = var3 & 15; + if (var3 != 0) { + this.field315[0] = var1.readUnsignedShort(); + this.field315[1] = var1.readUnsignedShort(); + int var7 = var1.readUnsignedByte(); + + int var5; + int var6; + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { + this.field313[var5][0][var6] = var1.readUnsignedShort(); + this.field314[var5][0][var6] = var1.readUnsignedShort(); + } + } + + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { + if ((var7 & 1 << var5 * 4 << var6) != 0) { + this.field313[var5][1][var6] = var1.readUnsignedShort(); + this.field314[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field533[var5][1][var6] = this.field533[var5][0][var6]; // L: 87 - this.field530[var5][1][var6] = this.field530[var5][0][var6]; // L: 88 + this.field313[var5][1][var6] = this.field313[var5][0][var6]; + this.field314[var5][1][var6] = this.field314[var5][0][var6]; } } } - if (var7 != 0 || this.field531[1] != this.field531[0]) { // L: 92 + if (var7 != 0 || this.field315[1] != this.field315[0]) { var2.decodeSegments(var1); } } else { - int[] var4 = this.field531; // L: 95 - this.field531[1] = 0; // L: 96 - var4[0] = 0; // L: 97 + int[] var4 = this.field315; + this.field315[1] = 0; + var4[0] = 0; } - } // L: 99 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("normalize") static float normalize(float var0) { - float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 - return var1 * 3.1415927F / 11025.0F; // L: 31 + float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); + return var1 * 3.1415927F / 11025.0F; } } diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index c1f9e5dc74..f5838c72e0 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,129 +3,129 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("no") +@ObfuscatedName("na") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lnn;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; static { - BZip2Decompressor_state = new BZip2State(); // L: 13 + BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { - synchronized(BZip2Decompressor_state) { // L: 20 - BZip2Decompressor_state.inputArray = var2; // L: 21 - BZip2Decompressor_state.nextByte = var4; // L: 22 - BZip2Decompressor_state.outputArray = var0; // L: 23 - BZip2Decompressor_state.next_out = 0; // L: 24 - BZip2Decompressor_state.outputLength = var1; // L: 25 - BZip2Decompressor_state.bsLive = 0; // L: 26 - BZip2Decompressor_state.bsBuff = 0; // L: 27 - BZip2Decompressor_state.nextBit_unused = 0; // L: 28 - BZip2Decompressor_state.field4175 = 0; // L: 29 - BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 - var1 -= BZip2Decompressor_state.outputLength; // L: 31 - BZip2Decompressor_state.inputArray = null; // L: 32 - BZip2Decompressor_state.outputArray = null; // L: 33 - return var1; // L: 34 + synchronized(BZip2Decompressor_state) { + BZip2Decompressor_state.inputArray = var2; + BZip2Decompressor_state.nextByte = var4; + BZip2Decompressor_state.outputArray = var0; + BZip2Decompressor_state.next_out = 0; + BZip2Decompressor_state.outputLength = var1; + BZip2Decompressor_state.bsLive = 0; + BZip2Decompressor_state.bsBuff = 0; + BZip2Decompressor_state.nextBit_unused = 0; + BZip2Decompressor_state.field4196 = 0; + BZip2Decompressor_decompress(BZip2Decompressor_state); + var1 -= BZip2Decompressor_state.outputLength; + BZip2Decompressor_state.inputArray = null; + BZip2Decompressor_state.outputArray = null; + return var1; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lny;)V" + descriptor = "(Lnn;)V" ) - static void method6862(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 = BZip2State.BZip2Decompressor_block; // L: 44 - int var7 = var0.field4182; // L: 45 - byte[] var8 = var0.outputArray; // L: 46 - int var9 = var0.next_out; // L: 47 - int var10 = var0.outputLength; // L: 48 - int var12 = var0.field4201 + 1; // L: 50 + static void method6909(BZip2State var0) { + byte var2 = var0.out_char; + int var3 = var0.su_rNToGo; + int var4 = var0.nblocks_used; + int var5 = var0.su_ch2; + int[] var6 = BufferedSink.BZip2Decompressor_block; + int var7 = var0.field4203; + byte[] var8 = var0.outputArray; + int var9 = var0.next_out; + int var10 = var0.outputLength; + int var12 = var0.field4207 + 1; label70: while (true) { - if (var3 > 0) { // L: 53 + if (var3 > 0) { while (true) { - if (var10 == 0) { // L: 55 + if (var10 == 0) { break label70; } - if (var3 == 1) { // L: 56 - if (var10 == 0) { // L: 62 - var3 = 1; // L: 63 + if (var3 == 1) { + if (var10 == 0) { + var3 = 1; break label70; } - var8[var9] = var2; // L: 66 - ++var9; // L: 67 - --var10; // L: 68 + var8[var9] = var2; + ++var9; + --var10; break; } - var8[var9] = var2; // L: 57 - --var3; // L: 58 - ++var9; // L: 59 - --var10; // L: 60 + var8[var9] = var2; + --var3; + ++var9; + --var10; } } - while (var4 != var12) { // L: 71 - var2 = (byte)var5; // L: 75 - var7 = var6[var7]; // L: 76 - byte var1 = (byte)var7; // L: 77 - var7 >>= 8; // L: 78 - ++var4; // L: 79 - if (var1 != var5) { // L: 80 - var5 = var1; // L: 81 - if (var10 == 0) { // L: 82 - var3 = 1; // L: 83 - break label70; // L: 84 + while (var4 != var12) { + var2 = (byte)var5; + var7 = var6[var7]; + byte var1 = (byte)var7; + var7 >>= 8; + ++var4; + if (var1 != var5) { + var5 = var1; + if (var10 == 0) { + var3 = 1; + break label70; } - var8[var9] = var2; // L: 86 - ++var9; // L: 87 - --var10; // L: 88 + var8[var9] = var2; + ++var9; + --var10; } else { - if (var4 != var12) { // L: 91 - var3 = 2; // L: 103 - var7 = var6[var7]; // L: 104 - var1 = (byte)var7; // L: 105 - var7 >>= 8; // L: 106 - ++var4; // L: 107 - if (var4 != var12) { // L: 108 - if (var1 != var5) { // L: 109 - var5 = var1; // L: 110 + if (var4 != var12) { + var3 = 2; + var7 = var6[var7]; + var1 = (byte)var7; + var7 >>= 8; + ++var4; + if (var4 != var12) { + if (var1 != var5) { + var5 = var1; } else { - var3 = 3; // L: 113 - var7 = var6[var7]; // L: 114 - var1 = (byte)var7; // L: 115 - var7 >>= 8; // L: 116 - ++var4; // L: 117 - if (var4 != var12) { // L: 118 - if (var1 != var5) { // L: 119 - var5 = var1; // L: 120 + var3 = 3; + var7 = var6[var7]; + var1 = (byte)var7; + var7 >>= 8; + ++var4; + if (var4 != var12) { + if (var1 != var5) { + var5 = var1; } else { - var7 = var6[var7]; // L: 123 - var1 = (byte)var7; // L: 124 - var7 >>= 8; // L: 125 - ++var4; // L: 126 - var3 = (var1 & 255) + 4; // L: 127 - var7 = var6[var7]; // L: 128 - var5 = (byte)var7; // L: 129 - var7 >>= 8; // L: 130 - ++var4; // L: 131 + var7 = var6[var7]; + var1 = (byte)var7; + var7 >>= 8; + ++var4; + var3 = (var1 & 255) + 4; + var7 = var6[var7]; + var5 = (byte)var7; + var7 >>= 8; + ++var4; } } } @@ -133,508 +133,508 @@ public final class BZip2Decompressor { continue label70; } - if (var10 == 0) { // L: 92 - var3 = 1; // L: 93 - break label70; // L: 94 + if (var10 == 0) { + var3 = 1; + break label70; } - var8[var9] = var2; // L: 96 - ++var9; // L: 97 - --var10; // L: 98 + var8[var9] = var2; + ++var9; + --var10; } } - var3 = 0; // L: 72 - break; // L: 73 + var3 = 0; + break; } - int var13 = var0.field4175; // L: 133 - var0.field4175 += var10 - var10; // L: 134 - if (var0.field4175 < var13) { // L: 135 + int var13 = var0.field4196; + var0.field4196 += var10 - var10; + if (var0.field4196 < var13) { } - var0.out_char = var2; // L: 136 - var0.su_rNToGo = var3; // L: 137 - var0.nblocks_used = var4; // L: 138 - var0.su_ch2 = var5; // L: 139 - BZip2State.BZip2Decompressor_block = var6; // L: 140 - var0.field4182 = var7; // L: 141 - var0.outputArray = var8; // L: 142 - var0.next_out = var9; // L: 143 - var0.outputLength = var10; // L: 144 - } // L: 145 + var0.out_char = var2; + var0.su_rNToGo = var3; + var0.nblocks_used = var4; + var0.su_ch2 = var5; + BufferedSink.BZip2Decompressor_block = var6; + var0.field4203 = var7; + var0.outputArray = var8; + var0.next_out = var9; + var0.outputLength = var10; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lny;)V" + descriptor = "(Lnn;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { - boolean var4 = false; // L: 151 - boolean var5 = false; // L: 152 - boolean var6 = false; // L: 153 - boolean var7 = false; // L: 154 - boolean var8 = false; // L: 155 - boolean var9 = false; // L: 156 - boolean var10 = false; // L: 157 - boolean var11 = false; // L: 158 - boolean var12 = false; // L: 159 - boolean var13 = false; // L: 160 - boolean var14 = false; // L: 161 - boolean var15 = false; // L: 162 - boolean var16 = false; // L: 163 - boolean var17 = false; // L: 164 - boolean var18 = false; // L: 165 - boolean var19 = false; // L: 166 - boolean var20 = false; // L: 167 - boolean var21 = false; // L: 168 - int var22 = 0; // L: 169 - int[] var23 = null; // L: 170 - int[] var24 = null; // L: 171 - int[] var25 = null; // L: 172 - var0.blockSize100k = -1495192005; // L: 173 - if (BZip2State.BZip2Decompressor_block == null) { // L: 174 - BZip2State.BZip2Decompressor_block = new int[var0.blockSize100k * -293926432]; + boolean var4 = false; + boolean var5 = false; + boolean var6 = false; + boolean var7 = false; + boolean var8 = false; + boolean var9 = false; + boolean var10 = false; + boolean var11 = false; + boolean var12 = false; + boolean var13 = false; + boolean var14 = false; + boolean var15 = false; + boolean var16 = false; + boolean var17 = false; + boolean var18 = false; + boolean var19 = false; + boolean var20 = false; + boolean var21 = false; + int var22 = 0; + int[] var23 = null; + int[] var24 = null; + int[] var25 = null; + var0.blockSize100k = 536353965; + if (BufferedSink.BZip2Decompressor_block == null) { + BufferedSink.BZip2Decompressor_block = new int[var0.blockSize100k * 669701408]; } - boolean var26 = true; // L: 175 + boolean var26 = true; while (true) { while (var26) { - byte var1 = BZip2Decompressor_readNextByte(var0); // L: 177 - if (var1 == 23) { // L: 178 + byte var1 = BZip2Decompressor_readNextByte(var0); + if (var1 == 23) { return; } - var1 = BZip2Decompressor_readNextByte(var0); // L: 179 - var1 = BZip2Decompressor_readNextByte(var0); // L: 180 - var1 = BZip2Decompressor_readNextByte(var0); // L: 181 - var1 = BZip2Decompressor_readNextByte(var0); // L: 182 - var1 = BZip2Decompressor_readNextByte(var0); // L: 183 - var1 = BZip2Decompressor_readNextByte(var0); // L: 184 - var1 = BZip2Decompressor_readNextByte(var0); // L: 185 - var1 = BZip2Decompressor_readNextByte(var0); // L: 186 - var1 = BZip2Decompressor_readNextByte(var0); // L: 187 - var1 = BZip2Decompressor_readNextBit(var0); // L: 188 - if (var1 != 0) { // L: 189 + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 != 0) { } - var0.originalPointer = 0; // L: 191 - var1 = BZip2Decompressor_readNextByte(var0); // L: 192 - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 193 - var1 = BZip2Decompressor_readNextByte(var0); // L: 194 - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 195 - var1 = BZip2Decompressor_readNextByte(var0); // L: 196 - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 197 + var0.originalPointer = 0; + var1 = BZip2Decompressor_readNextByte(var0); + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; + var1 = BZip2Decompressor_readNextByte(var0); + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; + var1 = BZip2Decompressor_readNextByte(var0); + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; int var36; - for (var36 = 0; var36 < 16; ++var36) { // L: 198 - var1 = BZip2Decompressor_readNextBit(var0); // L: 199 - if (var1 == 1) { // L: 200 + for (var36 = 0; var36 < 16; ++var36) { + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 1) { var0.inUse16[var36] = true; } else { - var0.inUse16[var36] = false; // L: 201 + var0.inUse16[var36] = false; } } - for (var36 = 0; var36 < 256; ++var36) { // L: 203 + for (var36 = 0; var36 < 256; ++var36) { var0.inUse[var36] = false; } int var37; - for (var36 = 0; var36 < 16; ++var36) { // L: 204 - if (var0.inUse16[var36]) { // L: 205 - for (var37 = 0; var37 < 16; ++var37) { // L: 206 - var1 = BZip2Decompressor_readNextBit(var0); // L: 207 - if (var1 == 1) { // L: 208 + for (var36 = 0; var36 < 16; ++var36) { + if (var0.inUse16[var36]) { + for (var37 = 0; var37 < 16; ++var37) { + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 1) { var0.inUse[var37 + var36 * 16] = true; } } } } - makeMaps(var0); // L: 212 - int var39 = var0.nInUse + 2; // L: 213 - int var40 = BZip2Decompressor_readBits(3, var0); // L: 214 - int var41 = BZip2Decompressor_readBits(15, var0); // L: 215 + makeMaps(var0); + int var39 = var0.nInUse + 2; + int var40 = BZip2Decompressor_readBits(3, var0); + int var41 = BZip2Decompressor_readBits(15, var0); - for (var36 = 0; var36 < var41; ++var36) { // L: 216 - var37 = 0; // L: 217 + for (var36 = 0; var36 < var41; ++var36) { + var37 = 0; while (true) { - var1 = BZip2Decompressor_readNextBit(var0); // L: 219 - if (var1 == 0) { // L: 220 - var0.selectorMtf[var36] = (byte)var37; // L: 223 + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 0) { + var0.selectorMtf[var36] = (byte)var37; break; } - ++var37; // L: 221 + ++var37; } } - byte[] var27 = new byte[6]; // L: 226 + byte[] var27 = new byte[6]; byte var29; - for (var29 = 0; var29 < var40; var27[var29] = var29++) { // L: 229 + for (var29 = 0; var29 < var40; var27[var29] = var29++) { } - for (var36 = 0; var36 < var41; ++var36) { // L: 230 - var29 = var0.selectorMtf[var36]; // L: 231 + for (var36 = 0; var36 < var41; ++var36) { + var29 = var0.selectorMtf[var36]; byte var28; - for (var28 = var27[var29]; var29 > 0; --var29) { // L: 232 233 235 - var27[var29] = var27[var29 - 1]; // L: 234 + for (var28 = var27[var29]; var29 > 0; --var29) { + var27[var29] = var27[var29 - 1]; } - var27[0] = var28; // L: 237 - var0.selector[var36] = var28; // L: 238 + var27[0] = var28; + var0.selector[var36] = var28; } int var38; - for (var38 = 0; var38 < var40; ++var38) { // L: 241 - int var50 = BZip2Decompressor_readBits(5, var0); // L: 242 + for (var38 = 0; var38 < var40; ++var38) { + int var50 = BZip2Decompressor_readBits(5, var0); - for (var36 = 0; var36 < var39; ++var36) { // L: 243 + for (var36 = 0; var36 < var39; ++var36) { while (true) { - var1 = BZip2Decompressor_readNextBit(var0); // L: 245 - if (var1 == 0) { // L: 246 - var0.temp_charArray2d[var38][var36] = (byte)var50; // L: 251 + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 0) { + var0.temp_charArray2d[var38][var36] = (byte)var50; break; } - var1 = BZip2Decompressor_readNextBit(var0); // L: 247 - if (var1 == 0) { // L: 248 + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 0) { ++var50; } else { - --var50; // L: 249 + --var50; } } } } - for (var38 = 0; var38 < var40; ++var38) { // L: 254 - byte var2 = 32; // L: 255 - byte var3 = 0; // L: 256 + for (var38 = 0; var38 < var40; ++var38) { + byte var2 = 32; + byte var3 = 0; - for (var36 = 0; var36 < var39; ++var36) { // L: 257 - if (var0.temp_charArray2d[var38][var36] > var3) { // L: 258 + for (var36 = 0; var36 < var39; ++var36) { + if (var0.temp_charArray2d[var38][var36] > var3) { var3 = var0.temp_charArray2d[var38][var36]; } - if (var0.temp_charArray2d[var38][var36] < var2) { // L: 259 + if (var0.temp_charArray2d[var38][var36] < var2) { var2 = var0.temp_charArray2d[var38][var36]; } } - BZip2Decompressor_createHuffmanTables(var0.limit[var38], var0.base[var38], var0.perm[var38], var0.temp_charArray2d[var38], var2, var3, var39); // L: 261 - var0.minLens[var38] = var2; // L: 262 + BZip2Decompressor_createHuffmanTables(var0.limit[var38], var0.base[var38], var0.perm[var38], var0.temp_charArray2d[var38], var2, var3, var39); + var0.minLens[var38] = var2; } - int var42 = var0.nInUse + 1; // L: 264 - int var43 = -1; // L: 265 - byte var44 = 0; // L: 266 + int var42 = var0.nInUse + 1; + int var43 = -1; + byte var44 = 0; - for (var36 = 0; var36 <= 255; ++var36) { // L: 267 + for (var36 = 0; var36 <= 255; ++var36) { var0.unzftab[var36] = 0; } - int var56 = 4095; // L: 272 + int var56 = 4095; int var35; int var55; - for (var35 = 15; var35 >= 0; --var35) { // L: 273 - for (var55 = 15; var55 >= 0; --var55) { // L: 274 - var0.ll8[var56] = (byte)(var55 + var35 * 16); // L: 275 - --var56; // L: 276 + for (var35 = 15; var35 >= 0; --var35) { + for (var55 = 15; var55 >= 0; --var55) { + var0.ll8[var56] = (byte)(var55 + var35 * 16); + --var56; } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 278 + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; } - int var47 = 0; // L: 281 + int var47 = 0; byte var54; - if (var44 == 0) { // L: 282 - ++var43; // L: 283 - var44 = 50; // L: 284 - var54 = var0.selector[var43]; // L: 285 - var22 = var0.minLens[var54]; // L: 286 - var23 = var0.limit[var54]; // L: 287 - var25 = var0.perm[var54]; // L: 288 - var24 = var0.base[var54]; // L: 289 + if (var44 == 0) { + ++var43; + var44 = 50; + var54 = var0.selector[var43]; + var22 = var0.minLens[var54]; + var23 = var0.limit[var54]; + var25 = var0.perm[var54]; + var24 = var0.base[var54]; } - int var45 = var44 - 1; // L: 291 - int var51 = var22; // L: 292 + int var45 = var44 - 1; + int var51 = var22; int var52; byte var53; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 293 295 298 - ++var51; // L: 296 - var53 = BZip2Decompressor_readNextBit(var0); // L: 297 + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { + ++var51; + var53 = BZip2Decompressor_readNextBit(var0); } - int var46 = var25[var52 - var24[var51]]; // L: 300 + int var46 = var25[var52 - var24[var51]]; while (true) { int[] var10000; int var10002; - while (var46 != var42) { // L: 302 - if (var46 != 0 && var46 != 1) { // L: 303 - int var33 = var46 - 1; // L: 349 + while (var46 != var42) { + if (var46 != 0 && var46 != 1) { + int var33 = var46 - 1; int var30; - if (var33 < 16) { // L: 350 - var30 = var0.getAndMoveToFrontDecode_yy[0]; // L: 351 + if (var33 < 16) { + var30 = var0.getAndMoveToFrontDecode_yy[0]; - for (var1 = var0.ll8[var30 + var33]; var33 > 3; var33 -= 4) { // L: 352 353 359 - int var34 = var30 + var33; // L: 354 - var0.ll8[var34] = var0.ll8[var34 - 1]; // L: 355 - var0.ll8[var34 - 1] = var0.ll8[var34 - 2]; // L: 356 - var0.ll8[var34 - 2] = var0.ll8[var34 - 3]; // L: 357 - var0.ll8[var34 - 3] = var0.ll8[var34 - 4]; // L: 358 + for (var1 = var0.ll8[var30 + var33]; var33 > 3; var33 -= 4) { + int var34 = var30 + var33; + var0.ll8[var34] = var0.ll8[var34 - 1]; + var0.ll8[var34 - 1] = var0.ll8[var34 - 2]; + var0.ll8[var34 - 2] = var0.ll8[var34 - 3]; + var0.ll8[var34 - 3] = var0.ll8[var34 - 4]; } - while (var33 > 0) { // L: 361 - var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; // L: 362 - --var33; // L: 363 + while (var33 > 0) { + var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; + --var33; } - var0.ll8[var30] = var1; // L: 365 + var0.ll8[var30] = var1; } else { - int var31 = var33 / 16; // L: 368 - int var32 = var33 % 16; // L: 369 - var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; // L: 370 + int var31 = var33 / 16; + int var32 = var33 % 16; + var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; - for (var1 = var0.ll8[var30]; var30 > var0.getAndMoveToFrontDecode_yy[var31]; --var30) { // L: 371 372 374 - var0.ll8[var30] = var0.ll8[var30 - 1]; // L: 373 + for (var1 = var0.ll8[var30]; var30 > var0.getAndMoveToFrontDecode_yy[var31]; --var30) { + var0.ll8[var30] = var0.ll8[var30 - 1]; } - for (var10002 = var0.getAndMoveToFrontDecode_yy[var31]++; var31 > 0; --var31) { // L: 376 377 380 - var10002 = var0.getAndMoveToFrontDecode_yy[var31]--; // L: 378 - var0.ll8[var0.getAndMoveToFrontDecode_yy[var31]] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var31 - 1] + 16 - 1]; // L: 379 + for (var10002 = var0.getAndMoveToFrontDecode_yy[var31]++; var31 > 0; --var31) { + var10002 = var0.getAndMoveToFrontDecode_yy[var31]--; + var0.ll8[var0.getAndMoveToFrontDecode_yy[var31]] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var31 - 1] + 16 - 1]; } - var10002 = var0.getAndMoveToFrontDecode_yy[0]--; // L: 382 - var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] = var1; // L: 383 - if (var0.getAndMoveToFrontDecode_yy[0] == 0) { // L: 384 - var56 = 4095; // L: 385 + var10002 = var0.getAndMoveToFrontDecode_yy[0]--; + var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] = var1; + if (var0.getAndMoveToFrontDecode_yy[0] == 0) { + var56 = 4095; - for (var35 = 15; var35 >= 0; --var35) { // L: 386 - for (var55 = 15; var55 >= 0; --var55) { // L: 387 - var0.ll8[var56] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var35] + var55]; // L: 388 - --var56; // L: 389 + for (var35 = 15; var35 >= 0; --var35) { + for (var55 = 15; var55 >= 0; --var55) { + var0.ll8[var56] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var35] + var55]; + --var56; } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 391 + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; } } } - var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - BZip2State.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 - ++var47; // L: 398 - if (var45 == 0) { // L: 399 - ++var43; // L: 400 - var45 = 50; // L: 401 - var54 = var0.selector[var43]; // L: 402 - var22 = var0.minLens[var54]; // L: 403 - var23 = var0.limit[var54]; // L: 404 - var25 = var0.perm[var54]; // L: 405 - var24 = var0.base[var54]; // L: 406 + var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; + BufferedSink.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + ++var47; + if (var45 == 0) { + ++var43; + var45 = 50; + var54 = var0.selector[var43]; + var22 = var0.minLens[var54]; + var23 = var0.limit[var54]; + var25 = var0.perm[var54]; + var24 = var0.base[var54]; } - --var45; // L: 408 - var51 = var22; // L: 409 + --var45; + var51 = var22; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 410 412 415 - ++var51; // L: 413 - var53 = BZip2Decompressor_readNextBit(var0); // L: 414 + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { + ++var51; + var53 = BZip2Decompressor_readNextBit(var0); } - var46 = var25[var52 - var24[var51]]; // L: 417 + var46 = var25[var52 - var24[var51]]; } else { - int var48 = -1; // L: 304 - int var49 = 1; // L: 305 + int var48 = -1; + int var49 = 1; do { - if (var46 == 0) { // L: 307 + if (var46 == 0) { var48 += var49; - } else if (var46 == 1) { // L: 308 + } else if (var46 == 1) { var48 += var49 * 2; } - var49 *= 2; // L: 309 - if (var45 == 0) { // L: 310 - ++var43; // L: 311 - var45 = 50; // L: 312 - var54 = var0.selector[var43]; // L: 313 - var22 = var0.minLens[var54]; // L: 314 - var23 = var0.limit[var54]; // L: 315 - var25 = var0.perm[var54]; // L: 316 - var24 = var0.base[var54]; // L: 317 + var49 *= 2; + if (var45 == 0) { + ++var43; + var45 = 50; + var54 = var0.selector[var43]; + var22 = var0.minLens[var54]; + var23 = var0.limit[var54]; + var25 = var0.perm[var54]; + var24 = var0.base[var54]; } - --var45; // L: 319 - var51 = var22; // L: 320 + --var45; + var51 = var22; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 321 323 326 - ++var51; // L: 324 - var53 = BZip2Decompressor_readNextBit(var0); // L: 325 + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { + ++var51; + var53 = BZip2Decompressor_readNextBit(var0); } - var46 = var25[var52 - var24[var51]]; // L: 328 - } while(var46 == 0 || var46 == 1); // L: 329 + var46 = var25[var52 - var24[var51]]; + } while(var46 == 0 || var46 == 1); - ++var48; // L: 330 - var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; // L: 331 - var10000 = var0.unzftab; // L: 332 + ++var48; + var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; + var10000 = var0.unzftab; - for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - BZip2State.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 - ++var47; // L: 335 + for (var10000[var1 & 255] += var48; var48 > 0; --var48) { + BufferedSink.BZip2Decompressor_block[var47] = var1 & 255; + ++var47; } } } - var0.su_rNToGo = 0; // L: 421 - var0.out_char = 0; // L: 422 - var0.cftab[0] = 0; // L: 423 + var0.su_rNToGo = 0; + var0.out_char = 0; + var0.cftab[0] = 0; - for (var36 = 1; var36 <= 256; ++var36) { // L: 424 + for (var36 = 1; var36 <= 256; ++var36) { var0.cftab[var36] = var0.unzftab[var36 - 1]; } - for (var36 = 1; var36 <= 256; ++var36) { // L: 425 + for (var36 = 1; var36 <= 256; ++var36) { var10000 = var0.cftab; var10000[var36] += var0.cftab[var36 - 1]; } - for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(BZip2State.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = BZip2State.BZip2Decompressor_block; // L: 428 + for (var36 = 0; var36 < var47; ++var36) { + var1 = (byte)(BufferedSink.BZip2Decompressor_block[var36] & 255); + var10000 = BufferedSink.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; - var10002 = var0.cftab[var1 & 255]++; // L: 429 + var10002 = var0.cftab[var1 & 255]++; } - var0.field4182 = BZip2State.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 - var0.nblocks_used = 0; // L: 432 - var0.field4182 = BZip2State.BZip2Decompressor_block[var0.field4182]; // L: 433 - var0.su_ch2 = (byte)(var0.field4182 & 255); // L: 434 - var0.field4182 >>= 8; // L: 436 - ++var0.nblocks_used; // L: 437 - var0.field4201 = var47; // L: 438 - method6862(var0); // L: 439 - if (var0.field4201 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field4203 = BufferedSink.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.nblocks_used = 0; + var0.field4203 = BufferedSink.BZip2Decompressor_block[var0.field4203]; + var0.su_ch2 = (byte)(var0.field4203 & 255); + var0.field4203 >>= 8; + ++var0.nblocks_used; + var0.field4207 = var47; + method6909(var0); + if (var0.field4207 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } - var26 = false; // L: 441 + var26 = false; break; } } - return; // L: 443 + return; } } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lny;)B" - ) - @Export("BZip2Decompressor_readNextByte") - static byte BZip2Decompressor_readNextByte(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 - } - @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lny;)B" + descriptor = "(Lnn;)B" + ) + @Export("BZip2Decompressor_readNextByte") + static byte BZip2Decompressor_readNextByte(BZip2State var0) { + return (byte)BZip2Decompressor_readBits(8, var0); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lnn;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 + return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILny;)I" + descriptor = "(ILnn;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { - while (var1.bsLive < var0) { // L: 456 - var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; // L: 462 - var1.bsLive += 8; // L: 463 - ++var1.nextByte; // L: 464 - ++var1.nextBit_unused; // L: 465 - if (var1.nextBit_unused == 0) { // L: 466 + while (var1.bsLive < var0) { + var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; + var1.bsLive += 8; + ++var1.nextByte; + ++var1.nextBit_unused; + if (var1.nextBit_unused == 0) { } } - int var2 = var1.bsBuff >> var1.bsLive - var0 & (1 << var0) - 1; // L: 458 - var1.bsLive -= var0; // L: 459 - return var2; // L: 460 + int var2 = var1.bsBuff >> var1.bsLive - var0 & (1 << var0) - 1; + var1.bsLive -= var0; + return var2; } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lny;)V" + descriptor = "(Lnn;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { - var0.nInUse = 0; // L: 472 + var0.nInUse = 0; - for (int var1 = 0; var1 < 256; ++var1) { // L: 473 - if (var0.inUse[var1]) { // L: 474 - var0.seqToUnseq[var0.nInUse] = (byte)var1; // L: 475 - ++var0.nInUse; // L: 476 + for (int var1 = 0; var1 < 256; ++var1) { + if (var0.inUse[var1]) { + var0.seqToUnseq[var0.nInUse] = (byte)var1; + ++var0.nInUse; } } - } // L: 479 + } - @ObfuscatedName("r") + @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 + int var7 = 0; int var8; - for (var8 = var4; var8 <= var5; ++var8) { // L: 487 - for (int var9 = 0; var9 < var6; ++var9) { // L: 488 - if (var8 == var3[var9]) { // L: 489 - var2[var7] = var9; // L: 490 - ++var7; // L: 491 + for (var8 = var4; var8 <= var5; ++var8) { + for (int var9 = 0; var9 < var6; ++var9) { + if (var8 == var3[var9]) { + var2[var7] = var9; + ++var7; } } } - for (var8 = 0; var8 < 23; ++var8) { // L: 495 + for (var8 = 0; var8 < 23; ++var8) { var1[var8] = 0; } - for (var8 = 0; var8 < var6; ++var8) { // L: 496 + for (var8 = 0; var8 < var6; ++var8) { ++var1[var3[var8] + 1]; } - for (var8 = 1; var8 < 23; ++var8) { // L: 497 + for (var8 = 1; var8 < 23; ++var8) { var1[var8] += var1[var8 - 1]; } - for (var8 = 0; var8 < 23; ++var8) { // L: 498 + for (var8 = 0; var8 < 23; ++var8) { var0[var8] = 0; } - int var10 = 0; // L: 499 + int var10 = 0; - for (var8 = var4; var8 <= var5; ++var8) { // L: 500 - var10 += var1[var8 + 1] - var1[var8]; // L: 501 - var0[var8] = var10 - 1; // L: 502 - var10 <<= 1; // L: 503 + for (var8 = var4; var8 <= var5; ++var8) { + var10 += var1[var8 + 1] - var1[var8]; + var0[var8] = var10 - 1; + var10 <<= 1; } - for (var8 = var4 + 1; var8 <= var5; ++var8) { // L: 505 - var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; // L: 506 + for (var8 = var4 + 1; var8 <= var5; ++var8) { + var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; } - } // L: 508 + } } diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 6c69beaf43..54be0410d4 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,194 +2,180 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") +@ObfuscatedName("nn") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("w") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("f") - final int field4174; - @ObfuscatedName("e") - final int field4164; + @ObfuscatedName("s") + final int field4213; + @ObfuscatedName("t") + final int field4185; @ObfuscatedName("v") - final int field4165; - @ObfuscatedName("y") - final int field4166; + final int field4193; @ObfuscatedName("j") - final int field4167; - @ObfuscatedName("o") - final int field4168; - @ObfuscatedName("m") + final int field4186; + @ObfuscatedName("l") + final int field4188; + @ObfuscatedName("n") + final int field4189; + @ObfuscatedName("w") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -39933589 + intValue = -1167904443 ) @Export("nextByte") int nextByte; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -531147281 + intValue = 2140718727 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1195525677 + intValue = 152058377 ) @Export("next_out") int next_out; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1044111453 + intValue = 720811517 ) @Export("outputLength") int outputLength; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -974665581 + intValue = 1102451059 ) - int field4175; + int field4196; @ObfuscatedName("k") @Export("out_char") byte out_char; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1559424305 + intValue = 1797318969 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1700230051 + intValue = 577319637 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -416010867 + intValue = -844578273 ) @Export("bsLive") int bsLive; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1898128253 + intValue = 2013367365 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -553596923 + intValue = 1202872339 ) - int field4182; - @ObfuscatedName("p") + int field4203; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 723737753 + intValue = -382061133 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("unzftab") int[] unzftab; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -142342171 + intValue = 464515415 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("cftab") int[] cftab; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1916971597 + intValue = 1433904183 ) @Export("nInUse") int nInUse; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("ll8") byte[] ll8; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("selector") byte[] selector; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("ab") + @ObfuscatedName("au") @Export("limit") int[][] limit; - @ObfuscatedName("aq") + @ObfuscatedName("av") @Export("base") int[][] base; - @ObfuscatedName("ae") + @ObfuscatedName("as") @Export("perm") int[][] perm; @ObfuscatedName("ao") @Export("minLens") int[] minLens; - @ObfuscatedName("an") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 87198187 + intValue = 498963667 ) - int field4201; + int field4207; BZip2State() { - this.field4174 = 4096; // L: 4 - this.field4164 = 16; // L: 5 - this.field4165 = 258; // L: 6 - this.field4166 = 6; // L: 7 - this.field4167 = 50; // L: 8 - this.field4168 = 18002; // L: 9 - this.nextByte = 0; // L: 11 - this.next_out = 0; // L: 14 - this.unzftab = new int[256]; // L: 25 - this.cftab = new int[257]; // L: 27 - this.inUse = new boolean[256]; // L: 30 - this.inUse16 = new boolean[16]; // L: 31 - this.seqToUnseq = new byte[256]; // L: 32 - this.ll8 = new byte[4096]; // L: 33 - this.getAndMoveToFrontDecode_yy = new int[16]; // L: 34 - this.selector = new byte[18002]; // L: 35 - this.selectorMtf = new byte[18002]; // L: 36 - this.temp_charArray2d = new byte[6][258]; // L: 37 - this.limit = new int[6][258]; // L: 38 - this.base = new int[6][258]; // L: 39 - this.perm = new int[6][258]; // L: 40 - this.minLens = new int[6]; // L: 41 - } // L: 44 - - @ObfuscatedName("ez") - @ObfuscatedSignature( - descriptor = "(I)Lme;", - garbageValue = "-1693796296" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return class80.worldMap; // L: 686 + this.field4213 = 4096; + this.field4185 = 16; + this.field4193 = 258; + this.field4186 = 6; + this.field4188 = 50; + this.field4189 = 18002; + this.nextByte = 0; + this.next_out = 0; + this.unzftab = new int[256]; + this.cftab = new int[257]; + this.inUse = new boolean[256]; + this.inUse16 = new boolean[16]; + this.seqToUnseq = new byte[256]; + this.ll8 = new byte[4096]; + this.getAndMoveToFrontDecode_yy = new int[16]; + this.selector = new byte[18002]; + this.selectorMtf = new byte[18002]; + this.temp_charArray2d = new byte[6][258]; + this.limit = new int[6][258]; + this.base = new int[6][258]; + this.perm = new int[6][258]; + this.minLens = new int[6]; } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 9891919583..ebcd757cdc 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,72 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hs") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "Llk;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("f") + @ObfuscatedName("tr") @ObfuscatedGetter( - intValue = 1552806681 + intValue = -1924657947 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lae;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1178102363 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 846668797 + intValue = 2140931437 ) @Export("x") int x; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1111067733 + intValue = -691288565 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1521438593 + intValue = -287218543 ) @Export("orientationA") int orientationA; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 33814439 + intValue = 780112513 ) @Export("orientationB") int orientationB; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -5150257183506372715L + longValue = -849579815865927251L ) @Export("tag") public long tag; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1106373897 + intValue = -1574259549 ) @Export("flags") int flags; BoundaryObject() { - this.tag = 0L; // L: 11 - this.flags = 0; // L: 12 - } // L: 14 + this.tag = 0L; + this.flags = 0; + } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 65843b9973..f30b4272e9 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,163 +4,146 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("lo") @Implements("Bounds") public class Bounds { - @ObfuscatedName("f") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = 713506819 + intValue = 1950621809 + ) + @Export("cameraY") + static int cameraY; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1616481157 ) @Export("lowX") public int lowX; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2022522807 + intValue = -531404143 ) @Export("lowY") public int lowY; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -259492799 + intValue = 640928203 ) @Export("highX") public int highX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 67302117 + intValue = 566469983 ) @Export("highY") public int highY; public Bounds(int var1, int var2, int var3, int var4) { - this.setLow(var1, var2); // L: 14 - this.setHigh(var3, var4); // L: 15 - } // L: 16 + this.setLow(var1, var2); + this.setHigh(var3, var4); + } public Bounds(int var1, int var2) { - this(0, 0, var1, var2); // L: 10 - } // L: 11 + this(0, 0, var1, var2); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "74763714" + garbageValue = "-457088307" ) @Export("setLow") public void setLow(int var1, int var2) { - this.lowX = var1; // L: 19 - this.lowY = var2; // L: 20 - } // L: 21 + this.lowX = var1; + this.lowY = var2; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "25" + garbageValue = "0" ) @Export("setHigh") public void setHigh(int var1, int var2) { - this.highX = var1; // L: 24 - this.highY = var2; // L: 25 - } // L: 26 + this.highX = var1; + this.highY = var2; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llw;Llw;B)V", - garbageValue = "-43" + descriptor = "(Llo;Llo;I)V", + garbageValue = "1358187891" ) - public void method6009(Bounds var1, Bounds var2) { - this.method6010(var1, var2); - this.method6031(var1, var2); // L: 34 - } // L: 35 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Llw;Llw;B)V", - garbageValue = "0" - ) - void method6010(Bounds var1, Bounds var2) { - var2.lowX = this.lowX; - var2.highX = this.highX; // L: 39 - if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * -2021811263 - (var1.lowX * -2021811263 - this.lowX * -2021811263)) * -259492799; // L: 41 - var2.lowX = var1.lowX; // L: 42 - } - - if (var2.method6012() > var1.method6012()) { // L: 44 - var2.highX -= var2.method6012() - var1.method6012(); // L: 45 - } - - if (var2.highX < 0) { // L: 47 - var2.highX = 0; - } - - } // L: 48 + public void method6028(Bounds var1, Bounds var2) { + this.method6030(var1, var2); + this.method6036(var1, var2); + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Llw;Llw;I)V", - garbageValue = "-94971019" + descriptor = "(Llo;Llo;S)V", + garbageValue = "1205" ) - void method6031(Bounds var1, Bounds var2) { - var2.lowY = this.lowY; // L: 51 - var2.highY = this.highY; // L: 52 - if (this.lowY < var1.lowY) { // L: 53 - var2.highY = (var2.highY * -1355515155 - (var1.lowY * -1355515155 - this.lowY * -1355515155)) * 67302117; // L: 54 - var2.lowY = var1.lowY; // L: 55 + void method6030(Bounds var1, Bounds var2) { + var2.lowX = this.lowX; + var2.highX = this.highX; + if (this.lowX < var1.lowX) { + var2.highX = (var2.highX * -586279965 - (var1.lowX * -586279965 - this.lowX * -586279965)) * 640928203; + var2.lowX = var1.lowX; } - if (var2.method6032() > var1.method6032()) { // L: 57 - var2.highY -= var2.method6032() - var1.method6032(); // L: 58 + if (var2.method6031() > var1.method6031()) { + var2.highX -= var2.method6031() - var1.method6031(); } - if (var2.highY < 0) { // L: 60 + if (var2.highX < 0) { + var2.highX = 0; + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Llo;Llo;B)V", + garbageValue = "-48" + ) + void method6036(Bounds var1, Bounds var2) { + var2.lowY = this.lowY; + var2.highY = this.highY; + if (this.lowY < var1.lowY) { + var2.highY = (var2.highY * 1464727199 - (var1.lowY * 1464727199 - this.lowY * 1464727199)) * 566469983; + var2.lowY = var1.lowY; + } + + if (var2.method6032() > var1.method6032()) { + var2.highY -= var2.method6032() - var1.method6032(); + } + + if (var2.highY < 0) { var2.highY = 0; } - } // L: 61 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "5" - ) - int method6012() { - return this.lowX + this.highX; // L: 64 } - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1071411264" + garbageValue = "-1525436179" + ) + int method6031() { + return this.lowX + this.highX; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1505514692" ) int method6032() { - return this.lowY + this.highY; // L: 68 + return this.highY + this.lowY; } public String toString() { - return null; // L: 29 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;III)Lkj;", - garbageValue = "845237448" - ) - public static Font method6034(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - if (!Message.method1263(var0, var2, var3)) { // L: 28 - return null; - } else { - byte[] var5 = var1.takeFile(var2, var3); // L: 30 - Font var4; - if (var5 == null) { // L: 32 - var4 = null; // L: 33 - } else { - Font var6 = new Font(var5, class397.SpriteBuffer_xOffsets, class26.SpriteBuffer_yOffsets, Canvas.SpriteBuffer_spriteWidths, Clock.SpriteBuffer_spriteHeights, class397.SpriteBuffer_spritePalette, class126.SpriteBuffer_pixels); // L: 36 - ArchiveDisk.method5993(); // L: 37 - var4 = var6; // L: 38 - } - - return var4; // L: 40 - } + return null; } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index bf11812258..d915dcd114 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -3,122 +3,110 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ly") +@ObfuscatedName("lr") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("dg") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("iz") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1354630149 + intValue = -762727507 ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("j") + static int field3863; + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = -1822382333 + intValue = 1158141189 + ) + static int field3869; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1892581067 ) @Export("world") public int world; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -286288271 + intValue = -2065584103 ) @Export("int2") public int int2; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2998287 + intValue = -1763927129 ) @Export("rank") public int rank; Buddy() { - this.world = -1; // L: 4 - } // L: 8 + this.world = -1; + } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1543137847" + garbageValue = "-1547943293" ) @Export("set") void set(int var1, int var2) { - this.world = var1; // L: 11 - this.int2 = var2; // L: 12 - } // L: 13 + this.world = var1; + this.int2 = var2; + } - @ObfuscatedName("aj") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "27" + descriptor = "(I)I", + garbageValue = "-270823036" ) @Export("getWorld") public int getWorld() { - return this.world; // L: 16 + return this.world; } - @ObfuscatedName("ac") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1186976863" + garbageValue = "-2044352564" ) @Export("hasWorld") public boolean hasWorld() { - return this.world > 0; // L: 20 + return this.world > 0; } - @ObfuscatedName("fy") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lfm;IIIB)V", - garbageValue = "-89" + descriptor = "(ILbd;ZB)I", + garbageValue = "-1" ) - static void method5896(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class4.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3756 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3757 - int var4 = var0.soundEffects[var1]; // L: 3758 - if (var4 != 0) { // L: 3759 - int var5 = var4 >> 8; // L: 3760 - int var6 = var4 >> 4 & 7; // L: 3761 - int var7 = var4 & 15; // L: 3762 - Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3763 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3764 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3765 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3766 - int var8 = (var2 - 64) / 128; // L: 3767 - int var9 = (var3 - 64) / 128; // L: 3768 - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3769 - ++Client.soundEffectCount; // L: 3770 - } + static int method5914(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var5 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemId; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var5 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var5.itemId != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } - } - } // L: 3771 - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-589209298" - ) - static final void method5892() { - Client.field629 = 0; // L: 5422 - int var0 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 5423 - int var1 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 5424 - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5425 - Client.field629 = 1; - } + return 1; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5426 - Client.field629 = 1; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; + } else { + return 2; } - - if (Client.field629 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5427 - Client.field629 = 0; - } - - } // L: 5428 + } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 6ecb2e43ec..12c24ddb6d 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -3,55 +3,50 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("cv") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("hr") + @ObfuscatedName("u") + @Export("cacheParentPaths") + static String[] cacheParentPaths; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "[Loa;" + descriptor = "Lof;" ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("f") + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public BuddyRankComparator(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;I)I", - garbageValue = "1922516179" + descriptor = "(Llr;Llr;I)I", + garbageValue = "1581905870" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.rank != var1.rank) { // L: 14 - return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15 + if (var2.rank != var1.rank) { + return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-16777217" - ) - static final void method2579() { - if (class26.ClanChat_inClanChat) { // L: 3802 - if (class289.friendsChat != null) { // L: 3803 - class289.friendsChat.sort(); // L: 3804 - } - - WorldMapCacheName.method3788(); // L: 3806 - class26.ClanChat_inClanChat = false; // L: 3807 - } - - } // L: 3809 + @ObfuscatedName("jx") + static final void method2200(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); + ItemComposition.ItemDefinition_cachedSprites.clear(); + Decimator.clientPreferences.field1117 = var0; + MilliClock.savePreferences(); + } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 3f12472504..e624b09fc4 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,1085 +5,1042 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") +@ObfuscatedName("nv") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("array") public byte[] array; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1763340179 + intValue = -1728972353 ) @Export("offset") public int offset; static { - crc32Table = new int[256]; // L: 14 + crc32Table = new int[256]; int var2; - for (int var1 = 0; var1 < 256; ++var1) { // L: 19 - int var4 = var1; // L: 20 + for (int var1 = 0; var1 < 256; ++var1) { + int var4 = var1; - for (var2 = 0; var2 < 8; ++var2) { // L: 21 - if ((var4 & 1) == 1) { // L: 22 + for (var2 = 0; var2 < 8; ++var2) { + if ((var4 & 1) == 1) { var4 = var4 >>> 1 ^ -306674912; } else { - var4 >>>= 1; // L: 23 + var4 >>>= 1; } } - crc32Table[var1] = var4; // L: 25 + crc32Table[var1] = var4; } - crc64Table = new long[256]; // L: 29 + crc64Table = new long[256]; - for (var2 = 0; var2 < 256; ++var2) { // L: 34 - long var0 = (long)var2; // L: 35 + for (var2 = 0; var2 < 256; ++var2) { + long var0 = (long)var2; - for (int var3 = 0; var3 < 8; ++var3) { // L: 36 - if (1L == (var0 & 1L)) { // L: 37 + for (int var3 = 0; var3 < 8; ++var3) { + if ((var0 & 1L) == 1L) { var0 = var0 >>> 1 ^ -3932672073523589310L; } else { - var0 >>>= 1; // L: 38 + var0 >>>= 1; } } - crc64Table[var2] = var0; // L: 40 + crc64Table[var2] = var0; } - } // L: 42 + } public Buffer(int var1) { - this.array = Occluder.ByteArrayPool_getArray(var1); // L: 58 - this.offset = 0; // L: 59 - } // L: 60 + this.array = class54.ByteArrayPool_getArray(var1); + this.offset = 0; + } public Buffer(byte[] var1) { - this.array = var1; // L: 63 - this.offset = 0; // L: 64 - } // L: 65 + this.array = var1; + this.offset = 0; + } - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-106" + garbageValue = "-32" ) @Export("releaseArray") public void releaseArray() { - if (this.array != null) { // L: 68 - SequenceDefinition.ByteArrayPool_release(this.array); + if (this.array != null) { + WorldMapIcon_1.ByteArrayPool_release(this.array); } - this.array = null; // L: 69 - } // L: 70 + this.array = null; + } - @ObfuscatedName("ao") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1863377440" + garbageValue = "1091583325" ) @Export("writeByte") public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 73 - } // L: 74 - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-943246978" - ) - @Export("writeShort") - public void writeShort(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 77 - this.array[++this.offset - 1] = (byte)var1; // L: 78 - } // L: 79 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-255804232" - ) - @Export("writeMedium") - public void writeMedium(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 82 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 83 - this.array[++this.offset - 1] = (byte)var1; // L: 84 - } // L: 85 - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-320118747" - ) - @Export("writeInt") - public void writeInt(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 88 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 89 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 90 - this.array[++this.offset - 1] = (byte)var1; // L: 91 - } // L: 92 - - @ObfuscatedName("ac") - @Export("writeLongMedium") - public void writeLongMedium(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 95 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 96 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 97 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 98 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 99 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 100 - } // L: 101 - - @ObfuscatedName("as") - @Export("writeLong") - public void writeLong(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 104 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 105 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 106 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 107 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 108 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 109 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 110 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 111 - } // L: 112 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1604340695" - ) - @Export("writeBoolean") - public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); // L: 115 - } // L: 116 - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "18595" - ) - @Export("writeStringCp1252NullTerminated") - public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); // L: 123 - if (var2 >= 0) { // L: 124 - throw new IllegalArgumentException(""); - } else { - this.offset += HorizontalAlignment.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 125 - this.array[++this.offset - 1] = 0; // L: 126 - } - } // L: 127 + this.array[++this.offset - 1] = (byte)var1; + } @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "856089217" + descriptor = "(II)V", + garbageValue = "-503385826" ) - @Export("writeStringCp1252NullCircumfixed") - public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 134 - if (var2 >= 0) { // L: 135 - throw new IllegalArgumentException(""); - } else { - this.array[++this.offset - 1] = 0; // L: 136 - this.offset += HorizontalAlignment.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 137 - this.array[++this.offset - 1] = 0; // L: 138 - } - } // L: 139 + @Export("writeShort") + public void writeShort(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + } - @ObfuscatedName("av") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1762854289" + descriptor = "(IS)V", + garbageValue = "21522" ) - @Export("writeCESU8") - public void writeCESU8(CharSequence var1) { - int var2 = Friend.method5774(var1); // L: 142 - this.array[++this.offset - 1] = 0; // L: 143 - this.writeVarInt(var2); // L: 144 - int var3 = this.offset * -1967454565; // L: 145 - byte[] var5 = this.array; // L: 147 - int var6 = this.offset; // L: 148 - int var7 = var1.length(); // L: 150 - int var8 = var6; // L: 151 + @Export("writeMedium") + public void writeMedium(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + } - for (int var9 = 0; var9 < var7; ++var9) { // L: 152 - char var10 = var1.charAt(var9); // L: 153 - if (var10 <= 127) { // L: 154 - var5[var8++] = (byte)var10; // L: 155 - } else if (var10 <= 2047) { // L: 157 - var5[var8++] = (byte)(192 | var10 >> 6); // L: 158 - var5[var8++] = (byte)(128 | var10 & '?'); // L: 159 - } else { - var5[var8++] = (byte)(224 | var10 >> '\f'); // L: 162 - var5[var8++] = (byte)(128 | var10 >> 6 & 63); // L: 163 - var5[var8++] = (byte)(128 | var10 & '?'); // L: 164 - } - } - - int var4 = var8 - var6; // L: 167 - this.offset = (var3 + var4 * -1967454565) * 1763340179; // L: 169 - } // L: 170 - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "1373881808" - ) - @Export("writeBytes") - public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { - this.array[++this.offset - 1] = var1[var4]; // L: 173 - } - - } // L: 174 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-2065580787" - ) - public void method6607(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 177 - } // L: 178 - - @ObfuscatedName("af") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-70" + garbageValue = "122" ) - @Export("writeLengthInt") - public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 181 - throw new IllegalArgumentException(); // L: 182 - } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 184 - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 185 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 186 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 187 - } - } // L: 188 - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-1" - ) - @Export("writeLengthShort") - public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { // L: 191 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 194 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 195 - } else { - throw new IllegalArgumentException(); // L: 192 - } - } // L: 196 - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-256020181" - ) - @Export("writeLengthByte") - public void writeLengthByte(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 199 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 202 - } else { - throw new IllegalArgumentException(); // L: 200 - } - } // L: 203 - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1840761658" - ) - @Export("writeSmartByteShort") - public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { // L: 206 - this.writeByte(var1); // L: 207 - } else if (var1 >= 0 && var1 < 32768) { // L: 210 - this.writeShort(var1 + 32768); // L: 211 - } else { - throw new IllegalArgumentException(); // L: 214 - } - } // L: 208 212 - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1285798772" - ) - @Export("writeVarInt") - public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { // L: 218 - if ((var1 & -16384) != 0) { // L: 219 - if ((var1 & -2097152) != 0) { // L: 220 - if ((var1 & -268435456) != 0) { // L: 221 - this.writeByte(var1 >>> 28 | 128); - } - - this.writeByte(var1 >>> 21 | 128); // L: 222 - } - - this.writeByte(var1 >>> 14 | 128); // L: 224 - } - - this.writeByte(var1 >>> 7 | 128); // L: 226 - } - - this.writeByte(var1 & 127); // L: 228 - } // L: 229 - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "97" - ) - @Export("readUnsignedByte") - public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 232 + @Export("writeInt") + public void writeInt(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(S)B", - garbageValue = "14690" - ) - @Export("readByte") - public byte readByte() { - return this.array[++this.offset - 1]; // L: 236 + @ObfuscatedName("aw") + @Export("writeLongMedium") + public void writeLongMedium(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); + this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "61" - ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; // L: 240 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 241 + @ObfuscatedName("bt") + @Export("writeLong") + public void writeLong(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); + this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("be") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1344760160" + descriptor = "(ZI)V", + garbageValue = "245689814" ) - @Export("readShort") - public int readShort() { - this.offset += 2; // L: 245 - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 246 - if (var1 > 32767) { // L: 247 - var1 -= 65536; - } - - return var1; // L: 248 - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1626768763" - ) - @Export("readMedium") - public int readMedium() { - this.offset += 3; // L: 252 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 253 - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-299681912" - ) - @Export("readInt") - public int readInt() { - this.offset += 4; // L: 257 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 258 - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1743202445" - ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 262 - long var3 = (long)this.readInt() & 4294967295L; // L: 263 - return (var1 << 32) + var3; // L: 264 - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "80" - ) - @Export("readBoolean") - public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 268 + @Export("writeBoolean") + public void writeBoolean(boolean var1) { + this.writeByte(var1 ? 1 : 0); } @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-615032441" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-531104316" ) - @Export("readStringCp1252NullTerminatedOrNull") - public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 272 - ++this.offset; // L: 273 - return null; // L: 274 + @Export("writeStringCp1252NullTerminated") + public void writeStringCp1252NullTerminated(String var1) { + int var2 = var1.indexOf(0); + if (var2 >= 0) { + throw new IllegalArgumentException(""); } else { - return this.readStringCp1252NullTerminated(); // L: 276 + this.offset += class263.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bt") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1193629653" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "8" ) - @Export("readStringCp1252NullTerminated") - public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 280 + @Export("writeStringCp1252NullCircumfixed") + public void writeStringCp1252NullCircumfixed(String var1) { + int var2 = var1.indexOf(0); + if (var2 >= 0) { + throw new IllegalArgumentException(""); + } else { + this.array[++this.offset - 1] = 0; + this.offset += class263.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; + } + } - while (this.array[++this.offset - 1] != 0) { // L: 281 + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "-1129382204" + ) + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { + int var3 = var1.length(); + int var4 = 0; + + int var5; + for (var5 = 0; var5 < var3; ++var5) { + char var12 = var1.charAt(var5); + if (var12 <= 127) { + ++var4; + } else if (var12 <= 2047) { + var4 += 2; + } else { + var4 += 3; + } } - int var2 = this.offset - var1 - 1; // L: 282 - return var2 == 0 ? "" : Actor.decodeStringCp1252(this.array, var1, var2); // L: 283 284 + this.array[++this.offset - 1] = 0; + this.writeVarInt(var4); + var4 = this.offset * 722138687; + byte[] var6 = this.array; + int var7 = this.offset; + int var8 = var1.length(); + int var9 = var7; + + for (int var10 = 0; var10 < var8; ++var10) { + char var11 = var1.charAt(var10); + if (var11 <= 127) { + var6[var9++] = (byte)var11; + } else if (var11 <= 2047) { + var6[var9++] = (byte)(192 | var11 >> 6); + var6[var9++] = (byte)(128 | var11 & '?'); + } else { + var6[var9++] = (byte)(224 | var11 >> '\f'); + var6[var9++] = (byte)(128 | var11 >> 6 & 63); + var6[var9++] = (byte)(128 | var11 & '?'); + } + } + + var5 = var9 - var7; + this.offset = (var4 + var5 * 722138687) * -1728972353; } @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1964940148" + descriptor = "([BIII)V", + garbageValue = "-88650323" ) - @Export("readStringCp1252NullCircumfixed") - public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 288 - if (var1 != 0) { // L: 289 - throw new IllegalStateException(""); + @Export("writeBytes") + public void writeBytes(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { + this.array[++this.offset - 1] = var1[var4]; + } + + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "25" + ) + public void method6651(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "919007389" + ) + @Export("writeLengthInt") + public void writeLengthInt(int var1) { + if (var1 < 0) { + throw new IllegalArgumentException(); } else { - int var2 = this.offset; // L: 290 - - while (this.array[++this.offset - 1] != 0) { // L: 291 - } - - int var3 = this.offset - var2 - 1; // L: 292 - return var3 == 0 ? "" : Actor.decodeStringCp1252(this.array, var2, var3); // L: 293 294 + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); + this.array[this.offset - var1 - 1] = (byte)var1; } } @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "-14038" + descriptor = "(IB)V", + garbageValue = "117" ) - @Export("readCESU8") - public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 298 - if (var1 != 0) { // L: 299 - throw new IllegalStateException(""); + @Export("writeLengthShort") + public void writeLengthShort(int var1) { + if (var1 >= 0 && var1 <= 65535) { + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); + this.array[this.offset - var1 - 1] = (byte)var1; } else { - int var2 = this.readVarInt(); // L: 300 - if (var2 + this.offset > this.array.length) { // L: 301 - throw new IllegalStateException(""); - } else { - byte[] var4 = this.array; // L: 303 - int var5 = this.offset; // L: 304 - char[] var6 = new char[var2]; // L: 306 - int var7 = 0; // L: 307 - int var8 = var5; // L: 308 + throw new IllegalArgumentException(); + } + } - int var11; - for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 309 310 341 - int var10 = var4[var8++] & 255; // L: 311 - if (var10 < 128) { // L: 313 - if (var10 == 0) { // L: 314 - var11 = 65533; - } else { - var11 = var10; // L: 315 - } - } else if (var10 < 192) { // L: 317 - var11 = 65533; - } else if (var10 < 224) { // L: 318 - if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 319 - var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 320 - if (var11 < 128) { // L: 321 - var11 = 65533; - } - } else { - var11 = 65533; // L: 323 - } - } else if (var10 < 240) { // L: 325 - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 326 - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 327 - if (var11 < 2048) { // L: 328 - var11 = 65533; - } - } else { - var11 = 65533; // L: 330 - } - } else if (var10 < 248) { // L: 332 - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 333 - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 334 - if (var11 >= 65536 && var11 <= 1114111) { // L: 335 - var11 = 65533; // L: 336 - } else { - var11 = 65533; - } - } else { - var11 = 65533; // L: 338 - } - } else { - var11 = 65533; // L: 340 + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1796275222" + ) + @Export("writeLengthByte") + public void writeLengthByte(int var1) { + if (var1 >= 0 && var1 <= 255) { + this.array[this.offset - var1 - 1] = (byte)var1; + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1747802271" + ) + @Export("writeSmartByteShort") + public void writeSmartByteShort(int var1) { + if (var1 >= 0 && var1 < 128) { + this.writeByte(var1); + } else if (var1 >= 0 && var1 < 32768) { + this.writeShort(var1 + 32768); + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-172821260" + ) + @Export("writeVarInt") + public void writeVarInt(int var1) { + if ((var1 & -128) != 0) { + if ((var1 & -16384) != 0) { + if ((var1 & -2097152) != 0) { + if ((var1 & -268435456) != 0) { + this.writeByte(var1 >>> 28 | 128); } + + this.writeByte(var1 >>> 21 | 128); } - String var3 = new String(var6, 0, var7); // L: 343 - this.offset += var2; // L: 346 - return var3; // L: 347 + this.writeByte(var1 >>> 14 | 128); } + + this.writeByte(var1 >>> 7 | 128); } + + this.writeByte(var1 & 127); } @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1720169048" + descriptor = "(I)I", + garbageValue = "390391812" ) - @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: 351 - } + @Export("readUnsignedByte") + public int readUnsignedByte() { + return this.array[++this.offset - 1] & 255; + } - } // L: 352 - - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "9" + descriptor = "(B)B", + garbageValue = "103" ) - @Export("readShortSmart") - public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 355 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 356 357 + @Export("readByte") + public byte readByte() { + return this.array[++this.offset - 1]; } @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2144461142" + garbageValue = "1708338594" ) - @Export("readUShortSmart") - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 361 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 362 363 + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bu") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1158750007" + descriptor = "(S)I", + garbageValue = "-14547" ) - public int method6628() { - int var1 = 0; // L: 367 - - int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 368 369 371 - var1 += 32767; // L: 370 + @Export("readShort") + public int readShort() { + this.offset += 2; + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); + if (var1 > 32767) { + var1 -= 65536; } - var1 += var2; // L: 373 - return var1; // L: 374 + return var1; } - @ObfuscatedName("bl") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-672544141" + garbageValue = "2061899201" ) - public int method6629() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 378 379 + @Export("readMedium") + public int readMedium() { + this.offset += 3; + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bd") + @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1778675076" + garbageValue = "874304986" ) - public int method6630() { - if (this.array[this.offset] < 0) { // L: 383 - return this.readInt() & Integer.MAX_VALUE; + @Export("readInt") + public int readInt() { + this.offset += 4; + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-1417360903" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; + long var3 = (long)this.readInt() & 4294967295L; + return var3 + (var1 << 32); + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-353888589" + ) + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(S)Ljava/lang/String;", + garbageValue = "2883" + ) + @Export("readStringCp1252NullTerminatedOrNull") + public String readStringCp1252NullTerminatedOrNull() { + if (this.array[this.offset] == 0) { + ++this.offset; + return null; } else { - int var1 = this.readUnsignedShort(); // L: 384 - return var1 == 32767 ? -1 : var1; // L: 385 + return this.readStringCp1252NullTerminated(); } } @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "104" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1517262900" ) - @Export("readVarInt") - public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 390 + @Export("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; - int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 391 392 394 - var2 = (var2 | var1 & 127) << 7; // L: 393 + while (this.array[++this.offset - 1] != 0) { } - return var2 | var1; // L: 396 + int var2 = this.offset - var1 - 1; + return var2 == 0 ? "" : ModeWhere.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "57" - ) - @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 400 - this.offset = 0; // L: 401 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 402 - int var4 = this.readInt(); // L: 403 - int var5 = this.readInt(); // L: 404 - int var6 = 0; // L: 405 - int var7 = -1640531527; // L: 406 - - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 407 408 411 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 409 - var6 += var7; // L: 410 - } - - this.offset -= 8; // L: 413 - this.writeInt(var4); // L: 414 - this.writeInt(var5); // L: 415 - } - - } // L: 417 - @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-2067473238" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1908328422" ) - @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 420 - this.offset = 0; // L: 421 + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; + if (var1 != 0) { + throw new IllegalStateException(""); + } else { + int var2 = this.offset; - for (int var3 = 0; var3 < var2; ++var3) { // L: 422 - int var4 = this.readInt(); // L: 423 - int var5 = this.readInt(); // L: 424 - int var6 = -957401312; // L: 425 - int var7 = -1640531527; // L: 426 - - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 427 428 431 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 429 - var6 -= var7; // L: 430 + while (this.array[++this.offset - 1] != 0) { } - this.offset -= 8; // L: 433 - this.writeInt(var4); // L: 434 - this.writeInt(var5); // L: 435 + int var3 = this.offset - var2 - 1; + return var3 == 0 ? "" : ModeWhere.decodeStringCp1252(this.array, var2, var3); } - - } // L: 437 - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "([IIIB)V", - garbageValue = "-94" - ) - @Export("xteaEncrypt") - public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 440 - this.offset = var2; // L: 441 - int var5 = (var3 - var2) / 8; // L: 442 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 443 - int var7 = this.readInt(); // L: 444 - int var8 = this.readInt(); // L: 445 - int var9 = 0; // L: 446 - int var10 = -1640531527; // L: 447 - - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 448 449 452 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 450 - var9 += var10; // L: 451 - } - - this.offset -= 8; // L: 454 - this.writeInt(var7); // L: 455 - this.writeInt(var8); // L: 456 - } - - this.offset = var4; // L: 458 - } // L: 459 - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "-1245486877" - ) - @Export("xteaDecrypt") - public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 462 - this.offset = var2; // L: 463 - int var5 = (var3 - var2) / 8; // L: 464 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 465 - int var7 = this.readInt(); // L: 466 - int var8 = this.readInt(); // L: 467 - int var9 = -957401312; // L: 468 - int var10 = -1640531527; // L: 469 - - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 470 471 474 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 472 - var9 -= var10; // L: 473 - } - - this.offset -= 8; // L: 476 - this.writeInt(var7); // L: 477 - this.writeInt(var8); // L: 478 - } - - this.offset = var4; // L: 480 - } // L: 481 - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "421245278" - ) - @Export("encryptRsa") - public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 484 - this.offset = 0; // L: 485 - byte[] var4 = new byte[var3]; // L: 486 - this.readBytes(var4, 0, var3); // L: 487 - BigInteger var5 = new BigInteger(var4); // L: 488 - BigInteger var6 = var5.modPow(var1, var2); // L: 489 - byte[] var7 = var6.toByteArray(); // L: 490 - this.offset = 0; // L: 491 - this.writeShort(var7.length); // L: 492 - this.writeBytes(var7, 0, var7.length); // L: 493 - } // L: 494 - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2115415090" - ) - @Export("writeCrc") - public int writeCrc(int var1) { - byte[] var3 = this.array; // L: 498 - int var4 = this.offset; // L: 499 - int var5 = -1; // L: 501 - - for (int var6 = var1; var6 < var4; ++var6) { // L: 502 - var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 503 - } - - var5 = ~var5; // L: 505 - this.writeInt(var5); // L: 509 - return var5; // L: 510 } - @ObfuscatedName("cz") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "87" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-195591528" ) - @Export("checkCrc") - public boolean checkCrc() { - this.offset -= 4; // L: 514 - byte[] var2 = this.array; // L: 516 - int var3 = this.offset; // L: 517 - int var4 = -1; // L: 519 - - int var5; - for (var5 = 0; var5 < var3; ++var5) { // L: 520 - var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; // L: 521 + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; + if (var1 != 0) { + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); + if (var2 + this.offset > this.array.length) { + throw new IllegalStateException(""); + } else { + String var3 = GrandExchangeOfferWorldComparator.method5141(this.array, this.offset, var2); + this.offset += var2; + return var3; + } } - - var4 = ~var4; // L: 523 - var5 = this.readInt(); // L: 527 - return var5 == var4; // L: 528 } - @ObfuscatedName("cc") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "107" + descriptor = "([BIII)V", + garbageValue = "1035846544" ) - public void method6639(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 533 - } // L: 534 + @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]; + } - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "402503906" - ) - public void method6640(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 537 - } // L: 538 + } - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2121768907" - ) - public void method6641(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 541 - } // L: 542 - - @ObfuscatedName("cv") + @ObfuscatedName("cl") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1750858252" + garbageValue = "-1604277309" ) - public int method6642() { - return this.array[++this.offset - 1] - 128 & 255; // L: 545 + @Export("readShortSmart") + public int readShortSmart() { + int var1 = this.array[this.offset] & 255; + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "51" + ) + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "505032315" + garbageValue = "170681777" ) - public int method6643() { - return 0 - this.array[++this.offset - 1] & 255; // L: 549 + public int method6880() { + int var1 = 0; + + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { + var1 += 32767; + } + + var1 += var2; + return var1; } - @ObfuscatedName("cb") + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-116" + ) + public int method6838() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "27" + ) + public int method6674() { + if (this.array[this.offset] < 0) { + return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); + return var1 == 32767 ? -1 : var1; + } + } + + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1048113331" + garbageValue = "-79066477" ) - public int method6644() { - return 128 - this.array[++this.offset - 1] & 255; // L: 553 + @Export("readVarInt") + public int readVarInt() { + byte var1 = this.array[++this.offset - 1]; + + int var2; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { + var2 = (var2 | var1 & 127) << 7; + } + + return var2 | var1; + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "([IS)V", + garbageValue = "2581" + ) + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; + this.offset = 0; + + for (int var3 = 0; var3 < var2; ++var3) { + int var4 = this.readInt(); + int var5 = this.readInt(); + int var6 = 0; + int var7 = -1640531527; + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; + var6 += var7; + } + + this.offset -= 8; + this.writeInt(var4); + this.writeInt(var5); + } + + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "823253381" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; + this.offset = 0; + + for (int var3 = 0; var3 < var2; ++var3) { + int var4 = this.readInt(); + int var5 = this.readInt(); + int var6 = -957401312; + int var7 = -1640531527; + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; + var6 -= var7; + } + + this.offset -= 8; + this.writeInt(var4); + this.writeInt(var5); + } + + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "([IIIB)V", + garbageValue = "52" + ) + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; + this.offset = var2; + int var5 = (var3 - var2) / 8; + + for (int var6 = 0; var6 < var5; ++var6) { + int var7 = this.readInt(); + int var8 = this.readInt(); + int var9 = 0; + int var10 = -1640531527; + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; + var9 += var10; + } + + this.offset -= 8; + this.writeInt(var7); + this.writeInt(var8); + } + + this.offset = var4; + } + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "-1507914499" + ) + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; + this.offset = var2; + int var5 = (var3 - var2) / 8; + + for (int var6 = 0; var6 < var5; ++var6) { + int var7 = this.readInt(); + int var8 = this.readInt(); + int var9 = -957401312; + int var10 = -1640531527; + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; + var9 -= var10; + } + + this.offset -= 8; + this.writeInt(var7); + this.writeInt(var8); + } + + this.offset = var4; + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "2042844316" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; + this.offset = 0; + byte[] var4 = new byte[var3]; + this.readBytes(var4, 0, var3); + BigInteger var5 = new BigInteger(var4); + BigInteger var6 = var5.modPow(var1, var2); + byte[] var7 = var6.toByteArray(); + this.offset = 0; + this.writeShort(var7.length); + this.writeBytes(var7, 0, var7.length); + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-513887684" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = ClientPacket.method4408(this.array, var1, this.offset); + this.writeInt(var2); + return var2; + } + + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1485327281" + ) + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; + int var1 = ClientPacket.method4408(this.array, 0, this.offset); + int var2 = this.readInt(); + return var1 == var2; + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1006631658" + ) + public void method6683(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-531422547" + ) + public void method6776(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "901864190" + ) + public void method6685(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); + } + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-1" + ) + public int method6686() { + return this.array[++this.offset - 1] - 128 & 255; } @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "258773489" + descriptor = "(I)I", + garbageValue = "-1031833854" ) - public byte method6619() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 557 + public int method6873() { + return 0 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-13" + ) + public int method6688() { + return 128 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-492446192" + ) + public byte method6689() { + return (byte)(this.array[++this.offset - 1] - 128); + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "42164061" + ) + public byte method6690() { + return (byte)(0 - this.array[++this.offset - 1]); } @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "-646501277" + garbageValue = "2142359834" ) - public byte method6682() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 561 + public byte method6644() { + return (byte)(128 - this.array[++this.offset - 1]); } - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-637934068" - ) - public byte method6750() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 565 - } - - @ObfuscatedName("ce") + @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-162656200" + garbageValue = "867871905" ) - public void method6648(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 569 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 570 - } // L: 571 - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" - ) - public void method6705(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 574 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 575 - } // L: 576 - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1684628461" - ) - public void method6649(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 579 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 580 - } // L: 581 - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1073030167" - ) - public int method6651() { - this.offset += 2; // L: 584 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 585 - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-245391743" - ) - public int method6652() { - this.offset += 2; // L: 589 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 590 - } - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2016753913" - ) - public int method6653() { - this.offset += 2; // L: 594 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 595 - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-318250344" - ) - public int method6654() { - this.offset += 2; // L: 599 - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 600 - if (var1 > 32767) { // L: 601 - var1 -= 65536; - } - - return var1; // L: 602 + public void method6692(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); } @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "84" + descriptor = "(II)V", + garbageValue = "-2136436564" ) - public int method6757() { - this.offset += 2; // L: 606 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 607 - if (var1 > 32767) { // L: 608 + public void method6693(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-875838529" + ) + public void method6786(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "8" + ) + public int method6785() { + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + } + + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-523328719" + ) + public int method6696() { + this.offset += 2; + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); + } + + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1346923137" + ) + public int method6697() { + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + } + + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "826957281" + ) + public int method6698() { + this.offset += 2; + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); + if (var1 > 32767) { var1 -= 65536; } - return var1; // L: 609 + return var1; } - @ObfuscatedName("cl") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-548315775" + descriptor = "(B)I", + garbageValue = "55" ) - public void method6660(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 613 - this.array[++this.offset - 1] = (byte)var1; // L: 614 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 615 - } // L: 616 + public int method6699() { + this.offset += 2; + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + if (var1 > 32767) { + var1 -= 65536; + } - @ObfuscatedName("cw") + return var1; + } + + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1682759664" + descriptor = "(I)I", + garbageValue = "568379672" + ) + public int method6700() { + this.offset += 3; + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); + } + + @ObfuscatedName("dx") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "42" ) @Export("writeIntME") public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 619 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 620 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 621 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 622 - } // L: 623 - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1397915031" - ) - public void method6658(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 626 - this.array[++this.offset - 1] = (byte)var1; // L: 627 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 628 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 629 - } // L: 630 - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-553744545" - ) - public void method6659(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 633 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 634 - this.array[++this.offset - 1] = (byte)var1; // L: 635 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 636 - } // L: 637 - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1763340179" - ) - public int method6675() { - this.offset += 4; // L: 640 - 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: 641 + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); } - @ObfuscatedName("du") + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "51" + descriptor = "(II)V", + garbageValue = "-82294037" ) - public int method6725() { - this.offset += 4; // L: 645 - 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: 646 + public void method6701(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); } - @ObfuscatedName("db") + @ObfuscatedName("da") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "16" + ) + public void method6703(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("dw") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-638503855" + garbageValue = "1394456179" ) - public int method6662() { - this.offset += 4; // L: 650 - 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: 651 + public int method6704() { + this.offset += 4; + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); + } + + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2044651336" + ) + public int method6672() { + this.offset += 4; + return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-954433939" + descriptor = "(B)I", + garbageValue = "-3" ) - public void method6821(byte[] var1, int var2, int var3) { + public int method6706() { + this.offset += 4; + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); + } + + @ObfuscatedName("du") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "-1217280037" + ) + public void method6707(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 655 + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } - } // L: 656 + } + + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "61225087" + ) + public void method6749(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); + } + + } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 4b30cffd17..49d035ee3c 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,380 +6,380 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") +@ObfuscatedName("nh") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnx;" ) @Export("accessFile") AccessFile accessFile; @ObfuscatedName("v") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = 1625805143389921353L + longValue = -3766885552873211485L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1336939793 + intValue = -2139615801 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -8547575166494072957L + longValue = 8976089063381266933L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1991100171 + intValue = -490411647 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -3424275237197031151L + longValue = -6685793384620451399L ) @Export("offset") long offset; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 4274241302856356315L + longValue = -514668632289479539L ) @Export("fileLength") long fileLength; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -5713730759396535535L + longValue = -7669073227626038819L ) @Export("length") long length; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -9215570933618315831L + longValue = -7913431712246831653L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lnp;II)V" + descriptor = "(Lnx;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { - this.readBufferOffset = -1L; // L: 9 - this.writeBufferOffset = -1L; // L: 12 - this.writeBufferLength = 0; // L: 13 - this.accessFile = var1; // L: 20 - this.length = this.fileLength = var1.length(); // L: 21 - this.readBuffer = new byte[var2]; // L: 22 - this.writeBuffer = new byte[var3]; // L: 23 - this.offset = 0L; // L: 24 - } // L: 25 + this.readBufferOffset = -1L; + this.writeBufferOffset = -1L; + this.writeBufferLength = 0; + this.accessFile = var1; + this.length = this.fileLength = var1.length(); + this.readBuffer = new byte[var2]; + this.writeBuffer = new byte[var3]; + this.offset = 0L; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1059998601" + garbageValue = "1641755692" ) @Export("close") public void close() throws IOException { - this.flush(); // L: 28 - this.accessFile.close(); // L: 29 - } // L: 30 + this.flush(); + this.accessFile.close(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("seek") public void seek(long var1) throws IOException { - if (var1 < 0L) { // L: 33 + if (var1 < 0L) { throw new IOException(""); } else { - this.offset = var1; // L: 34 + this.offset = var1; } - } // L: 35 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-1576818774" + descriptor = "(S)J", + garbageValue = "17997" ) @Export("length") public long length() { - return this.length; // L: 38 + return this.length; } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-110" - ) - @Export("readFully") - public void readFully(byte[] var1) throws IOException { - this.read(var1, 0, var1.length); // L: 42 - } // L: 43 - @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "1754869480" + ) + @Export("readFully") + public void readFully(byte[] var1) throws IOException { + this.read(var1, 0, var1.length); + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "16711680" + garbageValue = "-1776253078" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { try { - if (var3 + var2 > var1.length) { // L: 47 + if (var3 + var2 > var1.length) { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 - System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 - this.offset += (long)var3; // L: 50 - return; // L: 51 + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { + System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); + this.offset += (long)var3; + return; } - long var4 = this.offset; // L: 53 - int var7 = var3; // L: 55 + long var4 = this.offset; + int var7 = var3; int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56 - var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 - if (var8 > var3) { // L: 58 + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); + if (var8 > var3) { var8 = var3; } - System.arraycopy(this.readBuffer, (int)(this.offset - this.readBufferOffset), var1, var2, var8); // L: 59 - this.offset += (long)var8; // L: 60 - var2 += var8; // L: 61 - var3 -= var8; // L: 62 + System.arraycopy(this.readBuffer, (int)(this.offset - this.readBufferOffset), var1, var2, var8); + this.offset += (long)var8; + var2 += var8; + var3 -= var8; } - if (var3 > this.readBuffer.length) { // L: 64 - this.accessFile.seek(this.offset); // L: 65 + if (var3 > this.readBuffer.length) { + this.accessFile.seek(this.offset); - for (this.fileOffset = this.offset; var3 > 0; var3 -= var8) { // L: 66 67 73 - var8 = this.accessFile.read(var1, var2, var3); // L: 68 - if (var8 == -1) { // L: 69 + for (this.fileOffset = this.offset; var3 > 0; var3 -= var8) { + var8 = this.accessFile.read(var1, var2, var3); + if (var8 == -1) { break; } - this.fileOffset += (long)var8; // L: 70 - this.offset += (long)var8; // L: 71 - var2 += var8; // L: 72 + this.fileOffset += (long)var8; + this.offset += (long)var8; + var2 += var8; } - } else if (var3 > 0) { // L: 76 - this.load(); // L: 77 - var8 = var3; // L: 78 - if (var3 > this.readBufferLength) { // L: 79 + } else if (var3 > 0) { + this.load(); + var8 = var3; + if (var3 > this.readBufferLength) { var8 = this.readBufferLength; } - System.arraycopy(this.readBuffer, 0, var1, var2, var8); // L: 80 - var2 += var8; // L: 81 - var3 -= var8; // L: 82 - this.offset += (long)var8; // L: 83 + System.arraycopy(this.readBuffer, 0, var1, var2, var8); + var2 += var8; + var3 -= var8; + this.offset += (long)var8; } - if (this.writeBufferOffset != -1L) { // L: 85 - if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86 - var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87 - if (var8 > var3 + var2) { // L: 88 + if (this.writeBufferOffset != -1L) { + if (this.writeBufferOffset > this.offset && var3 > 0) { + var8 = var2 + (int)(this.writeBufferOffset - this.offset); + if (var8 > var3 + var2) { var8 = var3 + var2; } - while (var2 < var8) { // L: 89 - var1[var2++] = 0; // L: 90 - --var3; // L: 91 - ++this.offset; // L: 92 + while (var2 < var8) { + var1[var2++] = 0; + --var3; + ++this.offset; } } - long var13 = -1L; // L: 95 - long var10 = -1L; // L: 96 - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97 - var13 = this.writeBufferOffset; // L: 98 - } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 100 - var13 = var4; // L: 101 + long var13 = -1L; + long var10 = -1L; + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { + var13 = this.writeBufferOffset; + } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { + var13 = var4; } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103 - var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104 - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 - var10 = var4 + (long)var7; // L: 107 + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { + var10 = (long)this.writeBufferLength + this.writeBufferOffset; + } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { + var10 = var4 + (long)var7; } - if (var13 > -1L && var10 > var13) { // L: 109 - int var12 = (int)(var10 - var13); // L: 110 - System.arraycopy(this.writeBuffer, (int)(var13 - this.writeBufferOffset), var1, (int)(var13 - var4) + var2, var12); // L: 111 - if (var10 > this.offset) { // L: 112 - var3 = (int)((long)var3 - (var10 - this.offset)); // L: 113 - this.offset = var10; // L: 114 + if (var13 > -1L && var10 > var13) { + int var12 = (int)(var10 - var13); + System.arraycopy(this.writeBuffer, (int)(var13 - this.writeBufferOffset), var1, (int)(var13 - var4) + var2, var12); + if (var10 > this.offset) { + var3 = (int)((long)var3 - (var10 - this.offset)); + this.offset = var10; } } } - } catch (IOException var16) { // L: 120 - this.fileOffset = -1L; // L: 121 - throw var16; // L: 122 + } catch (IOException var16) { + this.fileOffset = -1L; + throw var16; } - if (var3 > 0) { // L: 124 + if (var3 > 0) { throw new EOFException(); } - } // L: 125 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "537841417" + garbageValue = "1420179054" ) @Export("load") void load() throws IOException { - this.readBufferLength = 0; // L: 128 - if (this.fileOffset != this.offset) { // L: 129 - this.accessFile.seek(this.offset); // L: 130 - this.fileOffset = this.offset; // L: 131 + this.readBufferLength = 0; + if (this.offset != this.fileOffset) { + this.accessFile.seek(this.offset); + this.fileOffset = this.offset; } int var2; - for (this.readBufferOffset = this.offset; this.readBufferLength < this.readBuffer.length; this.readBufferLength += var2) { // L: 133 134 140 - int var1 = this.readBuffer.length - this.readBufferLength; // L: 135 - if (var1 > 200000000) { // L: 136 + for (this.readBufferOffset = this.offset; this.readBufferLength < this.readBuffer.length; this.readBufferLength += var2) { + int var1 = this.readBuffer.length - this.readBufferLength; + if (var1 > 200000000) { var1 = 200000000; } - var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); // L: 137 - if (var2 == -1) { // L: 138 + var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); + if (var2 == -1) { break; } - this.fileOffset += (long)var2; // L: 139 + this.fileOffset += (long)var2; } - } // L: 142 + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1975796753" + descriptor = "([BIIB)V", + garbageValue = "-59" ) @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 = (long)var3 + this.offset; + if ((long)var3 + this.offset > this.length) { + this.length = this.offset + (long)var3; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 - this.flush(); // L: 148 + if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { + this.flush(); } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150 - int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151 - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152 - this.offset += (long)var4; // L: 153 - var2 += var4; // L: 154 - var3 -= var4; // L: 155 - this.writeBufferLength = this.writeBuffer.length; // L: 156 - this.flush(); // L: 157 + if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { + int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); + this.offset += (long)var4; + var2 += var4; + var3 -= var4; + this.writeBufferLength = this.writeBuffer.length; + this.flush(); } - if (var3 <= this.writeBuffer.length) { // L: 159 - if (var3 > 0) { // L: 188 - if (this.writeBufferOffset == -1L) { // L: 189 + if (var3 <= this.writeBuffer.length) { + if (var3 > 0) { + if (this.writeBufferOffset == -1L) { this.writeBufferOffset = this.offset; } - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var3); // L: 190 - this.offset += (long)var3; // L: 191 - if (this.offset - this.writeBufferOffset > (long)this.writeBufferLength) { // L: 192 + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var3); + this.offset += (long)var3; + if (this.offset - this.writeBufferOffset > (long)this.writeBufferLength) { this.writeBufferLength = (int)(this.offset - this.writeBufferOffset); } } } else { - if (this.offset != this.fileOffset) { // L: 160 - this.accessFile.seek(this.offset); // L: 161 - this.fileOffset = this.offset; // L: 162 + if (this.fileOffset != this.offset) { + this.accessFile.seek(this.offset); + this.fileOffset = this.offset; } - this.accessFile.write(var1, var2, var3); // L: 164 - this.fileOffset += (long)var3; // L: 165 - if (this.fileOffset > this.fileLength) { // L: 166 + this.accessFile.write(var1, var2, var3); + this.fileOffset += (long)var3; + if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } - long var9 = -1L; // L: 167 - long var6 = -1L; // L: 168 - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 - var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 - var9 = this.readBufferOffset; // L: 173 + long var9 = -1L; + long var6 = -1L; + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { + var9 = this.offset; + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { + var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > 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 && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { // L: 178 - var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 + if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { + var6 = this.offset + (long)var3; + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { + var6 = this.readBufferOffset + (long)this.readBufferLength; } - if (var9 > -1L && var6 > var9) { // L: 181 - int var8 = (int)(var6 - var9); // L: 182 - System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183 + if (var9 > -1L && var6 > var9) { + int var8 = (int)(var6 - var9); + System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); } - this.offset += (long)var3; // L: 185 + this.offset += (long)var3; } - } catch (IOException var12) { // L: 196 - this.fileOffset = -1L; // L: 197 - throw var12; // L: 198 + } catch (IOException var12) { + this.fileOffset = -1L; + throw var12; } - } // L: 186 193 200 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "715951043" + garbageValue = "-2001872519" ) @Export("flush") void flush() throws IOException { - 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 + if (-1L != this.writeBufferOffset) { + if (this.writeBufferOffset != this.fileOffset) { + this.accessFile.seek(this.writeBufferOffset); + this.fileOffset = this.writeBufferOffset; } - this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * -3518850809938837503L; // L: 209 - if (this.fileOffset > this.fileLength) { // L: 210 + this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); + this.fileOffset += (long)this.writeBufferLength * -632165000663793663L; + if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } - long var1 = -1L; // L: 211 - long var3 = -1L; // L: 212 - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213 - var1 = this.writeBufferOffset; // L: 214 - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216 - var1 = this.readBufferOffset; // L: 217 + long var1 = -1L; + long var3 = -1L; + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { + var1 = this.writeBufferOffset; + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { + var1 = this.readBufferOffset; } - 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 = this.readBufferOffset + (long)this.readBufferLength; // L: 223 + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { + var3 = this.writeBufferOffset + (long)this.writeBufferLength; + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { + var3 = this.readBufferOffset + (long)this.readBufferLength; } - if (var1 > -1L && var3 > var1) { // L: 225 - int var5 = (int)(var3 - var1); // L: 226 - System.arraycopy(this.writeBuffer, (int)(var1 - this.writeBufferOffset), this.readBuffer, (int)(var1 - this.readBufferOffset), var5); // L: 227 + if (var1 > -1L && var3 > var1) { + int var5 = (int)(var3 - var1); + System.arraycopy(this.writeBuffer, (int)(var1 - this.writeBufferOffset), this.readBuffer, (int)(var1 - this.readBufferOffset), var5); } - this.writeBufferOffset = -1L; // L: 229 - this.writeBufferLength = 0; // L: 230 + this.writeBufferOffset = -1L; + this.writeBufferLength = 0; } - } // L: 232 + } } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 8ff45f7c0d..634b734036 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,112 +5,118 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("lx") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("f") - @Export("socket") - Socket socket; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lgh;" + ) + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Llv;" ) @Export("source") BufferedSource source; + @ObfuscatedName("t") + @Export("socket") + Socket socket; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Lle;" ) @Export("sink") BufferedSink sink; - BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { - this.socket = var1; // L: 12 - this.socket.setSoTimeout(30000); // L: 13 - this.socket.setTcpNoDelay(true); // L: 14 - this.socket.setReceiveBufferSize(65536); // L: 15 - this.socket.setSendBufferSize(65536); // L: 16 - this.source = new BufferedSource(this.socket.getInputStream(), var2); // L: 17 - this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 - } // L: 19 + public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + this.socket = var1; + this.socket.setSoTimeout(30000); + this.socket.setTcpNoDelay(true); + this.socket.setReceiveBufferSize(65536); + this.socket.setSendBufferSize(65536); + this.source = new BufferedSource(this.socket.getInputStream(), var2); + this.sink = new BufferedSink(this.socket.getOutputStream(), var3); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1854440694" + descriptor = "(S)V", + garbageValue = "-27454" ) @Export("close") public void close() { - this.sink.close(); // L: 42 + this.sink.close(); try { - this.socket.close(); // L: 44 + this.socket.close(); } catch (IOException var2) { } - this.source.close(); // L: 47 - } // L: 48 + this.source.close(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "574875272" + garbageValue = "1311148246" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.source.readUnsignedByte(); // L: 30 + return this.source.readUnsignedByte(); } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2063198043" + descriptor = "(B)I", + garbageValue = "88" ) @Export("available") public int available() throws IOException { - return this.source.available(); // L: 26 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2019948581" - ) - @Export("isAvailable") - public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); // L: 22 + return this.source.available(); } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-60" + ) + @Export("isAvailable") + public boolean isAvailable(int var1) throws IOException { + return this.source.isAvailable(var1); + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-334344092" + garbageValue = "1814286008" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); // L: 34 + return this.source.read(var1, var2, var3); } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1206684972" + descriptor = "([BIIB)V", + garbageValue = "-30" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.sink.write(var1, var2, var3); // L: 38 - } // L: 39 + this.sink.write(var1, var2, var3); + } protected void finalize() { - this.close(); // L: 51 - } // L: 52 + this.close(); + } - @ObfuscatedName("c") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lba;I)V", - garbageValue = "-812181835" + descriptor = "(Ljy;B)V", + garbageValue = "-123" ) - public static final void method5960(PlayerProvider var0) { - FontName.pcmPlayerProvider = var0; // L: 45 - } // L: 46 + public static void method5956(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; + } } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index b612cf3bf2..597999cd83 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -1,272 +1,248 @@ +import java.io.DataInputStream; import java.io.IOException; import java.io.OutputStream; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("lv") +@ObfuscatedName("le") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("y") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("s") @Export("thread") Thread thread; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("outputStream") OutputStream outputStream; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 992988875 + intValue = 815941805 ) @Export("capacity") int capacity; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("buffer") byte[] buffer; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1280134095 + intValue = 606679557 ) @Export("position") int position; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1968641393 + intValue = 217020143 ) @Export("limit") int limit; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("exception") IOException exception; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("closed") boolean closed; BufferedSink(OutputStream var1, int var2) { - this.position = 0; // L: 186 - this.limit = 0; // L: 187 - this.outputStream = var1; // L: 192 - this.capacity = var2 + 1; // L: 193 - this.buffer = new byte[this.capacity]; // L: 194 - this.thread = new Thread(this); // L: 195 - this.thread.setDaemon(true); // L: 196 - this.thread.start(); // L: 197 - } // L: 198 + this.position = 0; + this.limit = 0; + this.outputStream = var1; + this.capacity = var2 + 1; + this.buffer = new byte[this.capacity]; + this.thread = new Thread(this); + this.thread.setDaemon(true); + this.thread.start(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1288409472" + garbageValue = "1408116923" ) @Export("isClosed") boolean isClosed() { - if (this.closed) { // L: 201 + if (this.closed) { try { - this.outputStream.close(); // L: 203 + this.outputStream.close(); if (this.exception == null) { - this.exception = new IOException(""); // L: 204 + this.exception = new IOException(""); } - } catch (IOException var2) { // L: 206 - if (this.exception == null) { // L: 207 + } catch (IOException var2) { + if (this.exception == null) { this.exception = new IOException(var2); } } - return true; // L: 209 + return true; } else { - return false; // L: 211 + return false; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-765694644" + descriptor = "([BIIB)V", + garbageValue = "0" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261 - synchronized(this) { // L: 262 - if (this.exception != null) { // L: 263 + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + synchronized(this) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { int var5; - if (this.position <= this.limit) { // L: 265 + if (this.position <= this.limit) { var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; // L: 266 + var5 = this.position - this.limit - 1; } - if (var5 < var3) { // L: 267 + if (var5 < var3) { throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { // L: 268 - System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269 + if (var3 + this.limit <= this.capacity) { + System.arraycopy(var1, var2, this.buffer, this.limit, var3); } else { - int var6 = this.capacity - this.limit; // L: 272 - System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 273 - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 274 + int var6 = this.capacity - this.limit; + System.arraycopy(var1, var2, this.buffer, this.limit, var6); + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); } - this.limit = (var3 + this.limit) % this.capacity; // L: 276 - this.notifyAll(); // L: 277 + this.limit = (var3 + this.limit) % this.capacity; + this.notifyAll(); } } } } else { throw new IOException(); } - } // L: 279 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "70" + descriptor = "(I)V", + garbageValue = "-811100713" ) @Export("close") void close() { - synchronized(this) { // L: 282 - this.closed = true; // L: 283 - this.notifyAll(); // L: 284 - } // L: 285 - - try { - this.thread.join(); // L: 287 - } catch (InterruptedException var3) { // L: 289 + synchronized(this) { + this.closed = true; + this.notifyAll(); } - } // L: 290 + try { + this.thread.join(); + } catch (InterruptedException var3) { + } + + } public void run() { do { int var1; - synchronized(this) { // L: 217 + synchronized(this) { while (true) { - if (this.exception != null) { // L: 219 + if (this.exception != null) { return; } - if (this.position <= this.limit) { // L: 220 + if (this.position <= this.limit) { var1 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; // L: 221 + var1 = this.capacity - this.position + this.limit; } - if (var1 > 0) { // L: 222 + if (var1 > 0) { break; } try { - this.outputStream.flush(); // L: 224 - } catch (IOException var11) { // L: 226 - this.exception = var11; // L: 227 - return; // L: 228 + this.outputStream.flush(); + } catch (IOException var11) { + this.exception = var11; + return; } - if (this.isClosed()) { // L: 230 + if (this.isClosed()) { return; } try { - this.wait(); // L: 232 - } catch (InterruptedException var12) { // L: 234 + this.wait(); + } catch (InterruptedException var12) { } } } try { - if (var1 + this.position <= this.capacity) { // L: 238 - this.outputStream.write(this.buffer, this.position, var1); // L: 239 + if (var1 + this.position <= this.capacity) { + this.outputStream.write(this.buffer, this.position, var1); } else { - int var7 = this.capacity - this.position; // L: 242 - this.outputStream.write(this.buffer, this.position, var7); // L: 243 - this.outputStream.write(this.buffer, 0, var1 - var7); // L: 244 + int var7 = this.capacity - this.position; + this.outputStream.write(this.buffer, this.position, var7); + this.outputStream.write(this.buffer, 0, var1 - var7); } - } catch (IOException var10) { // L: 247 + } catch (IOException var10) { IOException var2 = var10; - synchronized(this) { // L: 248 - this.exception = var2; // L: 249 - return; // L: 250 + synchronized(this) { + this.exception = var2; + return; } } - synchronized(this) { // L: 253 - this.position = (var1 + this.position) % this.capacity; // L: 254 - } // L: 255 - } while(!this.isClosed()); // L: 256 + synchronized(this) { + this.position = (var1 + this.position) % this.capacity; + } + } while(!this.isClosed()); } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "14" + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "1118692057" ) - static int method5990(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 804 - var0 -= 1000; // L: 805 - var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 806 + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); } else { - var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 808 - } + try { + String var2 = ""; + if (var1 != null) { + var2 = class398.method7217(var1); + } - Script.invalidateWidget(var3); // L: 809 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 810 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 830 - var3.modelType = 2; // L: 831 - var3.modelId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 832 - return 1; // L: 833 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 835 - var3.modelType = 3; // L: 836 - var3.modelId = class262.localPlayer.appearance.getChatHeadId(); // L: 837 - return 1; // L: 838 - } else { - return 2; // L: 840 - } - } else { - ChatChannel.Interpreter_intStackSize -= 2; // L: 811 - int var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 812 - int var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 813 - var3.itemId = var4; // L: 814 - var3.itemQuantity = var5; // L: 815 - ItemComposition var6 = class250.ItemDefinition_get(var4); // L: 816 - var3.modelAngleX = var6.xan2d; // L: 817 - var3.modelAngleY = var6.yan2d; // L: 818 - var3.modelAngleZ = var6.zan2d; // L: 819 - var3.modelOffsetX = var6.offsetX2d; // L: 820 - var3.modelOffsetY = var6.offsetY2d; // L: 821 - var3.modelZoom = var6.zoom2d; // L: 822 - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 823 - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 824 - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; // L: 825 + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + UserComparator6.clientType + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { } - if (var3.field3011 > 0) { // L: 826 - var3.modelZoom = var3.modelZoom * 32 / var3.field3011; - } else if (var3.rawWidth > 0) { // L: 827 - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; // L: 828 } } - - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-452745506" - ) - static void method5992() { - PacketBufferNode var0 = InterfaceParent.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); // L: 4412 - var0.packetBuffer.writeByte(class302.getWindowedMode()); // L: 4413 - var0.packetBuffer.writeShort(AttackOption.canvasWidth); // L: 4414 - var0.packetBuffer.writeShort(class0.canvasHeight); // L: 4415 - Client.packetWriter.addNode(var0); // L: 4416 - } // L: 4417 } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 8077ea5d14..3b2e671446 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,78 +7,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("lv") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("thread") Thread thread; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("inputStream") InputStream inputStream; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 285742319 + intValue = -1632298871 ) @Export("capacity") int capacity; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("buffer") byte[] buffer; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 931339893 + intValue = -1180606629 ) @Export("position") int position; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1604249391 + intValue = -1759291227 ) @Export("limit") int limit; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("exception") IOException exception; BufferedSource(InputStream var1, int var2) { - this.position = 0; // L: 59 - this.limit = 0; // L: 60 - this.inputStream = var1; // L: 64 - this.capacity = var2 + 1; // L: 65 - this.buffer = new byte[this.capacity]; // L: 66 - this.thread = new Thread(this); // L: 67 - this.thread.setDaemon(true); // L: 68 - this.thread.start(); // L: 69 - } // L: 70 + this.position = 0; + this.limit = 0; + this.inputStream = var1; + this.capacity = var2 + 1; + this.buffer = new byte[this.capacity]; + this.thread = new Thread(this); + this.thread.setDaemon(true); + this.thread.start(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-604765371" + garbageValue = "738790028" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { // L: 106 + if (var1 == 0) { return true; - } else if (var1 > 0 && var1 < this.capacity) { // L: 107 - synchronized(this) { // L: 108 + } else if (var1 > 0 && var1 < this.capacity) { + synchronized(this) { int var3; - if (this.position <= this.limit) { // L: 110 + if (this.position <= this.limit) { var3 = this.limit - this.position; } else { - var3 = this.capacity - this.position + this.limit; // L: 111 + var3 = this.capacity - this.position + this.limit; } - if (var3 < var1) { // L: 112 - if (this.exception != null) { // L: 113 + if (var3 < var1) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { - this.notifyAll(); // L: 114 - return false; // L: 115 + this.notifyAll(); + return false; } } else { - return true; // L: 117 + return true; } } } else { @@ -86,87 +86,87 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "359780647" + garbageValue = "-1997432496" ) @Export("available") int available() throws IOException { - synchronized(this) { // L: 122 + synchronized(this) { int var2; - if (this.position <= this.limit) { // L: 124 + if (this.position <= this.limit) { var2 = this.limit - this.position; } else { - var2 = this.capacity - this.position + this.limit; // L: 125 + var2 = this.capacity - this.position + this.limit; } - if (var2 <= 0 && this.exception != null) { // L: 126 - throw new IOException(this.exception.toString()); // L: 127 + if (var2 <= 0 && this.exception != null) { + throw new IOException(this.exception.toString()); } else { - this.notifyAll(); // L: 129 - return var2; // L: 130 + this.notifyAll(); + return var2; } } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-58" + descriptor = "(I)I", + garbageValue = "974096261" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { - synchronized(this) { // L: 135 - if (this.limit == this.position) { // L: 136 - if (this.exception != null) { // L: 137 + synchronized(this) { + if (this.limit == this.position) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { - return -1; // L: 138 + return -1; } } else { - int var2 = this.buffer[this.position] & 255; // L: 140 - this.position = (this.position + 1) % this.capacity; // L: 141 - this.notifyAll(); // L: 142 - return var2; // L: 143 + int var2 = this.buffer[this.position] & 255; + this.position = (this.position + 1) % this.capacity; + this.notifyAll(); + return var2; } } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "315483925" + garbageValue = "1928899713" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 148 - synchronized(this) { // L: 149 + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + synchronized(this) { int var5; - if (this.position <= this.limit) { // L: 151 + if (this.position <= this.limit) { var5 = this.limit - this.position; } else { - var5 = this.capacity - this.position + this.limit; // L: 152 + var5 = this.capacity - this.position + this.limit; } - if (var3 > var5) { // L: 153 + if (var3 > var5) { var3 = var5; } - if (var3 == 0 && this.exception != null) { // L: 154 + if (var3 == 0 && this.exception != null) { throw new IOException(this.exception.toString()); } else { - if (var3 + this.position <= this.capacity) { // L: 155 - System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 156 + if (var3 + this.position <= this.capacity) { + System.arraycopy(this.buffer, this.position, var1, var2, var3); } else { - int var6 = this.capacity - this.position; // L: 159 - System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 160 - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 161 + int var6 = this.capacity - this.position; + System.arraycopy(this.buffer, this.position, var1, var2, var6); + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); } - this.position = (var3 + this.position) % this.capacity; // L: 163 - this.notifyAll(); // L: 164 - return var3; // L: 165 + this.position = (var3 + this.position) % this.capacity; + this.notifyAll(); + return var3; } } } else { @@ -174,100 +174,82 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "107" + descriptor = "(I)V", + garbageValue = "-1945764855" ) @Export("close") void close() { - synchronized(this) { // L: 170 + synchronized(this) { if (this.exception == null) { - this.exception = new IOException(""); // L: 171 + this.exception = new IOException(""); } - this.notifyAll(); // L: 172 + this.notifyAll(); } try { - this.thread.join(); // L: 175 - } catch (InterruptedException var3) { // L: 177 + this.thread.join(); + } catch (InterruptedException var3) { } - } // L: 178 + } public void run() { while (true) { int var1; - synchronized(this) { // L: 75 + synchronized(this) { while (true) { - if (this.exception != null) { // L: 77 + if (this.exception != null) { return; } - if (this.position == 0) { // L: 78 + if (this.position == 0) { var1 = this.capacity - this.limit - 1; - } else if (this.position <= this.limit) { // L: 79 + } else if (this.position <= this.limit) { var1 = this.capacity - this.limit; } else { - var1 = this.position - this.limit - 1; // L: 80 + var1 = this.position - this.limit - 1; } - if (var1 > 0) { // L: 81 + if (var1 > 0) { break; } try { - this.wait(); // L: 83 - } catch (InterruptedException var10) { // L: 85 + this.wait(); + } catch (InterruptedException var10) { } } } int var7; try { - var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 90 + var7 = this.inputStream.read(this.buffer, this.limit, var1); if (var7 == -1) { - throw new EOFException(); // L: 91 + throw new EOFException(); } - } catch (IOException var11) { // L: 93 + } catch (IOException var11) { IOException var3 = var11; - synchronized(this) { // L: 94 - this.exception = var3; // L: 95 - return; // L: 96 + synchronized(this) { + this.exception = var3; + return; } } - synchronized(this) { // L: 99 - this.limit = (var7 + this.limit) % this.capacity; // L: 100 - } // L: 101 + synchronized(this) { + this.limit = (var7 + this.limit) % this.capacity; + } } } - @ObfuscatedName("jw") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-855272666" + descriptor = "(I)V", + garbageValue = "-1100591675" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - Client.scrollBarSprites[0].drawAt(var0, var1); // L: 10033 - Client.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10034 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field685); // L: 10035 - int var5 = var3 * (var3 - 32) / var4; // L: 10036 - if (var5 < 8) { // L: 10037 - var5 = 8; - } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10038 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field686); // L: 10039 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field688); // L: 10040 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field688); // L: 10041 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field688); // L: 10042 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field688); // L: 10043 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field818); // L: 10044 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field818); // L: 10045 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field818); // L: 10046 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field818); // L: 10047 - } // L: 10048 + public static void method5986() { + class41.reflectionChecks = new IterableNodeDeque(); + } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index cc2e626dbd..552bfb5c3d 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mi") +@ObfuscatedName("mn") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("byteArray") public byte[] byteArray; public ByteArrayNode(byte[] var1) { - this.byteArray = var1; // L: 7 - } // L: 8 + this.byteArray = var1; + } } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index c3f4f2ac0e..3f60d195a1 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,89 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("kp") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -679236325 + intValue = -711959023 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 664960087 + intValue = 802134257 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1131523735 + intValue = -326255735 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; + @ObfuscatedName("w") + @Export("ByteArrayPool_alternativeSizes") + public static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("o") + @Export("ByteArrayPool_arrays") + public static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("bo") + static String field3775; static { - ByteArrayPool_smallCount = 0; // L: 4 - ByteArrayPool_mediumCount = 0; // L: 5 - ByteArrayPool_largeCount = 0; // L: 6 - ByteArrayPool_small = new byte[1000][]; // L: 7 - ByteArrayPool_medium = new byte[250][]; // L: 8 - ByteArrayPool_large = new byte[50][]; // L: 9 + ByteArrayPool_smallCount = 0; + ByteArrayPool_mediumCount = 0; + ByteArrayPool_largeCount = 0; + ByteArrayPool_small = new byte[1000][]; + ByteArrayPool_medium = new byte[250][]; + ByteArrayPool_large = new byte[50][]; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IZB)[B", - garbageValue = "-120" + garbageValue = "55" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; - if (var0 != 100) { // L: 20 + if (var0 != 100) { if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 21 - ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 22 - return var4; // L: 23 + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; + ByteArrayPool_small[ByteArrayPool_smallCount] = null; + return var4; } - if (var0 != 5000) { // L: 25 + if (var0 != 5000) { if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 26 - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 27 - return var4; // L: 28 + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; + ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; + return var4; } - if (var0 != 30000) { // L: 30 + if (var0 != 30000) { if (var0 < 30000) { } } else if (ByteArrayPool_largeCount > 0) { - var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 31 - ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 32 - return var4; // L: 33 + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; + ByteArrayPool_large[ByteArrayPool_largeCount] = null; + return var4; } - if (Tiles.ByteArrayPool_arrays != null) { // L: 35 - for (int var2 = 0; var2 < class372.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 36 - if (class372.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 37 - if (var0 < class372.ByteArrayPool_alternativeSizes[var2]) { + if (ByteArrayPool_arrays != null) { + for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { + if (ByteArrayPool_alternativeSizes[var2] != var0) { + if (var0 < ByteArrayPool_alternativeSizes[var2]) { } - } else if (WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = Tiles.ByteArrayPool_arrays[var2][--WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 38 - Tiles.ByteArrayPool_arrays[var2][WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var2]] = null; + } else if (class127.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = ByteArrayPool_arrays[var2][--class127.ByteArrayPool_altSizeArrayCounts[var2]]; + ByteArrayPool_arrays[var2][class127.ByteArrayPool_altSizeArrayCounts[var2]] = null; return var3; } } @@ -94,40 +102,4 @@ public class ByteArrayPool { return new byte[var0]; } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-194411465" - ) - @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/Calendar.java b/runescape-client/src/main/java/Calendar.java index 678f85792a..f12b40838c 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -2,24 +2,35 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("id") @Implements("Calendar") public class Calendar { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("MONTH_NAMES_ENGLISH_GERMAN") - public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("e") + static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("t") @Export("DAYS_OF_THE_WEEK") - public static final String[] DAYS_OF_THE_WEEK; + static final String[] DAYS_OF_THE_WEEK; @ObfuscatedName("v") @Export("Calendar_calendar") - public static java.util.Calendar Calendar_calendar; + 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: 7 - DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 17 - java.util.Calendar.getInstance(); // L: 21 - Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 22 - } // L: 23 + MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; + DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + java.util.Calendar.getInstance(); + Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + static void method4863() { + Login.loginIndex = 24; + Client.setLoginResponseString("", "You were disconnected from the server.", ""); + } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 78275abd83..953449661f 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,168 +1,930 @@ import java.awt.Component; import java.awt.Graphics; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aj") +@ObfuscatedName("h") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("o") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("hw") - @ObfuscatedGetter( - intValue = -216533437 + @ObfuscatedName("ss") + @ObfuscatedSignature( + descriptor = "Lai;" ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = -898435727 + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "Lio;" ) - static int field296; - @ObfuscatedName("f") + static Widget field77; + @ObfuscatedName("oh") + @ObfuscatedSignature( + descriptor = "Leo;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("s") @Export("component") Component component; Canvas(Component var1) { - this.component = var1; // L: 11 - } // L: 12 + this.component = var1; + } public final void paint(Graphics var1) { - this.component.paint(var1); // L: 19 - } // L: 20 + this.component.paint(var1); + } public final void update(Graphics var1) { this.component.update(var1); } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "44" + descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "1747543750" ) - static void method495() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 - if (var0.obj != null) { // L: 31 - var0.set(); + static File method125(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + JagexCache.JagexCache_locationFile = new File(class234.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; + boolean var6 = false; + Buffer var8; + int var11; + File var27; + if (JagexCache.JagexCache_locationFile.exists()) { + try { + AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); + + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { + 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); + } + + 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 var25) { + var25.printStackTrace(); + } + + if (var4 != null) { + var27 = new File(var4); + if (!var27.exists()) { + var4 = null; + } + } + + if (var4 != null) { + var27 = new File(var4, "test.dat"); + + boolean var28; + try { + RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); + var11 = var15.read(); + var15.seek(0L); + var15.write(var11); + var15.seek(0L); + var15.close(); + var27.delete(); + var28 = true; + } catch (Exception var23) { + var28 = false; + } + + if (!var28) { + var4 = null; + } } } - } // L: 33 + if (var4 == null && var2 == 0) { + label152: + for (int var16 = 0; var16 < DirectByteArrayCopier.cacheSubPaths.length; ++var16) { + for (int var17 = 0; var17 < BuddyRankComparator.cacheParentPaths.length; ++var17) { + File var18 = new File(BuddyRankComparator.cacheParentPaths[var17] + DirectByteArrayCopier.cacheSubPaths[var16] + File.separatorChar + var0 + File.separatorChar); + if (var18.exists()) { + File var19 = new File(var18, "test.dat"); - @ObfuscatedName("f") + boolean var29; + try { + RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); + int var13 = var12.read(); + var12.seek(0L); + var12.write(var13); + var12.seek(0L); + var12.close(); + var19.delete(); + var29 = true; + } catch (Exception var22) { + var29 = false; + } + + if (var29) { + var4 = var18.toString(); + var6 = true; + break label152; + } + } + } + } + } + + if (var4 == null) { + var4 = class234.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var6 = true; + } + + File var26; + if (var5 != null) { + var26 = new File(var5); + var27 = new File(var4); + + try { + File[] var33 = var26.listFiles(); + File[] var31 = var33; + + for (var11 = 0; var11 < var31.length; ++var11) { + File var30 = var31[var11]; + File var20 = new File(var27, var30.getName()); + boolean var14 = var30.renameTo(var20); + if (!var14) { + throw new IOException(); + } + } + } catch (Exception var24) { + var24.printStackTrace(); + } + + var6 = true; + } + + if (var6) { + var26 = new File(var4); + var8 = null; + + try { + AccessFile var34 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); + Buffer var32 = new Buffer(500); + var32.writeByte(3); + var32.writeByte(var8 != null ? 1 : 0); + var32.writeCESU8(var26.getPath()); + if (var8 != null) { + var32.writeCESU8(""); + } + + var34.write(var32.array, 0, var32.offset); + var34.close(); + } catch (IOException var21) { + var21.printStackTrace(); + } + } + + return new File(var4); + } + + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2014736548" + descriptor = "(B)V", + garbageValue = "54" ) - static int method498(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; + public static void method123() { + Widget.Widget_cachedSprites.clear(); + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIIIIIILgw;Lfy;I)V", + garbageValue = "1213959162" + ) + static final void method120(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { + ObjectComposition var9 = ClanChannel.getObjectDefinition(var4); + int var10; + int var11; + if (var5 != 1 && var5 != 3) { + var10 = var9.sizeX; + var11 = var9.sizeY; } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + var10 = var9.sizeY; + var11 = var9.sizeX; + } + + int var12; + int var13; + if (var10 + var2 <= 104) { + var12 = (var10 >> 1) + var2; + var13 = var2 + (var10 + 1 >> 1); + } else { + var12 = var2; + var13 = var2 + 1; + } + + int var14; + int var15; + if (var3 + var11 <= 104) { + var14 = var3 + (var11 >> 1); + var15 = var3 + (var11 + 1 >> 1); + } else { + var14 = var3; + var15 = var3 + 1; + } + + int[][] var16 = Tiles.Tiles_heights[var1]; + int var17 = var16[var13][var15] + var16[var12][var14] + var16[var13][var14] + var16[var12][var15] >> 2; + int var18 = (var2 << 7) + (var10 << 6); + int var19 = (var3 << 7) + (var11 << 6); + long var20 = class171.calculateTag(var2, var3, 2, var9.int1 == 0, var4); + int var22 = (var5 << 6) + var6; + if (var9.int3 == 1) { + var22 += 256; + } + + Object var30; + if (var6 == 22) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(22, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); + if (var9.interactType == 1) { + var8.setBlockedByFloorDec(var2, var3); + } + + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.method3984(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 0) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(0, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field907[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3171(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 1) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(1, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field908[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3171(var2, var3, var6, var5, var9.boolean1); + } + + } else { + int var23; + if (var6 == 2) { + var23 = var5 + 1 & 3; + Object var25; + Object var31; + if (var9.animationId == -1 && var9.transforms == null) { + var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); + var25 = var9.getModel(2, var23, var16, var18, var17, var19); + } else { + var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field907[var5], Tiles.field907[var23], var20, var22); + if (var9.interactType != 0) { + var8.method3171(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 3) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(3, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field908[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3171(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 9) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.method3984(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 4) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field907[var5], 0, 0, 0, var20, var22); + } else { + long var24; + Object var26; + if (var6 == 5) { + var23 = 16; + var24 = var7.getBoundaryObjectTag(var0, var2, var3); + if (0L != var24) { + var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2; + } + + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field907[var5], 0, var23 * Tiles.field905[var5], var23 * Tiles.field912[var5], var20, var22); + } else if (var6 == 6) { + var23 = 8; + var24 = var7.getBoundaryObjectTag(var0, var2, var3); + if (0L != var24) { + var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2 / 2; + } + + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field903[var5], var23 * Tiles.field914[var5], var20, var22); + } else if (var6 == 7) { + int var29 = var5 + 2 & 3; + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); + } else if (var6 == 8) { + var23 = 8; + var24 = var7.getBoundaryObjectTag(var0, var2, var3); + if (var24 != 0L) { + var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2 / 2; + } + + int var28 = var5 + 2 & 3; + Object var27; + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field903[var5], var23 * Tiles.field914[var5], var20, var22); + } + } + } + } else { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(10, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + } + + if (var30 != null) { + var7.method3984(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22); + } + + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + } } - @ObfuscatedName("ax") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(ILiw;ZI)V", - garbageValue = "865156803" + descriptor = "(ILbd;ZI)I", + garbageValue = "1283945843" ) - static void method497(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = BZip2State.getWorldMap().getMapArea(var0); // L: 4411 - int var4 = class262.localPlayer.plane; // L: 4412 - int var5 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 4413 - int var6 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 4414 - Coord var7 = new Coord(var4, var5, var6); // L: 4415 - BZip2State.getWorldMap().method6147(var3, var7, var1, var2); // L: 4416 - } // L: 4417 - - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1340862776" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 3871 - class4.clientPreferences.roofsHidden = !class4.clientPreferences.roofsHidden; // L: 3872 - Actor.savePreferences(); // L: 3873 - if (class4.clientPreferences.roofsHidden) { // L: 3874 - UserComparator10.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - UserComparator10.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3875 - } - } - - if (var0.equalsIgnoreCase("displayfps")) { // L: 3877 - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { // L: 3878 - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3879 - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { // L: 3880 - if (var0.equalsIgnoreCase("errortest")) { // L: 3881 - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { // L: 3882 - class80.worldMap.showCoord = !class80.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { // L: 3883 - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { // L: 3884 - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); // L: 3885 - } - - if (var0.equalsIgnoreCase("clientdrop")) { // L: 3886 - ApproximateRouteStrategy.method1268(); - } - } - - PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 3889 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 3890 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3891 - Client.packetWriter.addNode(var1); // L: 3892 - } // L: 3893 - - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(Lcj;I)Z", - garbageValue = "-1832136832" - ) - static boolean method492(Player var0) { - if (Client.drawPlayerNames == 0) { // L: 4864 - return false; + static int method124(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; + return 1; } else { - boolean var1; - if (class262.localPlayer == var0) { // L: 4865 - var1 = (Client.drawPlayerNames & 8) != 0; // L: 4879 - return var1; // L: 4881 + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.method4340(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_GETNUM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_TOTAL) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4888(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class100.getInvDefinition(var3).size; + return 1; + } else if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; } else { - var1 = class171.method3611(); // L: 4866 - if (!var1) { // L: 4867 - boolean var2 = (Client.drawPlayerNames & 1) != 0; // L: 4870 - var1 = var2 && var0.isFriend(); // L: 4872 + int var5; + if (var0 == ScriptOpcodes.COORD) { + var3 = GrandExchangeEvent.Client_plane; + var4 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; + var5 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.method4340(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4888(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == ScriptOpcodes.MOVECOORD) { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 3326) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field417; + return 1; + } else if (var0 == 3327) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field418; + return 1; + } else { + return 2; + } + } + } + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(Laq;S)V", + garbageValue = "-8915" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); + } + + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(Lhv;B)V", + garbageValue = "19" + ) + static final void method114(class227 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + byte var3; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var37; + int var38; + int var39; + if (class227.field2675 == var0) { + var37 = var1.readUnsignedByte(); + var3 = var1.method6644(); + var39 = var1.method6785(); + var5 = var1.method6696(); + byte var40 = var1.readByte(); + var7 = var1.method6686(); + var8 = (var7 >> 4 & 7) + Language.field3694; + var9 = (var7 & 7) + SecureRandomFuture.field858; + var10 = var1.method6688() * 4; + var11 = var1.method6686() * 4; + var12 = var1.method6698(); + var13 = var1.method6873(); + var14 = var1.readUnsignedShort(); + var38 = var3 + var8; + var6 = var40 + var9; + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var38 >= 0 && var6 >= 0 && var38 < 104 && var6 < 104 && var5 != 65535) { + var8 = var8 * 128 + 64; + var9 = var9 * 128 + 64; + var38 = var38 * 128 + 64; + var6 = var6 * 128 + 64; + Projectile var36 = new Projectile(var5, GrandExchangeEvent.Client_plane, var8, var9, class122.getTileHeight(var8, var9, GrandExchangeEvent.Client_plane) - var11, var14 + Client.cycle, var39 + Client.cycle, var37, var13, var12, var10); + var36.setDestination(var38, var6, class122.getTileHeight(var38, var6, GrandExchangeEvent.Client_plane) - var10, var14 + Client.cycle); + Client.projectiles.addFirst(var36); + } + + } else { + if (class227.field2676 == var0) { + byte var2 = var1.method6690(); + var3 = var1.method6690(); + byte var4 = var1.method6689(); + var5 = var1.method6696(); + var6 = var1.readUnsignedShort(); + var7 = var1.method6697(); + var8 = var1.method6873(); + var9 = var8 >> 2; + var10 = var8 & 3; + var11 = Client.field467[var9]; + var12 = var1.method6686(); + var13 = (var12 >> 4 & 7) + Language.field3694; + var14 = (var12 & 7) + SecureRandomFuture.field858; + byte var15 = var1.method6689(); + int var16 = var1.method6696(); + Player var17; + if (var7 == Client.localPlayerIndex) { + var17 = MouseHandler.localPlayer; + } else { + var17 = Client.players[var7]; } - return var1 || ClanChannel.method54() && var0.isFriendsChatMember(); // L: 4874 + if (var17 != null) { + ObjectComposition var18 = ClanChannel.getObjectDefinition(var6); + int var19; + int var20; + if (var10 != 1 && var10 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var13 + (var19 >> 1); + int var22 = var13 + (var19 + 1 >> 1); + int var23 = var14 + (var20 >> 1); + int var24 = var14 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[GrandExchangeEvent.Client_plane]; + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; + int var27 = (var13 << 7) + (var19 << 6); + int var28 = (var14 << 7) + (var20 << 6); + Model var29 = var18.getModel(var9, var10, var25, var27, var26, var28); + if (var29 != null) { + ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var13, var14, var11, -1, 0, 0, var16 + 1, var5 + 1); + var17.animationCycleStart = var16 + Client.cycle; + var17.animationCycleEnd = var5 + Client.cycle; + var17.model0 = var29; + var17.field982 = var19 * 64 + var13 * 128; + var17.field989 = var20 * 64 + var14 * 128; + var17.tileHeight2 = var26; + byte var30; + if (var2 > var15) { + var30 = var2; + var2 = var15; + var15 = var30; + } + + if (var4 > var3) { + var30 = var4; + var4 = var3; + var3 = var30; + } + + var17.minX = var13 + var2; + var17.maxX = var15 + var13; + var17.minY = var4 + var14; + var17.maxY = var14 + var3; + } + } + } + + if (class227.field2682 == var0) { + var37 = var1.method6686(); + var38 = (var37 >> 4 & 7) + Language.field3694; + var39 = (var37 & 7) + SecureRandomFuture.field858; + var5 = var1.method6688(); + var6 = var1.method6697(); + var7 = var1.method6697(); + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + var38 = var38 * 128 + 64; + var39 = var39 * 128 + 64; + GraphicsObject var44 = new GraphicsObject(var7, GrandExchangeEvent.Client_plane, var38, var39, class122.getTileHeight(var38, var39, GrandExchangeEvent.Client_plane) - var5, var6, Client.cycle); + Client.graphicsObjects.addFirst(var44); + } + + } else if (class227.field2683 == var0) { + var37 = var1.method6697(); + var38 = var1.method6688(); + var39 = (var38 >> 4 & 7) + Language.field3694; + var5 = (var38 & 7) + SecureRandomFuture.field858; + var6 = var1.method6785(); + var7 = var1.readUnsignedShort(); + if (var39 >= 0 && var5 >= 0 && var39 < 104 && var5 < 104) { + NodeDeque var34 = Client.groundItems[GrandExchangeEvent.Client_plane][var39][var5]; + if (var34 != null) { + for (TileItem var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { + if ((var6 & 32767) == var35.id && var7 == var35.quantity) { + var35.quantity = var37; + break; + } + } + + FriendSystem.updateItemPile(var39, var5); + } + } + + } else { + TileItem var32; + if (class227.field2680 == var0) { + var37 = var1.method6873(); + var38 = (var37 >> 4 & 7) + Language.field3694; + var39 = (var37 & 7) + SecureRandomFuture.field858; + var5 = var1.method6696(); + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + NodeDeque var33 = Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39]; + if (var33 != null) { + for (var32 = (TileItem)var33.last(); var32 != null; var32 = (TileItem)var33.previous()) { + if ((var5 & 32767) == var32.id) { + var32.remove(); + break; + } + } + + if (var33.last() == null) { + Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] = null; + } + + FriendSystem.updateItemPile(var38, var39); + } + } + + } else if (class227.field2678 == var0) { + var37 = var1.readUnsignedByte(); + var38 = (var37 >> 4 & 7) + Language.field3694; + var39 = (var37 & 7) + SecureRandomFuture.field858; + var5 = var1.method6873(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field467[var6]; + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var38, var39, var8, -1, var6, var7, 0, -1); + } + + } else { + if (class227.field2681 == var0) { + var37 = var1.readUnsignedShort(); + var38 = var1.method6873(); + var39 = (var38 >> 4 & 7) + Language.field3694; + var5 = (var38 & 7) + SecureRandomFuture.field858; + var6 = var1.readUnsignedByte(); + var7 = var6 >> 4 & 15; + var8 = var6 & 7; + var9 = var1.method6873(); + if (var39 >= 0 && var5 >= 0 && var39 < 104 && var5 < 104) { + var10 = var7 + 1; + if (MouseHandler.localPlayer.pathX[0] >= var39 - var10 && MouseHandler.localPlayer.pathX[0] <= var39 + var10 && MouseHandler.localPlayer.pathY[0] >= var5 - var10 && MouseHandler.localPlayer.pathY[0] <= var5 + var10 && Decimator.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var37; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var39 << 16); + ++Client.soundEffectCount; + } + } + } + + if (class227.field2674 == var0) { + var37 = var1.method6873(); + var38 = (var37 >> 4 & 7) + Language.field3694; + var39 = (var37 & 7) + SecureRandomFuture.field858; + var5 = var1.method6785(); + var6 = var1.method6785(); + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + var32 = new TileItem(); + var32.id = var5; + var32.quantity = var6; + if (Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] == null) { + Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] = new NodeDeque(); + } + + Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39].addFirst(var32); + FriendSystem.updateItemPile(var38, var39); + } + + } else if (class227.field2677 != var0) { + if (class227.field2679 == var0) { + var37 = var1.method6873(); + var38 = var37 >> 2; + var39 = var37 & 3; + var5 = Client.field467[var38]; + var6 = var1.readUnsignedByte(); + var7 = (var6 >> 4 & 7) + Language.field3694; + var8 = (var6 & 7) + SecureRandomFuture.field858; + var9 = var1.readUnsignedShort(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var7, var8, var5, var9, var38, var39, 0, -1); + } + + } + } else { + var37 = var1.method6686(); + var38 = (var37 >> 4 & 7) + Language.field3694; + var39 = (var37 & 7) + SecureRandomFuture.field858; + var5 = var1.method6697(); + var6 = var1.method6688(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field467[var7]; + if (var38 >= 0 && var39 >= 0 && var38 < 103 && var39 < 103) { + if (var9 == 0) { + BoundaryObject var31 = WorldMapIcon_1.scene.method4060(GrandExchangeEvent.Client_plane, var38, var39); + if (var31 != null) { + var11 = class78.Entity_unpackID(var31.tag); + if (var7 == 2) { + var31.renderable1 = new DynamicObject(var11, 2, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable1); + var31.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable2); + } else { + var31.renderable1 = new DynamicObject(var11, var7, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable1); + } + } + } + + if (var9 == 1) { + WallDecoration var41 = WorldMapIcon_1.scene.method3997(GrandExchangeEvent.Client_plane, var38, var39); + if (var41 != null) { + var11 = class78.Entity_unpackID(var41.tag); + if (var7 != 4 && var7 != 5) { + if (var7 == 6) { + var41.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); + } else if (var7 == 7) { + var41.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); + } else if (var7 == 8) { + var41.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); + var41.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable2); + } + } else { + var41.renderable1 = new DynamicObject(var11, 4, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); + } + } + } + + if (var9 == 2) { + GameObject var42 = WorldMapIcon_1.scene.method4043(GrandExchangeEvent.Client_plane, var38, var39); + if (var7 == 11) { + var7 = 10; + } + + if (var42 != null) { + var42.renderable = new DynamicObject(class78.Entity_unpackID(var42.tag), var7, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var42.renderable); + } + } + + if (var9 == 3) { + FloorDecoration var43 = WorldMapIcon_1.scene.getFloorDecoration(GrandExchangeEvent.Client_plane, var38, var39); + if (var43 != null) { + var43.renderable = new DynamicObject(class78.Entity_unpackID(var43.tag), 22, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var43.renderable); + } + } + } + + } + } } } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 7de6b6f4de..bcd40a9e6f 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,86 +4,110 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("bw") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -863685229 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("b") + @ObfuscatedName("l") + static byte[][][] field894; + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "[Lof;" ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("e") + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lbl;" + descriptor = "[Lay;" ) @Export("messages") Message[] messages; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1091694625 + intValue = 1725833491 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 90 - } // L: 93 + this.messages = new Message[100]; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbl;", - garbageValue = "-353859977" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lay;", + garbageValue = "-167767971" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 96 + Message var5 = this.messages[99]; - for (int var6 = this.count; var6 > 0; --var6) { // L: 97 - if (var6 != 100) { // L: 98 - this.messages[var6] = this.messages[var6 - 1]; // L: 99 + for (int var6 = this.count; var6 > 0; --var6) { + if (var6 != 100) { + this.messages[var6] = this.messages[var6 - 1]; } } - if (var5 == null) { // L: 101 + if (var5 == null) { var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 103 - var5.removeDual(); // L: 104 - var5.set(var1, var2, var4, var3); // L: 105 + var5.remove(); + var5.removeDual(); + var5.set(var1, var2, var4, var3); } - this.messages[0] = var5; // L: 107 - if (this.count < 100) { // L: 108 + this.messages[0] = var5; + if (this.count < 100) { ++this.count; } - return var5; // L: 109 + return var5; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IB)Lbl;", - garbageValue = "2" + descriptor = "(II)Lay;", + garbageValue = "-1045068186" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 113 114 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1021863211" + garbageValue = "-199377669" ) @Export("size") int size() { - return this.count; // L: 118 + return this.count; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljava/lang/String;Ljava/lang/String;B)[Lom;", + garbageValue = "-4" + ) + public static SpritePixels[] method1735(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return Actor.method1884(var0, var3, var4); + } + + @ObfuscatedName("fl") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1407101410" + ) + static final void method1734() { + if (UserComparator8.ClanChat_inClanChat) { + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.sort(); + } + + ParamComposition.method2911(); + UserComparator8.ClanChat_inClanChat = false; + } + } } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index d61000d152..125321c448 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -7,142 +7,121 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("dt") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("pd") - @ObfuscatedSignature( - descriptor = "Lls;" + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -360591133 ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("tu") - @Export("foundItemIds") - static short[] foundItemIds; + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("dz") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("s") + boolean field1431; @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -216933395 - ) - @Export("cacheGamebuild") - public static int cacheGamebuild; - @ObfuscatedName("dp") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("ex") - @ObfuscatedSignature( - descriptor = "Llb;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("ew") - @ObfuscatedGetter( - intValue = 1842635505 - ) - static int field30; - @ObfuscatedName("f") - boolean field31; - @ObfuscatedName("e") - boolean field21; + boolean field1434; @ObfuscatedName("v") @Export("members") public List members; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 1053094627222571429L + longValue = 7823946021418061389L ) - long field25; - @ObfuscatedName("o") + long field1433; + @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("m") - public byte field27; - @ObfuscatedName("r") - public byte field28; + @ObfuscatedName("w") + public byte field1430; + @ObfuscatedName("f") + public byte field1436; static { - new BitSet(65536); // L: 21 - } // L: 22 + new BitSet(65536); + } @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) public ClanChannel(Buffer var1) { - this.field21 = true; // L: 12 - this.name = null; // L: 16 - this.method39(var1); // L: 25 - } // L: 26 + this.field1434 = true; + this.name = null; + this.method2514(var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-163030259" + descriptor = "(B)[I", + garbageValue = "5" ) @Export("getSortedMembers") public int[] getSortedMembers() { - if (this.sortedMembers == null) { // L: 29 - String[] var1 = new String[this.members.size()]; // L: 30 - this.sortedMembers = new int[this.members.size()]; // L: 31 + if (this.sortedMembers == null) { + String[] var1 = new String[this.members.size()]; + this.sortedMembers = new int[this.members.size()]; - for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 32 34 - var1[var2] = ((ClanChannelMember)this.members.get(var2)).name; // L: 33 + for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7241(); } - int[] var3 = this.sortedMembers; // L: 36 - class215.method4434(var1, var3, 0, var1.length - 1); // L: 38 + class282.method5133(var1, this.sortedMembers); } - return this.sortedMembers; // L: 41 + return this.sortedMembers; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ld;I)V", - garbageValue = "1986125377" + descriptor = "(Ldf;I)V", + garbageValue = "1690415442" ) @Export("addMember") void addMember(ClanChannelMember var1) { - this.members.add(var1); // L: 45 - this.sortedMembers = null; // L: 46 - } // L: 47 + this.members.add(var1); + this.sortedMembers = null; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-117" + descriptor = "(II)V", + garbageValue = "1192263820" ) @Export("removeMember") void removeMember(int var1) { - this.members.remove(var1); // L: 50 - this.sortedMembers = null; // L: 51 - } // L: 52 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "467541909" - ) - public int method49() { - return this.members.size(); // L: 55 + this.members.remove(var1); + this.sortedMembers = null; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1685723054" + descriptor = "(I)I", + garbageValue = "-338635200" ) - public int method38(String var1) { - if (!this.field21) { // L: 59 + public int method2520() { + return this.members.size(); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-2011364190" + ) + public int method2512(String var1) { + if (!this.field1434) { throw new RuntimeException("Displaynames not available"); } else { - for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 60 - if (((ClanChannelMember)this.members.get(var2)).name.equalsIgnoreCase(var1)) { - return var2; // L: 61 + for (int var2 = 0; var2 < this.members.size(); ++var2) { + if (((ClanChannelMember)this.members.get(var2)).username.getName().equalsIgnoreCase(var1)) { + return var2; } } @@ -150,114 +129,445 @@ public class ClanChannel extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1224796238" + descriptor = "(Lnv;I)V", + garbageValue = "-1321038089" ) - void method39(Buffer var1) { + void method2514(Buffer var1) { int var2 = var1.readUnsignedByte(); - if ((var2 & 1) != 0) { // L: 68 - this.field31 = true; + if ((var2 & 1) != 0) { + this.field1431 = true; } - if ((var2 & 2) != 0) { // L: 69 - this.field21 = true; + if ((var2 & 2) != 0) { + this.field1434 = true; } - int var3 = 2; // L: 70 - if ((var2 & 4) != 0) { // L: 71 + int var3 = 2; + if ((var2 & 4) != 0) { var3 = var1.readUnsignedByte(); } - super.key = var1.readLong(); // L: 72 - this.field25 = var1.readLong(); // L: 73 - this.name = var1.readStringCp1252NullTerminated(); // L: 74 - var1.readBoolean(); // L: 75 - this.field28 = var1.readByte(); // L: 76 - this.field27 = var1.readByte(); // L: 77 - int var4 = var1.readUnsignedShort(); // L: 78 - if (var4 > 0) { // L: 79 - this.members = new ArrayList(var4); // L: 80 + super.key = var1.readLong(); + this.field1433 = var1.readLong(); + this.name = var1.readStringCp1252NullTerminated(); + var1.readBoolean(); + this.field1436 = var1.readByte(); + this.field1430 = var1.readByte(); + int var4 = var1.readUnsignedShort(); + if (var4 > 0) { + this.members = new ArrayList(var4); - for (int var5 = 0; var5 < var4; ++var5) { // L: 81 - ClanChannelMember var6 = new ClanChannelMember(); // L: 82 - if (this.field31) { // L: 83 - var1.readLong(); // L: 84 + for (int var5 = 0; var5 < var4; ++var5) { + ClanChannelMember var6 = new ClanChannelMember(); + if (this.field1431) { + var1.readLong(); } - if (this.field21) { // L: 86 - var6.name = var1.readStringCp1252NullTerminated(); + if (this.field1434) { + var6.username = new Username(var1.readStringCp1252NullTerminated()); } - var6.rank = var1.readByte(); // L: 87 - var6.world = var1.readUnsignedShort(); // L: 88 - if (var3 >= 3) { // L: 89 - var1.readBoolean(); // L: 90 + var6.rank = var1.readByte(); + var6.world = var1.readUnsignedShort(); + if (var3 >= 3) { + var1.readBoolean(); } - this.members.add(var5, var6); // L: 93 + this.members.add(var5, var6); } } - } // L: 96 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lnt;J)V" - ) - static void method56(Buffer var0, long var1) { - var1 /= 10L; // L: 63 - if (var1 < 0L) { // L: 64 - var1 = 0L; - } else if (var1 > 65535L) { // L: 65 - var1 = 65535L; - } - - var0.writeShort((int)var1); // L: 66 - } // L: 67 - - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2090430707" - ) - static boolean method54() { - return (Client.drawPlayerNames & 2) != 0; // L: 4860 } - @ObfuscatedName("hf") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1984819327" + descriptor = "(IIILfg;Lfy;Z[I[IB)I", + garbageValue = "-18" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5431 - int var3 = ItemContainer.getTileHeight(var0, var1, SoundSystem.Client_plane) - var2; // L: 5436 - var0 -= ObjectSound.cameraX; // L: 5437 - var3 -= class160.cameraY; // L: 5438 - var1 -= Canvas.cameraZ; // L: 5439 - int var4 = Rasterizer3D.Rasterizer3D_sine[class69.cameraPitch]; // L: 5440 - int var5 = Rasterizer3D.Rasterizer3D_cosine[class69.cameraPitch]; // L: 5441 - int var6 = Rasterizer3D.Rasterizer3D_sine[class32.cameraYaw]; // L: 5442 - int var7 = Rasterizer3D.Rasterizer3D_cosine[class32.cameraYaw]; // L: 5443 - int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5444 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 5445 - var0 = var8; // L: 5446 - var8 = var3 * var5 - var4 * var1 >> 16; // L: 5447 - var1 = var5 * var1 + var4 * var3 >> 16; // L: 5448 - if (var1 >= 50) { // L: 5450 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5451 - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5452 - } else { - Client.viewportTempX = -1; // L: 5455 - Client.viewportTempY = -1; // L: 5456 + public static int method2508(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { + int var9; + for (int var8 = 0; var8 < 128; ++var8) { + for (var9 = 0; var9 < 128; ++var9) { + class161.directions[var8][var9] = 0; + class161.distances[var8][var9] = 99999999; + } + } + + int var10; + int var11; + byte var13; + int var14; + int var15; + int var17; + int var19; + int var20; + int var21; + int var22; + boolean var28; + int var30; + int var31; + int var33; + if (var2 == 1) { + var28 = VarpDefinition.method2715(var0, var1, var3, var4); + } else if (var2 == 2) { + var28 = KeyHandler.method107(var0, var1, var3, var4); + } else { + var10 = var0; + var11 = var1; + byte var12 = 64; + var13 = 64; + var14 = var0 - var12; + var15 = var1 - var13; + class161.directions[var12][var13] = 99; + class161.distances[var12][var13] = 0; + byte var16 = 0; + var17 = 0; + class161.bufferX[var16] = var0; + var33 = var16 + 1; + class161.bufferY[var16] = var1; + int[][] var18 = var4.flags; + + boolean var29; + label457: + while (true) { + label455: + while (true) { + do { + do { + do { + label432: + do { + if (var33 == var17) { + SoundSystem.field219 = var10; + class161.field1896 = var11; + var29 = false; + break label457; + } + + var10 = class161.bufferX[var17]; + var11 = class161.bufferY[var17]; + var17 = var17 + 1 & 4095; + var30 = var10 - var14; + var31 = var11 - var15; + var19 = var10 - var4.xInset; + var20 = var11 - var4.yInset; + if (var3.hasArrived(var2, var10, var11, var4)) { + SoundSystem.field219 = var10; + class161.field1896 = var11; + var29 = true; + break label457; + } + + var21 = class161.distances[var30][var31] + 1; + if (var30 > 0 && class161.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + var2 - 1] & 19136824) == 0) { + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class161.bufferX[var33] = var10 - 1; + class161.bufferY[var33] = var11; + var33 = var33 + 1 & 4095; + class161.directions[var30 - 1][var31] = 2; + class161.distances[var30 - 1][var31] = var21; + break; + } + + if ((var18[var19 - 1][var20 + var22] & 19136830) != 0) { + break; + } + + ++var22; + } + } + + if (var30 < 128 - var2 && class161.directions[var30 + 1][var31] == 0 && (var18[var19 + var2][var20] & 19136899) == 0 && (var18[var19 + var2][var20 + var2 - 1] & 19136992) == 0) { + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class161.bufferX[var33] = var10 + 1; + class161.bufferY[var33] = var11; + var33 = var33 + 1 & 4095; + class161.directions[var30 + 1][var31] = 8; + class161.distances[var30 + 1][var31] = var21; + break; + } + + if ((var18[var19 + var2][var20 + var22] & 19136995) != 0) { + break; + } + + ++var22; + } + } + + if (var31 > 0 && class161.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + var2 - 1][var20 - 1] & 19136899) == 0) { + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class161.bufferX[var33] = var10; + class161.bufferY[var33] = var11 - 1; + var33 = var33 + 1 & 4095; + class161.directions[var30][var31 - 1] = 1; + class161.distances[var30][var31 - 1] = var21; + break; + } + + if ((var18[var22 + var19][var20 - 1] & 19136911) != 0) { + break; + } + + ++var22; + } + } + + if (var31 < 128 - var2 && class161.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + var2] & 19136824) == 0 && (var18[var19 + var2 - 1][var20 + var2] & 19136992) == 0) { + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class161.bufferX[var33] = var10; + class161.bufferY[var33] = var11 + 1; + var33 = var33 + 1 & 4095; + class161.directions[var30][var31 + 1] = 4; + class161.distances[var30][var31 + 1] = var21; + break; + } + + if ((var18[var19 + var22][var20 + var2] & 19137016) != 0) { + break; + } + + ++var22; + } + } + + if (var30 > 0 && var31 > 0 && class161.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0) { + var22 = 1; + + while (true) { + if (var22 >= var2) { + class161.bufferX[var33] = var10 - 1; + class161.bufferY[var33] = var11 - 1; + var33 = var33 + 1 & 4095; + class161.directions[var30 - 1][var31 - 1] = 3; + class161.distances[var30 - 1][var31 - 1] = var21; + break; + } + + if ((var18[var19 - 1][var22 + (var20 - 1)] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 - 1] & 19136911) != 0) { + break; + } + + ++var22; + } + } + + if (var30 < 128 - var2 && var31 > 0 && class161.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + var2][var20 - 1] & 19136899) == 0) { + var22 = 1; + + while (true) { + if (var22 >= var2) { + class161.bufferX[var33] = var10 + 1; + class161.bufferY[var33] = var11 - 1; + var33 = var33 + 1 & 4095; + class161.directions[var30 + 1][var31 - 1] = 9; + class161.distances[var30 + 1][var31 - 1] = var21; + break; + } + + if ((var18[var19 + var2][var22 + (var20 - 1)] & 19136995) != 0 || (var18[var19 + var22][var20 - 1] & 19136911) != 0) { + break; + } + + ++var22; + } + } + + if (var30 > 0 && var31 < 128 - var2 && class161.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + var2] & 19136824) == 0) { + for (var22 = 1; var22 < var2; ++var22) { + if ((var18[var19 - 1][var22 + var20] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 + var2] & 19137016) != 0) { + continue label432; + } + } + + class161.bufferX[var33] = var10 - 1; + class161.bufferY[var33] = var11 + 1; + var33 = var33 + 1 & 4095; + class161.directions[var30 - 1][var31 + 1] = 6; + class161.distances[var30 - 1][var31 + 1] = var21; + } + } while(var30 >= 128 - var2); + } while(var31 >= 128 - var2); + } while(class161.directions[var30 + 1][var31 + 1] != 0); + } while((var18[var19 + var2][var20 + var2] & 19136992) != 0); + + for (var22 = 1; var22 < var2; ++var22) { + if ((var18[var22 + var19][var20 + var2] & 19137016) != 0 || (var18[var19 + var2][var20 + var22] & 19136995) != 0) { + continue label455; + } + } + + class161.bufferX[var33] = var10 + 1; + class161.bufferY[var33] = var11 + 1; + var33 = var33 + 1 & 4095; + class161.directions[var30 + 1][var31 + 1] = 12; + class161.distances[var30 + 1][var31 + 1] = var21; + } } - } else { - Client.viewportTempX = -1; // L: 5432 - Client.viewportTempY = -1; // L: 5433 + var28 = var29; } - } // L: 5434 5458 + + var9 = var0 - 64; + var10 = var1 - 64; + var11 = SoundSystem.field219; + var30 = class161.field1896; + if (!var28) { + var31 = Integer.MAX_VALUE; + var14 = Integer.MAX_VALUE; + byte var32 = 10; + var33 = var3.approxDestinationX; + var17 = var3.approxDestinationY; + int var27 = var3.approxDestinationSizeX; + var19 = var3.approxDestinationSizeY; + + for (var20 = var33 - var32; var20 <= var32 + var33; ++var20) { + for (var21 = var17 - var32; var21 <= var17 + var32; ++var21) { + var22 = var20 - var9; + int var23 = var21 - var10; + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class161.distances[var22][var23] < 100) { + int var24 = 0; + if (var20 < var33) { + var24 = var33 - var20; + } else if (var20 > var27 + var33 - 1) { + var24 = var20 - (var27 + var33 - 1); + } + + int var25 = 0; + if (var21 < var17) { + var25 = var17 - var21; + } else if (var21 > var17 + var19 - 1) { + var25 = var21 - (var19 + var17 - 1); + } + + int var26 = var25 * var25 + var24 * var24; + if (var26 < var31 || var26 == var31 && class161.distances[var22][var23] < var14) { + var31 = var26; + var14 = class161.distances[var22][var23]; + var11 = var20; + var30 = var21; + } + } + } + } + + if (var31 == Integer.MAX_VALUE) { + return -1; + } + } + + if (var0 == var11 && var30 == var1) { + return 0; + } else { + var13 = 0; + class161.bufferX[var13] = var11; + var31 = var13 + 1; + class161.bufferY[var13] = var30; + + for (var14 = var15 = class161.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class161.directions[var11 - var9][var30 - var10]) { + if (var14 != var15) { + var15 = var14; + class161.bufferX[var31] = var11; + class161.bufferY[var31++] = var30; + } + + if ((var14 & 2) != 0) { + ++var11; + } else if ((var14 & 8) != 0) { + --var11; + } + + if ((var14 & 1) != 0) { + ++var30; + } else if ((var14 & 4) != 0) { + --var30; + } + } + + var33 = 0; + + while (var31-- > 0) { + var6[var33] = class161.bufferX[var31]; + var7[var33++] = class161.bufferY[var31]; + if (var33 >= var6.length) { + break; + } + } + + return var33; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Lem;", + garbageValue = "1601574584" + ) + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-20" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { + int var3 = var2.x >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.field1023 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + } + + long var5 = class171.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, var2.x, var2.y, class122.getTileHeight(var2.field1023 * 64 - 64 + var2.x, var2.field1023 * 64 - 64 + var2.y, GrandExchangeEvent.Client_plane), var2.field1023 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + } + } + } + + } } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index bddfc3c908..c6cf0c3789 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -3,111 +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("d") +@ObfuscatedName("df") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 894086561 + @ObfuscatedName("n") + @Export("SpriteBuffer_spriteWidths") + static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Ljs;" ) - static int field68; - @ObfuscatedName("f") + @Export("archive10") + static Archive archive10; + @ObfuscatedName("lq") + @ObfuscatedSignature( + descriptor = "Lbk;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("s") @Export("rank") public byte rank; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 532460543 + intValue = 1633534337 ) @Export("world") public int world; @ObfuscatedName("v") - @Export("name") - public String name; + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("username") + public Username username; ClanChannelMember() { - } // L: 8 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "109" - ) - public static boolean method108(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field264[var0] : false; // L: 234 235 } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "-82" - ) - static int method106(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1115 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1116 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1117 - return 1; // L: 1118 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1120 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1121 - return 1; // L: 1122 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1124 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.text; // L: 1125 - return 1; // L: 1126 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1128 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1129 - return 1; // L: 1130 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1132 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1133 - return 1; // L: 1134 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1136 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1137 - return 1; // L: 1138 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1140 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1141 - return 1; // L: 1142 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1144 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1145 - return 1; // L: 1146 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1148 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1149 - return 1; // L: 1150 - } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1152 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1153 - return 1; // L: 1154 - } else if (var0 == 1610) { // L: 1156 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1157 - return 1; // L: 1158 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1160 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color; // L: 1161 - return 1; // L: 1162 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1164 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color2; // L: 1165 - return 1; // L: 1166 - } else if (var0 == 1613) { // L: 1168 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1169 - return 1; // L: 1170 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1172 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1173 - return 1; // L: 1174 - } else if (var0 != 1615 && var0 != 1616) { // L: 1176 - return 2; // L: 1180 - } else { - ++ChatChannel.Interpreter_intStackSize; // L: 1177 - return 1; // L: 1178 - } - } - - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1449635210" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = InterfaceParent.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); // L: 8811 - var2.packetBuffer.method6648(var1); // L: 8812 - var2.packetBuffer.writeIntME(var0); // L: 8813 - Client.packetWriter.addNode(var2); // L: 8814 - } // L: 8815 } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index db666dc3d3..2801ae9330 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,92 +3,98 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("lg") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("f") + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Ljs;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lli;" ) @Export("friend") TriBool friend; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("ignored") TriBool ignored; ClanMate() { - this.friend = TriBool.TriBool_unknown; // L: 6 - this.ignored = TriBool.TriBool_unknown; // L: 7 - } // L: 9 + this.friend = TriBool.TriBool_unknown; + this.ignored = TriBool.TriBool_unknown; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1463717617" + descriptor = "(B)V", + garbageValue = "1" ) @Export("clearIsFriend") void clearIsFriend() { - this.friend = TriBool.TriBool_unknown; // L: 12 - } // L: 13 + this.friend = TriBool.TriBool_unknown; + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "459582232" + garbageValue = "939326138" ) @Export("isFriend") public final boolean isFriend() { - if (this.friend == TriBool.TriBool_unknown) { // L: 16 - this.fillIsFriend(); // L: 17 + if (this.friend == TriBool.TriBool_unknown) { + this.fillIsFriend(); } - return this.friend == TriBool.TriBool_true; // L: 19 + return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1131395032" - ) - @Export("fillIsFriend") - void fillIsFriend() { - this.friend = DevicePcmPlayerProvider.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 - } // L: 24 - @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "530293268" + garbageValue = "-642390933" + ) + @Export("fillIsFriend") + void fillIsFriend() { + this.friend = Canvas.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1054730400" ) @Export("clearIsIgnored") void clearIsIgnored() { - this.ignored = TriBool.TriBool_unknown; // L: 27 - } // L: 28 + this.ignored = TriBool.TriBool_unknown; + } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-105977481" + garbageValue = "-270498617" ) @Export("isIgnored") public final boolean isIgnored() { - if (this.ignored == TriBool.TriBool_unknown) { // L: 31 - this.fillIsIgnored(); // L: 32 + if (this.ignored == TriBool.TriBool_unknown) { + this.fillIsIgnored(); } - return this.ignored == TriBool.TriBool_true; // L: 34 + return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1794197265" + garbageValue = "-1583864531" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = DevicePcmPlayerProvider.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 - } // L: 39 + this.ignored = Canvas.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java index 657a885242..d2f78eb710 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -1,468 +1,462 @@ -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("b") +@ObfuscatedName("dj") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("se") - @ObfuscatedSignature( - descriptor = "Lms;" + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = 1726067789 ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("es") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("e") + static int field1386; + @ObfuscatedName("t") @Export("useHashes") boolean useHashes; @ObfuscatedName("v") @Export("useNames") boolean useNames; - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = -4969034956878830265L - ) - long field82; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 491316409 + longValue = -4923692610489394701L ) - int field83; - @ObfuscatedName("o") + long field1370; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 443357617 + ) + int field1363; + @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1000479447 + intValue = -938288663 ) - int field85; - @ObfuscatedName("r") + int field1364; + @ObfuscatedName("f") @Export("allowGuests") public boolean allowGuests; + @ObfuscatedName("o") + public byte field1359; + @ObfuscatedName("x") + public byte field1368; + @ObfuscatedName("r") + public byte field1369; + @ObfuscatedName("p") + public byte field1383; @ObfuscatedName("h") - public byte field87; - @ObfuscatedName("d") - public byte field88; - @ObfuscatedName("z") - public byte field93; - @ObfuscatedName("b") - public byte field90; - @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2137509015 + intValue = 587263891 ) @Export("memberCount") public int memberCount; @ObfuscatedName("k") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("x") - int[] field95; @ObfuscatedName("u") - public int[] field96; - @ObfuscatedName("q") - public boolean[] field97; - @ObfuscatedName("s") + int[] field1375; + @ObfuscatedName("e") + public int[] field1376; + @ObfuscatedName("c") + public boolean[] field1377; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 159638309 + intValue = -415560973 ) @Export("currentOwner") public int currentOwner; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1730061339 + intValue = -1782839677 ) - public int field99; - @ObfuscatedName("c") + public int field1379; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1156384829 + intValue = -147156049 ) @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) public ClanSettings(Buffer var1) { - this.field83 = 0; // L: 14 - this.name = null; // L: 15 - this.field85 = 0; // L: 16 - this.currentOwner = -1; // L: 29 - this.field99 = -1; // L: 30 - this.method139(var1); // L: 43 - } // L: 44 + this.field1363 = 0; + this.name = null; + this.field1364 = 0; + this.currentOwner = -1; + this.field1379 = -1; + this.method2373(var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "85" + garbageValue = "-59" ) - void method121(int var1) { - if (this.useHashes) { // L: 47 - if (this.memberHashes != null) { // L: 48 + void method2356(int var1) { + if (this.useHashes) { + if (this.memberHashes != null) { System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); } else { - this.memberHashes = new long[var1]; // L: 49 + this.memberHashes = new long[var1]; } } - if (this.useNames) { // L: 51 - if (this.memberNames != null) { // L: 52 + if (this.useNames) { + if (this.memberNames != null) { System.arraycopy(this.memberNames, 0, this.memberNames = new String[var1], 0, this.memberCount); } else { - this.memberNames = new String[var1]; // L: 53 + this.memberNames = new String[var1]; } } if (this.memberRanks != null) { - System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); // L: 55 + System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); } else { - this.memberRanks = new byte[var1]; // L: 56 + this.memberRanks = new byte[var1]; } - if (this.field95 != null) { - System.arraycopy(this.field95, 0, this.field95 = new int[var1], 0, this.memberCount); + if (this.field1375 != null) { + System.arraycopy(this.field1375, 0, this.field1375 = new int[var1], 0, this.memberCount); } else { - this.field95 = new int[var1]; // L: 58 + this.field1375 = new int[var1]; } - if (this.field96 != null) { // L: 59 - System.arraycopy(this.field96, 0, this.field96 = new int[var1], 0, this.memberCount); + if (this.field1376 != null) { + System.arraycopy(this.field1376, 0, this.field1376 = new int[var1], 0, this.memberCount); } else { - this.field96 = new int[var1]; // L: 60 + this.field1376 = new int[var1]; } - if (this.field97 != null) { // L: 61 - System.arraycopy(this.field97, 0, this.field97 = new boolean[var1], 0, this.memberCount); + if (this.field1377 != null) { + System.arraycopy(this.field1377, 0, this.field1377 = new boolean[var1], 0, this.memberCount); } else { - this.field97 = new boolean[var1]; // L: 62 + this.field1377 = new boolean[var1]; } - } // L: 63 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-33" + descriptor = "(II)V", + garbageValue = "1601035845" ) - void method122(int var1) { - if (this.useHashes) { // L: 66 - if (this.bannedMemberHashes != null) { // L: 67 + void method2357(int var1) { + if (this.useHashes) { + if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); } else { - this.bannedMemberHashes = new long[var1]; // L: 68 + this.bannedMemberHashes = new long[var1]; } } - if (this.useNames) { // L: 70 - if (this.bannedMemberNames != null) { // L: 71 + if (this.useNames) { + if (this.bannedMemberNames != null) { System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); } else { - this.bannedMemberNames = new String[var1]; // L: 72 + this.bannedMemberNames = new String[var1]; } } - } // L: 74 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1805753468" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "90" ) - public int method196(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 + public int method2358(String var1) { + if (var1 != null && var1.length() != 0) { + for (int var2 = 0; var2 < this.memberCount; ++var2) { + if (this.memberNames[var2].equals(var1)) { return var2; } } - return -1; // L: 81 + return -1; } else { return -1; } } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "942586664" - ) - public int method170(int var1, int var2, int var3) { - int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 - return (this.field95[var1] & var4) >>> var2; // L: 86 - } - @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "-67" + ) + public int method2376(int var1, int var2, int var3) { + int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; + return (this.field1375[var1] & var4) >>> var2; + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "1522777048" + garbageValue = "466934307" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { - if (this.parameters == null) { // L: 90 + if (this.parameters == null) { return null; } else { - Node var2 = this.parameters.get((long)var1); // L: 91 - return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93 + Node var2 = this.parameters.get((long)var1); + return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1963274445" + ) + @Export("getSortedMembers") + public int[] getSortedMembers() { + if (this.sortedMembers == null) { + String[] var1 = new String[this.memberCount]; + this.sortedMembers = new int[this.memberCount]; + + for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { + var1[var2] = this.memberNames[var2]; + if (var1[var2] != null) { + var1[var2] = var1[var2].toLowerCase(); + } + } + + class282.method5133(var1, this.sortedMembers); + } + + return this.sortedMembers; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;II)V", + garbageValue = "615141967" + ) + void method2362(long var1, String var3, int var4) { + if (var3 != null && var3.length() == 0) { + var3 = null; + } + + if (var1 > 0L != this.useHashes) { + throw new RuntimeException(""); + } else if (var3 != null != this.useNames) { + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { + this.method2356(this.memberCount + 5); + } + + if (this.memberHashes != null) { + this.memberHashes[this.memberCount] = var1; + } + + if (this.memberNames != null) { + this.memberNames[this.memberCount] = var3; + } + + if (this.currentOwner == -1) { + this.currentOwner = this.memberCount; + this.memberRanks[this.memberCount] = 126; + } else { + this.memberRanks[this.memberCount] = 0; + } + + this.field1375[this.memberCount] = 0; + this.field1376[this.memberCount] = var4; + this.field1377[this.memberCount] = false; + ++this.memberCount; + this.sortedMembers = null; + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "255" + ) + void method2363(int var1) { + if (var1 >= 0 && var1 < this.memberCount) { + --this.memberCount; + this.sortedMembers = null; + if (this.memberCount == 0) { + this.memberHashes = null; + this.memberNames = null; + this.memberRanks = null; + this.field1375 = null; + this.field1376 = null; + this.field1377 = null; + this.currentOwner = -1; + this.field1379 = -1; + } else { + System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); + System.arraycopy(this.field1375, var1 + 1, this.field1375, var1, this.memberCount - var1); + System.arraycopy(this.field1376, var1 + 1, this.field1376, var1, this.memberCount - var1); + System.arraycopy(this.field1377, var1 + 1, this.field1377, var1, this.memberCount - var1); + if (this.memberHashes != null) { + System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); + } + + if (this.memberNames != null) { + System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); + } + + this.updateOwner(); + } + + } else { + throw new RuntimeException(""); } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "284711129" - ) - @Export("getSortedMembers") - public int[] getSortedMembers() { - if (this.sortedMembers == null) { // L: 97 - String[] var1 = new String[this.memberCount]; // L: 98 - this.sortedMembers = new int[this.memberCount]; // L: 99 - - for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { // L: 100 103 - var1[var2] = this.memberNames[var2]; // L: 101 - if (var1[var2] != null) { // L: 102 - var1[var2] = var1[var2].toLowerCase(); - } - } - - int[] var3 = this.sortedMembers; // L: 105 - class215.method4434(var1, var3, 0, var1.length - 1); // L: 107 - } - - return this.sortedMembers; // L: 110 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;II)V", - garbageValue = "-1360534257" - ) - void method126(long var1, String var3, int var4) { - if (var3 != null && var3.length() == 0) { // L: 114 - var3 = null; - } - - if (var1 > 0L != this.useHashes) { // L: 115 - throw new RuntimeException(""); - } else if (this.useNames != (var3 != null)) { // 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.method121(this.memberCount + 5); - } - - if (this.memberHashes != null) { // L: 118 - this.memberHashes[this.memberCount] = var1; - } - - if (this.memberNames != null) { // L: 119 - this.memberNames[this.memberCount] = var3; - } - - if (this.currentOwner == -1) { // L: 120 - this.currentOwner = this.memberCount; // L: 121 - this.memberRanks[this.memberCount] = 126; // L: 122 - } else { - this.memberRanks[this.memberCount] = 0; // L: 125 - } - - this.field95[this.memberCount] = 0; // L: 127 - this.field96[this.memberCount] = var4; // L: 128 - this.field97[this.memberCount] = false; // L: 129 - ++this.memberCount; // L: 130 - this.sortedMembers = null; // L: 131 - } - } // L: 132 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1830221034" - ) - void method127(int var1) { - if (var1 >= 0 && var1 < this.memberCount) { // L: 135 - --this.memberCount; // L: 136 - this.sortedMembers = null; // L: 137 - if (this.memberCount == 0) { // L: 138 - this.memberHashes = null; // L: 139 - this.memberNames = null; // L: 140 - this.memberRanks = null; // L: 141 - this.field95 = null; // L: 142 - this.field96 = null; // L: 143 - this.field97 = null; // L: 144 - this.currentOwner = -1; // L: 145 - this.field99 = -1; // L: 146 - } else { - System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 149 - System.arraycopy(this.field95, var1 + 1, this.field95, var1, this.memberCount - var1); // L: 150 - System.arraycopy(this.field96, var1 + 1, this.field96, var1, this.memberCount - var1); // L: 151 - System.arraycopy(this.field97, var1 + 1, this.field97, var1, this.memberCount - var1); // L: 152 - if (this.memberHashes != null) { // L: 153 - System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); - } - - if (this.memberNames != null) { // L: 154 - System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); - } - - this.updateOwner(); // L: 155 - } - - } else { - throw new RuntimeException(""); - } - } // L: 157 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1260147822" + descriptor = "(B)V", + garbageValue = "-98" ) @Export("updateOwner") void updateOwner() { - if (this.memberCount == 0) { // L: 160 - this.currentOwner = -1; // L: 161 - this.field99 = -1; // L: 162 + if (this.memberCount == 0) { + this.currentOwner = -1; + this.field1379 = -1; } else { - this.currentOwner = -1; // L: 165 - this.field99 = -1; // L: 166 - int var1 = 0; // L: 167 - byte var2 = this.memberRanks[0]; // L: 168 + this.currentOwner = -1; + this.field1379 = -1; + int var1 = 0; + byte var2 = this.memberRanks[0]; - for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 169 - if (this.memberRanks[var3] > var2) { // L: 170 - if (var2 == 125) { // L: 171 - this.field99 = var1; + for (int var3 = 1; var3 < this.memberCount; ++var3) { + if (this.memberRanks[var3] > var2) { + if (var2 == 125) { + this.field1379 = var1; } - var1 = var3; // L: 172 - var2 = this.memberRanks[var3]; // L: 173 - } else if (this.field99 == -1 && this.memberRanks[var3] == 125) { // L: 175 - this.field99 = var3; // L: 176 + var1 = var3; + var2 = this.memberRanks[var3]; + } else if (this.field1379 == -1 && this.memberRanks[var3] == 125) { + this.field1379 = var3; } } - this.currentOwner = var1; // L: 179 - if (this.currentOwner != -1) { // L: 180 + this.currentOwner = var1; + if (this.currentOwner != -1) { this.memberRanks[this.currentOwner] = 126; } } - } // L: 163 181 + } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;I)V", - garbageValue = "1778861345" + garbageValue = "332285009" ) - void method129(long var1, String var3) { - if (var3 != null && var3.length() == 0) { // L: 184 + void method2365(long var1, String var3) { + if (var3 != null && var3.length() == 0) { var3 = null; } - if (var1 > 0L != this.useHashes) { // L: 185 + if (var1 > 0L != this.useHashes) { throw new RuntimeException(""); - } else if (this.useNames != (var3 != null)) { // L: 186 + } else if (var3 != null != this.useNames) { throw new RuntimeException(""); } else { - if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 187 - this.method122(this.bannedMemberCount + 5); + if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { + this.method2357(this.bannedMemberCount + 5); } - if (this.bannedMemberHashes != null) { // L: 188 + if (this.bannedMemberHashes != null) { this.bannedMemberHashes[this.bannedMemberCount] = var1; } - if (this.bannedMemberNames != null) { // L: 189 + if (this.bannedMemberNames != null) { this.bannedMemberNames[this.bannedMemberCount] = var3; } ++this.bannedMemberCount; } - } // L: 191 + } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1142795172" + garbageValue = "-1206007448" ) - void method124(int var1) { + void method2366(int var1) { --this.bannedMemberCount; - if (this.bannedMemberCount == 0) { // L: 195 - this.bannedMemberHashes = null; // L: 196 - this.bannedMemberNames = null; // L: 197 + if (this.bannedMemberCount == 0) { + this.bannedMemberHashes = null; + this.bannedMemberNames = null; } else { - if (this.bannedMemberHashes != null) { // L: 200 + if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1); } if (this.bannedMemberNames != null) { - System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 201 + System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); } } - } // L: 203 + } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IBI)I", - garbageValue = "-604206368" + descriptor = "(IBB)I", + garbageValue = "-54" ) - int method131(int var1, byte var2) { - if (var2 != 126 && var2 != 127) { // L: 206 - if (this.currentOwner == var1 && (this.field99 == -1 || this.memberRanks[this.field99] < 125)) { // L: 207 + int method2367(int var1, byte var2) { + if (var2 != 126 && var2 != 127) { + if (this.currentOwner == var1 && (this.field1379 == -1 || this.memberRanks[this.field1379] < 125)) { return -1; - } else if (this.memberRanks[var1] == var2) { // L: 208 + } else if (this.memberRanks[var1] == var2) { return -1; } else { - this.memberRanks[var1] = var2; // L: 209 - this.updateOwner(); // L: 210 - return var1; // L: 211 + this.memberRanks[var1] = var2; + this.updateOwner(); + return var1; } } else { return -1; } } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-113" + descriptor = "(II)Z", + garbageValue = "-1906521542" ) - boolean method132(int var1) { - if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 215 - this.memberRanks[this.currentOwner] = 125; // L: 216 - this.field99 = this.currentOwner; // L: 217 - this.memberRanks[var1] = 126; // L: 218 - this.currentOwner = var1; // L: 219 - return true; // L: 220 + boolean method2368(int var1) { + if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { + this.memberRanks[this.currentOwner] = 125; + this.field1379 = this.currentOwner; + this.memberRanks[var1] = 126; + this.currentOwner = var1; + return true; } else { return false; } @@ -471,304 +465,304 @@ public class ClanSettings { @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "49052820" + garbageValue = "-1332808385" ) - int method133(int var1, boolean var2) { - if (this.field97[var1] == var2) { // L: 224 + int method2369(int var1, boolean var2) { + if (this.field1377[var1] == var2) { return -1; } else { - this.field97[var1] = var2; // L: 225 - return var1; // L: 226 + this.field1377[var1] = var2; + return var1; } } - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-61" + descriptor = "(IIIII)I", + garbageValue = "1046292707" ) - int method128(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.field95[var1]; // L: 235 + int method2370(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; + int var7 = var6 ^ var5; + var2 <<= var3; + var2 &= var7; + int var8 = this.field1375[var1]; if ((var8 & var7) == var2) { - return -1; // L: 236 + return -1; } else { - var8 &= ~var7; // L: 237 - this.field95[var1] = var8 | var2; // L: 238 - return var1; // L: 239 + var8 &= ~var7; + this.field1375[var1] = var8 | var2; + return var1; } } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "65280" - ) - boolean method188(int var1, int var2) { - if (this.parameters != null) { // L: 243 - Node var3 = this.parameters.get((long)var1); // L: 244 - if (var3 != null) { // L: 245 - if (var3 instanceof IntegerNode) { // L: 246 - IntegerNode var4 = (IntegerNode)var3; // L: 247 - if (var2 == var4.integer) { // L: 248 - return false; - } - - var4.integer = var2; // L: 249 - return true; // L: 250 - } - - var3.remove(); // L: 252 - } - } else { - this.parameters = new IterableNodeHashTable(4); // L: 255 - } - - this.parameters.put(new IntegerNode(var2), (long)var1); // L: 256 - return true; // L: 257 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIIB)Z", - garbageValue = "-43" - ) - boolean method136(int var1, int var2, int var3, int var4) { - int var5 = (1 << var3) - 1; // L: 261 - int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262 - int var7 = var6 ^ var5; // L: 263 - var2 <<= var3; // L: 264 - var2 &= var7; // L: 265 - if (this.parameters != null) { // L: 266 - Node var8 = this.parameters.get((long)var1); // L: 267 - if (var8 != null) { // L: 268 - if (var8 instanceof IntegerNode) { // L: 269 - IntegerNode var9 = (IntegerNode)var8; // L: 270 - if ((var9.integer & var7) == var2) { // L: 271 - return false; - } - - var9.integer &= ~var7; // L: 272 - var9.integer |= var2; // L: 273 - return true; // L: 274 - } - - var8.remove(); // L: 276 - } - } else { - this.parameters = new IterableNodeHashTable(4); // L: 279 - } - - this.parameters.put(new IntegerNode(var2), (long)var1); // L: 280 - return true; // L: 281 - } - - @ObfuscatedName("u") - boolean method137(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 class350) { // L: 288 - class350 var5 = (class350)var4; // L: 289 - if (var5.field3932 == var2) { // L: 290 - return false; - } - - var5.field3932 = var2; // L: 291 - return true; // L: 292 - } - - var4.remove(); // L: 294 - } - } else { - this.parameters = new IterableNodeHashTable(4); // L: 297 - } - - this.parameters.put(new class350(var2), (long)var1); // L: 298 - return true; // L: 299 - } - @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "1757759616" + descriptor = "(IIB)Z", + garbageValue = "-123" ) - boolean method138(int var1, String var2) { - if (var2 == null) { // L: 303 + boolean method2371(int var1, int var2) { + if (this.parameters != null) { + Node var3 = this.parameters.get((long)var1); + if (var3 != null) { + if (var3 instanceof IntegerNode) { + IntegerNode var4 = (IntegerNode)var3; + if (var2 == var4.integer) { + return false; + } + + var4.integer = var2; + return true; + } + + var3.remove(); + } + } else { + this.parameters = new IterableNodeHashTable(4); + } + + this.parameters.put(new IntegerNode(var2), (long)var1); + return true; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIIB)Z", + garbageValue = "-68" + ) + boolean method2372(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; + int var7 = var6 ^ var5; + var2 <<= var3; + var2 &= var7; + if (this.parameters != null) { + Node var8 = this.parameters.get((long)var1); + if (var8 != null) { + if (var8 instanceof IntegerNode) { + IntegerNode var9 = (IntegerNode)var8; + if ((var9.integer & var7) == var2) { + return false; + } + + var9.integer &= ~var7; + var9.integer |= var2; + return true; + } + + var8.remove(); + } + } else { + this.parameters = new IterableNodeHashTable(4); + } + + this.parameters.put(new IntegerNode(var2), (long)var1); + return true; + } + + @ObfuscatedName("e") + boolean method2400(int var1, long var2) { + if (this.parameters != null) { + Node var4 = this.parameters.get((long)var1); + if (var4 != null) { + if (var4 instanceof class351) { + class351 var5 = (class351)var4; + if (var2 == var5.field3962) { + return false; + } + + var5.field3962 = var2; + return true; + } + + var4.remove(); + } + } else { + this.parameters = new IterableNodeHashTable(4); + } + + this.parameters.put(new class351(var2), (long)var1); + return true; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Z", + garbageValue = "225314993" + ) + boolean method2377(int var1, String var2) { + if (var2 == null) { var2 = ""; - } else if (var2.length() > 80) { // L: 304 + } else if (var2.length() > 80) { var2 = var2.substring(0, 80); } - if (this.parameters != null) { // L: 305 - Node var3 = this.parameters.get((long)var1); // L: 306 - if (var3 != null) { // L: 307 - if (var3 instanceof ObjectNode) { // L: 308 - ObjectNode var4 = (ObjectNode)var3; // L: 309 - if (var4.obj instanceof String) { // L: 310 - if (var2.equals(var4.obj)) { // L: 311 + if (this.parameters != null) { + Node var3 = this.parameters.get((long)var1); + if (var3 != null) { + if (var3 instanceof ObjectNode) { + ObjectNode var4 = (ObjectNode)var3; + if (var4.obj instanceof String) { + if (var2.equals(var4.obj)) { return false; } - var4.remove(); // L: 312 - this.parameters.put(new ObjectNode(var2), var4.key); // L: 313 - return true; // L: 314 + var4.remove(); + this.parameters.put(new ObjectNode(var2), var4.key); + return true; } } - var3.remove(); // L: 317 + var3.remove(); } } else { - this.parameters = new IterableNodeHashTable(4); // L: 320 + this.parameters = new IterableNodeHashTable(4); } - this.parameters.put(new ObjectNode(var2), (long)var1); // L: 321 - return true; // L: 322 + this.parameters.put(new ObjectNode(var2), (long)var1); + return true; } - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-750951939" + descriptor = "(Lnv;I)V", + garbageValue = "-1016465187" ) - void method139(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 326 - if (var2 >= 1 && var2 <= 6) { // L: 327 - int var3 = var1.readUnsignedByte(); // L: 328 - if ((var3 & 1) != 0) { // L: 329 + void method2373(Buffer var1) { + int var2 = var1.readUnsignedByte(); + if (var2 >= 1 && var2 <= 6) { + int var3 = var1.readUnsignedByte(); + if ((var3 & 1) != 0) { this.useHashes = true; } - if ((var3 & 2) != 0) { // L: 330 + if ((var3 & 2) != 0) { this.useNames = true; } - if (!this.useHashes) { // L: 331 - this.memberHashes = null; // L: 332 - this.bannedMemberHashes = null; // L: 333 + if (!this.useHashes) { + this.memberHashes = null; + this.bannedMemberHashes = null; } - if (!this.useNames) { // L: 335 - this.memberNames = null; // L: 336 - this.bannedMemberNames = null; // L: 337 + if (!this.useNames) { + this.memberNames = null; + this.bannedMemberNames = null; } - this.field83 = var1.readInt(); // L: 339 - this.field85 = var1.readInt(); // L: 340 - if (var2 <= 3 && this.field85 != 0) { // L: 341 - this.field85 += 16912800; + this.field1363 = var1.readInt(); + this.field1364 = var1.readInt(); + if (var2 <= 3 && this.field1364 != 0) { + this.field1364 += 16912800; } - this.memberCount = var1.readUnsignedShort(); // L: 342 - this.bannedMemberCount = var1.readUnsignedByte(); // L: 343 - this.name = var1.readStringCp1252NullTerminated(); // L: 344 - if (var2 >= 4) { // L: 345 - var1.readInt(); // L: 346 + this.memberCount = var1.readUnsignedShort(); + this.bannedMemberCount = var1.readUnsignedByte(); + this.name = var1.readStringCp1252NullTerminated(); + if (var2 >= 4) { + var1.readInt(); } - this.allowGuests = var1.readUnsignedByte() == 1; // L: 348 - this.field87 = var1.readByte(); // L: 349 - this.field88 = var1.readByte(); // L: 350 - this.field93 = var1.readByte(); // L: 351 - this.field90 = var1.readByte(); // L: 352 + this.allowGuests = var1.readUnsignedByte() == 1; + this.field1359 = var1.readByte(); + this.field1368 = var1.readByte(); + this.field1369 = var1.readByte(); + this.field1383 = var1.readByte(); int var4; - if (this.memberCount > 0) { // L: 353 - if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 354 + if (this.memberCount > 0) { + if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { this.memberHashes = new long[this.memberCount]; } - if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 355 + if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { this.memberNames = new String[this.memberCount]; } - if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 356 + if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { this.memberRanks = new byte[this.memberCount]; } - if (this.field95 == null || this.field95.length < this.memberCount) { // L: 357 - this.field95 = new int[this.memberCount]; + if (this.field1375 == null || this.field1375.length < this.memberCount) { + this.field1375 = new int[this.memberCount]; } - if (this.field96 == null || this.field96.length < this.memberCount) { // L: 358 - this.field96 = new int[this.memberCount]; + if (this.field1376 == null || this.field1376.length < this.memberCount) { + this.field1376 = new int[this.memberCount]; } - if (this.field97 == null || this.field97.length < this.memberCount) { // L: 359 - this.field97 = new boolean[this.memberCount]; + if (this.field1377 == null || this.field1377.length < this.memberCount) { + this.field1377 = new boolean[this.memberCount]; } - for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 360 - if (this.useHashes) { // L: 361 + for (var4 = 0; var4 < this.memberCount; ++var4) { + if (this.useHashes) { this.memberHashes[var4] = var1.readLong(); } - if (this.useNames) { // L: 362 + if (this.useNames) { this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } - this.memberRanks[var4] = var1.readByte(); // L: 363 - if (var2 >= 2) { // L: 364 - this.field95[var4] = var1.readInt(); + this.memberRanks[var4] = var1.readByte(); + if (var2 >= 2) { + this.field1375[var4] = var1.readInt(); } - if (var2 >= 5) { // L: 365 - this.field96[var4] = var1.readUnsignedShort(); + if (var2 >= 5) { + this.field1376[var4] = var1.readUnsignedShort(); } else { - this.field96[var4] = 0; // L: 366 + this.field1376[var4] = 0; } - if (var2 >= 6) { // L: 367 - this.field97[var4] = var1.readUnsignedByte() == 1; + if (var2 >= 6) { + this.field1377[var4] = var1.readUnsignedByte() == 1; } else { - this.field97[var4] = false; // L: 368 + this.field1377[var4] = false; } } - this.updateOwner(); // L: 370 + this.updateOwner(); } - if (this.bannedMemberCount > 0) { // L: 372 - if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 373 + if (this.bannedMemberCount > 0) { + if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { this.bannedMemberHashes = new long[this.bannedMemberCount]; } - if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 374 + if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { this.bannedMemberNames = new String[this.bannedMemberCount]; } - for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 375 - if (this.useHashes) { // L: 376 + for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { + if (this.useHashes) { this.bannedMemberHashes[var4] = var1.readLong(); } - if (this.useNames) { // L: 377 + if (this.useNames) { this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } } } - if (var2 >= 3) { // L: 380 - var4 = var1.readUnsignedShort(); // L: 381 - if (var4 > 0) { // L: 382 - this.parameters = new IterableNodeHashTable(var4 < 16 ? UrlRequester.method2504(var4) : 16); // L: 383 + if (var2 >= 3) { + var4 = var1.readUnsignedShort(); + if (var4 > 0) { + this.parameters = new IterableNodeHashTable(var4 < 16 ? SoundSystem.method530(var4) : 16); - while (var4-- > 0) { // L: 384 - int var5 = var1.readInt(); // L: 385 - int var6 = var5 & 1073741823; // L: 386 - int var7 = var5 >>> 30; // L: 387 - if (var7 == 0) { // L: 388 - int var12 = var1.readInt(); // L: 389 - this.parameters.put(new IntegerNode(var12), (long)var6); // L: 390 - } else if (var7 == 1) { // L: 392 - long var10 = var1.readLong(); // L: 393 - this.parameters.put(new class350(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 + while (var4-- > 0) { + int var5 = var1.readInt(); + int var6 = var5 & 1073741823; + int var7 = var5 >>> 30; + if (var7 == 0) { + int var12 = var1.readInt(); + this.parameters.put(new IntegerNode(var12), (long)var6); + } else if (var7 == 1) { + long var10 = var1.readLong(); + this.parameters.put(new class351(var10), (long)var6); + } else if (var7 == 2) { + String var8 = var1.readStringCp1252NullTerminated(); + this.parameters.put(new ObjectNode(var8), (long)var6); } } } @@ -777,56 +771,35 @@ public class ClanSettings { } else { throw new RuntimeException("" + var2); } - } // L: 403 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;B)V", - garbageValue = "-16" - ) - public static void method203(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 32 - class378.HitSplatDefinition_spritesArchive = var1; // L: 33 - } // L: 34 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1865027594" - ) - public static int method200() { - return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 57 } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1382851298" + descriptor = "(II)Z", + garbageValue = "-2091268919" ) - static final void method201(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; // L: 190 - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your friend list first").toString(); - UserComparator10.addGameMessage(30, "", var1); // L: 192 - } // L: 194 + public static boolean method2417(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; + } - @ObfuscatedName("fh") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1255616789" + descriptor = "(II)Z", + garbageValue = "-841895642" ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (class4.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3774 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3775 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3776 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3777 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3778 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 3779 - ++Client.soundEffectCount; // L: 3780 - } + public static boolean method2421(int var0) { + return var0 >= WorldMapDecorationType.field3148.id && var0 <= WorldMapDecorationType.field3142.id || var0 == WorldMapDecorationType.field3159.id; + } - } // L: 3782 + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1470733361" + ) + static void method2422() { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + UserComparator4.logoSprite.drawAt(Login.xPadding + 382 - UserComparator4.logoSprite.subWidth / 2, 18); + } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index ad576b27ed..153ad39f60 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,2313 +1,2878 @@ -import java.io.File; import java.io.IOException; -import java.io.RandomAccessFile; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; import java.net.Socket; +import java.net.URL; +import java.net.URLConnection; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; +import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameEngine implements Usernamed { - @ObfuscatedName("qq") + @ObfuscatedName("qa") @ObfuscatedSignature( - descriptor = "[Lb;" + descriptor = "[Ldj;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("ok") + @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = 660476359 + intValue = 138557297 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("ob") + @ObfuscatedName("on") @ObfuscatedGetter( - intValue = 360388647 + intValue = 1728287491 ) - static int field830; - @ObfuscatedName("pu") + static int field615; + @ObfuscatedName("pf") @ObfuscatedGetter( - longValue = -4989319872898383139L + longValue = -6969143244749711857L ) - static long field839; - @ObfuscatedName("ov") - static boolean[] field831; - @ObfuscatedName("px") - static boolean[] field833; - @ObfuscatedName("oe") - static boolean[] field712; - @ObfuscatedName("pa") + static long field624; + @ObfuscatedName("qn") + static boolean field647; + @ObfuscatedName("or") + static boolean[] field616; + @ObfuscatedName("pi") + static boolean[] field508; + @ObfuscatedName("oy") + static boolean[] field617; + @ObfuscatedName("pm") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("tx") + @ObfuscatedName("tb") @ObfuscatedGetter( - intValue = -1878723319 + intValue = -1250618151 ) - public static int field798; - @ObfuscatedName("qd") - static boolean field862; - @ObfuscatedName("oh") + public static int field679; + @ObfuscatedName("oi") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("pr") + @ObfuscatedName("pg") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("pj") + @ObfuscatedName("py") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("ps") + @ObfuscatedName("pl") @ObfuscatedGetter( - intValue = -1136245775 + intValue = 1502186609 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("pf") - @Export("rootWidgetYs") - static int[] rootWidgetYs; - @ObfuscatedName("ty") - @ObfuscatedSignature( - descriptor = "Lbd;" - ) - static final ApproximateRouteStrategy field733; @ObfuscatedName("po") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("os") + @ObfuscatedName("tg") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lap;" ) - @Export("scriptEvents") - static NodeDeque scriptEvents; - @ObfuscatedName("qk") + static final ApproximateRouteStrategy field493; + @ObfuscatedName("ph") + @Export("rootWidgetYs") + static int[] rootWidgetYs; + @ObfuscatedName("pz") @ObfuscatedGetter( - intValue = -1081070029 + intValue = -1744255253 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("tw") + static int[] field683; + @ObfuscatedName("tc") + static int[] field665; + @ObfuscatedName("ps") + @ObfuscatedGetter( + intValue = -1203313561 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("ra") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("qv") + @ObfuscatedGetter( + intValue = 444188501 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("qp") + @ObfuscatedName("qd") @ObfuscatedGetter( - intValue = 605086857 + intValue = -637209269 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("tk") - static int[] field739; - @ObfuscatedName("ta") - static int[] field631; - @ObfuscatedName("rg") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("rx") - static boolean[] field871; - @ObfuscatedName("ry") - static int[] field872; - @ObfuscatedName("rc") - static int[] field873; - @ObfuscatedName("sp") + @ObfuscatedName("sn") @ObfuscatedGetter( - intValue = 1152521 + intValue = 1818996957 ) - static int field890; - @ObfuscatedName("rt") - static int[] field867; - @ObfuscatedName("sd") + static int field674; + @ObfuscatedName("su") @ObfuscatedSignature( descriptor = "Lih;" ) @Export("playerAppearance") static PlayerComposition playerAppearance; - @ObfuscatedName("sa") - static int[] field875; - @ObfuscatedName("su") - @ObfuscatedSignature( - descriptor = "[Lju;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("sh") + @ObfuscatedName("sr") @ObfuscatedGetter( - intValue = 1731824615 + intValue = -295917775 ) - static int field902; - @ObfuscatedName("pn") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("qt") + static int field675; + @ObfuscatedName("qf") @ObfuscatedGetter( - intValue = 1839633675 + intValue = -1148049251 ) @Export("minimapState") static int minimapState; - @ObfuscatedName("rm") - @ObfuscatedGetter( - intValue = -1711547959 + @ObfuscatedName("qs") + @ObfuscatedSignature( + descriptor = "[Ldt;" ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("rd") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("tv") - @Export("archiveLoaders") - static ArrayList archiveLoaders; + @Export("currentClanChannels") + static ClanChannel[] currentClanChannels; @ObfuscatedName("pe") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("pj") @ObfuscatedGetter( - intValue = -1256134345 + intValue = -1053615907 ) @Export("crossWorldMessageIdsIndex") static int crossWorldMessageIdsIndex; - @ObfuscatedName("tn") + @ObfuscatedName("qi") @ObfuscatedGetter( - intValue = 375081575 + intValue = -287650673 + ) + static int field638; + @ObfuscatedName("rx") + static boolean[] field655; + @ObfuscatedName("ta") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("ty") + @ObfuscatedGetter( + intValue = -2105691439 ) @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("rs") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("rk") + @ObfuscatedName("ql") + @ObfuscatedGetter( + longValue = -9002074771495257221L + ) + static long field635; + @ObfuscatedName("re") + @ObfuscatedGetter( + intValue = -360861981 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("rl") @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; - @ObfuscatedName("rb") - @ObfuscatedGetter( - intValue = -85390661 - ) - static int field659; - @ObfuscatedName("rw") + @ObfuscatedName("rh") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("rj") @ObfuscatedSignature( - descriptor = "[Lax;" + descriptor = "[Lb;" ) @Export("soundEffects") static SoundEffect[] soundEffects; @ObfuscatedName("rr") - @Export("soundLocations") - static int[] soundLocations; + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; @ObfuscatedName("qe") @ObfuscatedGetter( - longValue = -3503174245678770383L - ) - static long field850; - @ObfuscatedName("ss") - @ObfuscatedSignature( - descriptor = "Lmz;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("sy") - static short field876; - @ObfuscatedName("sv") - static short field877; - @ObfuscatedName("qb") - @ObfuscatedGetter( - intValue = -1807179709 + intValue = -1701721089 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("so") - static short field881; - @ObfuscatedName("qh") + @ObfuscatedName("rn") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("se") + static short field660; + @ObfuscatedName("qy") @ObfuscatedGetter( - intValue = 1305420667 + intValue = 1287305637 ) @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("qs") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("sn") - static short field690; - @ObfuscatedName("si") - static short field864; - @ObfuscatedName("st") + @ObfuscatedName("sw") + static short field631; + @ObfuscatedName("sl") + static short field666; + @ObfuscatedName("sz") + static short field667; + @ObfuscatedName("so") + static short field542; + @ObfuscatedName("sb") + @ObfuscatedSignature( + descriptor = "[Ljk;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("sv") @ObfuscatedGetter( - intValue = 1279050647 + intValue = -128465765 ) @Export("viewportZoom") static int viewportZoom; + @ObfuscatedName("sk") + static short field472; + @ObfuscatedName("qp") + @Export("mapIconXs") + static int[] mapIconXs; @ObfuscatedName("sm") - static short field880; - @ObfuscatedName("sj") @ObfuscatedGetter( - intValue = -1918427539 + intValue = 963837245 ) @Export("viewportWidth") static int viewportWidth; - @ObfuscatedName("qc") + @ObfuscatedName("sj") + @ObfuscatedSignature( + descriptor = "Lmb;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("qx") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("qy") + @ObfuscatedName("qq") @ObfuscatedSignature( - descriptor = "[Loa;" + descriptor = "[Lom;" ) @Export("mapIcons") static SpritePixels[] mapIcons; - @ObfuscatedName("qz") + @ObfuscatedName("ri") + static int[] field436; + @ObfuscatedName("rm") + static int[] field608; + @ObfuscatedName("rc") + static int[] field658; + @ObfuscatedName("sp") @ObfuscatedGetter( - intValue = 743767761 - ) - static int field853; - @ObfuscatedName("sf") - @ObfuscatedGetter( - intValue = 1112444085 + intValue = 77591977 ) @Export("viewportHeight") static int viewportHeight; + @ObfuscatedName("sg") + static int[] field659; @ObfuscatedName("sq") @ObfuscatedGetter( - intValue = -853632551 + intValue = 1377347849 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("sk") + @ObfuscatedName("pw") @ObfuscatedGetter( - intValue = -1851870409 + intValue = 1927137713 + ) + static int field450; + @ObfuscatedName("sy") + @ObfuscatedGetter( + intValue = -369610581 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("qi") - @ObfuscatedSignature( - descriptor = "[Ly;" - ) - @Export("currentClanChannels") - static ClanChannel[] currentClanChannels; - @ObfuscatedName("sc") + @ObfuscatedName("sh") @Export("zoomHeight") static short zoomHeight; - @ObfuscatedName("sl") + @ObfuscatedName("sx") @Export("zoomWidth") static short zoomWidth; - @ObfuscatedName("tp") - @ObfuscatedGetter( - intValue = 392522533 - ) - static int field898; - @ObfuscatedName("pz") - @ObfuscatedGetter( - intValue = -426545695 - ) - static int field847; - @ObfuscatedName("ph") - static int[] field786; - @ObfuscatedName("oi") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - static NodeDeque field812; - @ObfuscatedName("pb") - static int[] field848; - @ObfuscatedName("op") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - static NodeDeque field860; - @ObfuscatedName("pv") - static int[] field725; - @ObfuscatedName("pi") - @ObfuscatedGetter( - intValue = -2084785053 - ) - @Export("tradeChatMode") - static int tradeChatMode; + @ObfuscatedName("px") + static int[] field430; @ObfuscatedName("pk") - @ObfuscatedGetter( - intValue = -1755958915 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("pq") - static String field642; - @ObfuscatedName("sw") + static int[] field633; + @ObfuscatedName("oe") @ObfuscatedSignature( - descriptor = "Lbp;" + descriptor = "Lke;" + ) + static NodeDeque field685; + @ObfuscatedName("tt") + @ObfuscatedGetter( + intValue = 1651684607 + ) + static int field682; + @ObfuscatedName("pb") + static int[] field626; + @ObfuscatedName("pa") + static String field629; + @ObfuscatedName("sa") + @ObfuscatedSignature( + descriptor = "Lah;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lfl;" + descriptor = "[Lfy;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - static Bounds field903; - @ObfuscatedName("af") - static boolean field730; - @ObfuscatedName("bq") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -479860063 + intValue = -1146960599 + ) + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("aw") + static boolean field634; + @ObfuscatedName("bt") + @ObfuscatedGetter( + intValue = -618186627 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bx") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1336794433 + intValue = -796271005 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bz") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -1086569323 + intValue = -1038318995 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("be") + @ObfuscatedName("bg") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("by") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1302427087 + intValue = 2136967557 ) @Export("clientType") static int clientType; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 1019445121 + intValue = -1455306297 ) - static int field625; - @ObfuscatedName("bg") + static int field473; + @ObfuscatedName("bj") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -2033553753 + intValue = -499921951 ) @Export("gameState") static int gameState; - @ObfuscatedName("cg") + @ObfuscatedName("co") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("ca") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 1506924847 + intValue = 276312687 ) @Export("cycle") static int cycle; - @ObfuscatedName("cd") + @ObfuscatedName("ct") @ObfuscatedGetter( - longValue = -3330415476350692251L + longValue = 4454969657610940183L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 2057081131 + intValue = -1497109865 ) - static int field843; - @ObfuscatedName("ct") + static int field417; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -1549041823 + intValue = -1623628257 ) - static int field633; - @ObfuscatedName("ci") - @ObfuscatedGetter( - longValue = -7081451214242002295L - ) - static long field760; + static int field418; @ObfuscatedName("cs") + @ObfuscatedGetter( + longValue = -174042217715999029L + ) + static long field419; + @ObfuscatedName("cv") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("co") + @ObfuscatedName("cg") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cj") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -1450898569 + intValue = 160203917 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cr") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -884240111 + intValue = 950873687 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cl") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 1021178359 + intValue = -1989008663 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cw") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -1821645449 + intValue = -1868694333 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("ck") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = 986591039 + intValue = -59179799 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cn") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 359883245 + intValue = 907683737 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("ch") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1742642487 + intValue = 1339421573 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("du") + @ObfuscatedName("dk") @ObfuscatedGetter( - intValue = 1066725013 + intValue = 1682551987 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("db") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -939266577 + intValue = -1080934523 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("dh") + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lce;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("di") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lce;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("df") + @ObfuscatedName("dx") @ObfuscatedGetter( - intValue = 645722257 + intValue = 2033278785 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dz") + @ObfuscatedName("dw") @ObfuscatedGetter( - intValue = 1743859217 + intValue = -877397965 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dc") + @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = -1425708355 + intValue = -1246129331 ) - static int field800; - @ObfuscatedName("et") + static int field435; + @ObfuscatedName("ee") @ObfuscatedGetter( - intValue = 1445831209 + intValue = 1723016173 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("eb") + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = 1594897445 + intValue = -232844285 ) @Export("loginState") static int loginState; - @ObfuscatedName("ek") - @ObfuscatedGetter( - intValue = -86832127 - ) - static int field811; - @ObfuscatedName("em") - @ObfuscatedGetter( - intValue = -775816439 - ) - static int field654; - @ObfuscatedName("er") - @ObfuscatedGetter( - intValue = 1385967613 - ) - static int field655; - @ObfuscatedName("ey") - @ObfuscatedSignature( - descriptor = "Ldv;" - ) - static class126 field656; @ObfuscatedName("eg") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("ed") + @ObfuscatedGetter( + intValue = -1064043753 + ) + static int field438; + @ObfuscatedName("ei") + @ObfuscatedGetter( + intValue = -1974351783 + ) + static int field439; + @ObfuscatedName("ep") + @ObfuscatedGetter( + intValue = 174587345 + ) + static int field589; + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + static class99 field447; + @ObfuscatedName("ec") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("eh") + @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "Lcv;" + descriptor = "Lbf;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fm") + @ObfuscatedName("fw") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("fo") + @ObfuscatedName("fp") @ObfuscatedSignature( - descriptor = "[Ldu;" + descriptor = "[Lbe;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("fc") + @ObfuscatedName("fj") @ObfuscatedGetter( - intValue = -2000479971 + intValue = -704631899 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fg") + @ObfuscatedName("fc") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fe") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = -22894005 + intValue = 1834645421 ) - static int field636; - @ObfuscatedName("fs") - static int[] field763; - @ObfuscatedName("ft") + static int field500; + @ObfuscatedName("fq") + static int[] field474; + @ObfuscatedName("fb") @ObfuscatedSignature( - descriptor = "Ldq;" + descriptor = "Lcj;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fb") + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + static AbstractSocket field644; + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = 796481149 + intValue = 571016731 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fp") + @ObfuscatedName("fe") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("fi") + @ObfuscatedName("fm") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fr") + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "Lki;" + descriptor = "Lkv;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fd") + @ObfuscatedName("fn") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("ge") - @ObfuscatedGetter( - intValue = 1919520289 - ) - static int field618; @ObfuscatedName("gg") @ObfuscatedGetter( - intValue = -1712660563 + intValue = -148375477 ) - static int field789; - @ObfuscatedName("gs") + static int field459; + @ObfuscatedName("gx") @ObfuscatedGetter( - intValue = 852398613 + intValue = 1070131091 ) - static int field742; - @ObfuscatedName("gu") + static int field460; + @ObfuscatedName("gi") @ObfuscatedGetter( - intValue = -1878164651 + intValue = 977689969 ) - static int field677; - @ObfuscatedName("gw") + static int field461; + @ObfuscatedName("gb") @ObfuscatedGetter( - intValue = 143152059 + intValue = -199762195 ) - static int field678; - @ObfuscatedName("gp") + static int field549; + @ObfuscatedName("gh") + @ObfuscatedGetter( + intValue = -962922831 + ) + static int field463; + @ObfuscatedName("gj") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gr") + @ObfuscatedName("gw") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; @ObfuscatedName("gy") - static final int[] field682; - @ObfuscatedName("gj") + static final int[] field467; + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = -270595563 + intValue = 331203949 ) - static int field683; - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("hk") + static int field555; + @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = 173125819 + intValue = 1432005099 ) - static int field685; - @ObfuscatedName("hx") + static int field469; + @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = 527282429 + intValue = 401829025 ) - static int field686; + static int field470; @ObfuscatedName("hc") @ObfuscatedGetter( - intValue = 713325161 + intValue = -929158491 ) - static int field818; - @ObfuscatedName("hm") + static int field471; + @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = -742100795 + intValue = 915268525 ) - static int field688; - @ObfuscatedName("hh") - static boolean field689; + static int field632; @ObfuscatedName("hn") + static boolean field454; + @ObfuscatedName("hk") @ObfuscatedGetter( - intValue = -126848597 + intValue = -895093955 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hs") + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = 625342135 + intValue = 227907043 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hl") + @ObfuscatedName("hi") @ObfuscatedGetter( - intValue = 1330409253 + intValue = -487444267 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hq") + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = 1581889061 + intValue = -411288935 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("hb") + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = 182124091 + intValue = -1602720051 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("ho") + @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = -474499607 + intValue = 5126133 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hu") + @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -1521559245 + intValue = -1378766607 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("ie") + @ObfuscatedName("iv") @ObfuscatedGetter( - intValue = 399806555 + intValue = 473232837 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("il") + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = -210927579 + intValue = 528661717 ) @Export("camFollowHeight") static int camFollowHeight; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("iy") - @ObfuscatedGetter( - intValue = 44183997 - ) - static int field699; - @ObfuscatedName("iq") - @ObfuscatedGetter( - intValue = 1634750831 - ) - static int field676; @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = -2080387383 + intValue = 1101365977 ) - static int field857; - @ObfuscatedName("ip") + static int field433; + @ObfuscatedName("iy") @ObfuscatedGetter( - intValue = 1614384069 + intValue = -132493299 + ) + static int field440; + @ObfuscatedName("in") + @ObfuscatedGetter( + intValue = -801597475 + ) + static int field485; + @ObfuscatedName("ii") + @ObfuscatedGetter( + intValue = 196485799 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 930603185 + intValue = -410802453 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("in") + @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = 1986123723 + intValue = -2076624933 ) - public static int field704; - @ObfuscatedName("iv") - static boolean field705; + static int field488; + @ObfuscatedName("io") + static boolean field489; + @ObfuscatedName("ik") + @ObfuscatedGetter( + intValue = 209734121 + ) + static int field607; + @ObfuscatedName("ie") + static boolean field491; @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = -572863563 + intValue = 914135433 ) - static int field706; - @ObfuscatedName("ii") - static boolean field707; - @ObfuscatedName("ic") + static int field492; + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = 482365293 - ) - static int field708; - @ObfuscatedName("iu") - @ObfuscatedGetter( - intValue = -1595418399 + intValue = -978591303 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("if") + @ObfuscatedName("id") @ObfuscatedGetter( - intValue = -2069034471 + intValue = 1032547075 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("ik") + @ObfuscatedName("is") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("is") + @ObfuscatedName("ib") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("ij") + @ObfuscatedName("ip") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("ig") + @ObfuscatedName("im") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("im") + @ObfuscatedName("iw") @Export("overheadTextColors") static int[] overheadTextColors; @ObfuscatedName("jc") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("jj") + @ObfuscatedName("je") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ji") + @ObfuscatedName("jv") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("js") + @ObfuscatedName("jn") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("jl") + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = 1472746363 + intValue = 1782757071 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("jg") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 646714111 + intValue = -1314905743 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("jm") + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = 1866904061 + intValue = 2142259699 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jd") + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = -1814244043 + intValue = 142542337 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jh") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 1740953143 + intValue = 494303077 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jo") + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = -161820321 + intValue = -2045010903 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("ja") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -1567280515 + intValue = 2136266145 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jw") + @ObfuscatedName("jh") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jf") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -756322907 + intValue = -1925679665 ) - static int field869; - @ObfuscatedName("jq") + static int field512; + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = 198485255 + intValue = 1781842297 ) - static int field729; - @ObfuscatedName("jk") + static int field513; + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = 1180846677 + intValue = 746274853 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jr") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = 2098466217 + intValue = 1047802367 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("je") + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = -1854794411 + intValue = -2102287843 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jy") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = 1229722503 + intValue = -1388419777 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jv") - static boolean field734; - @ObfuscatedName("jz") + @ObfuscatedName("ju") + static boolean field519; + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = 433289591 + intValue = 141193379 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jt") - @ObfuscatedGetter( - intValue = -1284891995 - ) - static int field629; @ObfuscatedName("jx") + @ObfuscatedGetter( + intValue = -1324164713 + ) + static int field521; + @ObfuscatedName("jk") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("kc") + @ObfuscatedName("ki") @ObfuscatedSignature( - descriptor = "[Lcj;" + descriptor = "[Lbb;" ) @Export("players") static Player[] players; - @ObfuscatedName("kx") + @ObfuscatedName("kf") @ObfuscatedGetter( - intValue = -990316241 + intValue = 596751267 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("kn") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = -1153104715 + intValue = -2017006231 ) - static int field740; - @ObfuscatedName("ka") + static int field525; + @ObfuscatedName("kj") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kd") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = -1689088739 + intValue = -744623911 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kl") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = 506159691 + intValue = -1237716335 ) - static int field783; - @ObfuscatedName("ks") - static int[] field859; - @ObfuscatedName("kr") + static int field528; + @ObfuscatedName("kh") + static int[] field627; + @ObfuscatedName("kt") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ko") + @ObfuscatedName("kb") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("kw") + @ObfuscatedName("ky") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kt") + @ObfuscatedName("kx") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kp") + @ObfuscatedName("kw") @ObfuscatedGetter( - intValue = -263949421 + intValue = -1480337925 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("kb") + @ObfuscatedName("km") @ObfuscatedSignature( - descriptor = "[[[Lkq;" + descriptor = "[[[Lke;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kh") + @ObfuscatedName("ka") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("ky") + @ObfuscatedName("kz") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kf") + @ObfuscatedName("kp") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("ki") + @ObfuscatedName("kg") @Export("currentLevels") static int[] currentLevels; @ObfuscatedName("kv") @Export("levels") static int[] levels; - @ObfuscatedName("lg") + @ObfuscatedName("lz") @Export("experience") static int[] experience; - @ObfuscatedName("ln") + @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = -1921591875 + intValue = -1446285345 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("le") + @ObfuscatedName("ll") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lh") + @ObfuscatedName("lb") @ObfuscatedGetter( - intValue = 125901859 + intValue = 738499013 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lt") + @ObfuscatedName("lc") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lf") + @ObfuscatedName("lg") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("lr") + @ObfuscatedName("lm") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("ld") + @ObfuscatedName("ly") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lq") + @ObfuscatedName("lw") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ly") + @ObfuscatedName("lt") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lu") + @ObfuscatedName("lr") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lc") + @ObfuscatedName("li") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("ll") + @ObfuscatedName("lx") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("lx") + @ObfuscatedName("lv") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lv") + @ObfuscatedName("le") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("la") + @ObfuscatedName("ln") @ObfuscatedGetter( - intValue = 1932466889 + intValue = -1200379427 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("ls") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = -936888801 + intValue = 442230877 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("mj") + @ObfuscatedName("mo") @ObfuscatedGetter( - intValue = -2134544589 + intValue = 121611181 ) - static int field773; - @ObfuscatedName("mw") + static int field648; + @ObfuscatedName("ma") @ObfuscatedGetter( - intValue = 1407129087 + intValue = 1200367257 ) - static int field693; - @ObfuscatedName("mv") + static int field559; + @ObfuscatedName("mh") @ObfuscatedGetter( - intValue = -56477685 + intValue = 1335908565 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("ma") + @ObfuscatedName("md") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("mu") + @ObfuscatedName("mq") @ObfuscatedGetter( - intValue = -1880896879 + intValue = 1670625679 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("ml") + @ObfuscatedName("mv") @ObfuscatedGetter( - intValue = 239487695 + intValue = 595119311 ) - static int field634; - @ObfuscatedName("mm") + static int field564; + @ObfuscatedName("mf") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mh") + @ObfuscatedName("mw") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mi") + @ObfuscatedName("mu") @ObfuscatedGetter( - intValue = -65357441 + intValue = -2061357043 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("my") + @ObfuscatedName("mn") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = -397561133 + intValue = -1016143639 ) - static int field784; - @ObfuscatedName("mx") + static int field569; + @ObfuscatedName("mb") @ObfuscatedGetter( - intValue = -1298961303 + intValue = 489017873 ) - static int field694; - @ObfuscatedName("me") + static int field483; + @ObfuscatedName("mp") @ObfuscatedGetter( - intValue = 1894201327 + intValue = 879960477 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("mk") + @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = 1703378305 + intValue = -1721222091 ) - static int field891; - @ObfuscatedName("mb") + static int field654; + @ObfuscatedName("mt") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("mp") + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = -932901887 + intValue = 1475888503 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("mo") + @ObfuscatedName("mx") @ObfuscatedGetter( - intValue = 2078766509 + intValue = -500247697 ) @Export("weight") static int weight; - @ObfuscatedName("mn") + @ObfuscatedName("mc") @ObfuscatedGetter( - intValue = -91677995 + intValue = 379410301 ) @Export("staffModLevel") - public static int staffModLevel; - @ObfuscatedName("md") + static int staffModLevel; + @ObfuscatedName("mi") @ObfuscatedGetter( - intValue = 1939957429 + intValue = -1976785681 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("nv") + @ObfuscatedName("ng") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("nb") + @ObfuscatedName("no") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("nc") + @ObfuscatedName("nf") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("np") + @ObfuscatedName("nt") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("na") + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = 123822307 + intValue = 301645629 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("nm") + @ObfuscatedName("nh") @ObfuscatedGetter( - intValue = -1215830949 + intValue = -324581627 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nz") + @ObfuscatedName("nb") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("nq") - static boolean field821; - @ObfuscatedName("nj") + @ObfuscatedName("ns") + static boolean field585; + @ObfuscatedName("nd") @ObfuscatedGetter( - intValue = 392956681 + intValue = 1983815961 ) - static int field801; - @ObfuscatedName("nn") - @ObfuscatedGetter( - intValue = -207848961 - ) - static int field802; - @ObfuscatedName("nk") - static boolean field731; - @ObfuscatedName("ne") - @ObfuscatedGetter( - intValue = -1026128313 - ) - static int field804; - @ObfuscatedName("nf") - @ObfuscatedGetter( - intValue = 1520709181 - ) - static int field805; + static int field586; @ObfuscatedName("nl") + @ObfuscatedGetter( + intValue = -2014289365 + ) + static int field587; + @ObfuscatedName("nz") + static boolean field588; + @ObfuscatedName("nm") + @ObfuscatedGetter( + intValue = -480314281 + ) + static int field678; + @ObfuscatedName("ni") + @ObfuscatedGetter( + intValue = 735331709 + ) + static int field676; + @ObfuscatedName("ny") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("ns") + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = -627437657 + intValue = -1160885167 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("no") + @ObfuscatedName("nn") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("ni") + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = 1626383345 + intValue = 778255509 ) @Export("changedVarpCount") static int changedVarpCount; @ObfuscatedName("nr") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("ng") + @ObfuscatedName("nc") @ObfuscatedGetter( - intValue = 942162965 + intValue = -1367836643 ) - static int field711; - @ObfuscatedName("nd") + static int field574; + @ObfuscatedName("ne") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("on") + @ObfuscatedName("op") @ObfuscatedGetter( - intValue = -887652095 + intValue = 448907571 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("oo") - static int[] field814; - @ObfuscatedName("og") + @ObfuscatedName("ob") + static int[] field599; + @ObfuscatedName("ok") @ObfuscatedGetter( - intValue = -1384400453 + intValue = 664811355 ) - static int field759; - @ObfuscatedName("om") + static int field600; + @ObfuscatedName("oz") @ObfuscatedGetter( - intValue = 811091313 + intValue = 417630941 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("oj") + @ObfuscatedName("ox") @ObfuscatedGetter( - intValue = -892031395 + intValue = -310829091 ) - static int field817; + static int field609; + @ObfuscatedName("ou") + @ObfuscatedGetter( + intValue = -1290477955 + ) + static int field603; @ObfuscatedName("of") @ObfuscatedGetter( - intValue = -2026013483 + intValue = -1094195131 ) - static int field882; - @ObfuscatedName("oa") + static int field604; + @ObfuscatedName("om") @ObfuscatedGetter( - intValue = 976614793 + intValue = -2123876731 ) - static int field819; + static int field605; + @ObfuscatedName("os") + @ObfuscatedGetter( + intValue = 723306013 + ) + static int field606; + @ObfuscatedName("ov") + @ObfuscatedGetter( + intValue = 994228311 + ) + static int field479; + @ObfuscatedName("og") + @ObfuscatedGetter( + intValue = -1300891353 + ) + static int field516; @ObfuscatedName("ol") @ObfuscatedGetter( - intValue = 1591480271 - ) - static int field820; - @ObfuscatedName("oy") - @ObfuscatedGetter( - intValue = 1602383115 - ) - static int field827; - @ObfuscatedName("od") - @ObfuscatedGetter( - intValue = 1877231855 - ) - static int field822; - @ObfuscatedName("or") - @ObfuscatedGetter( - intValue = -451521007 - ) - static int field823; - @ObfuscatedName("oc") - @ObfuscatedGetter( - intValue = 807145243 + intValue = 1322932151 ) @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("ef") + @ObfuscatedName("ow") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lke;" ) - Buffer field660; - @ObfuscatedName("fq") + @Export("scriptEvents") + static NodeDeque scriptEvents; + @ObfuscatedName("oa") @ObfuscatedSignature( - descriptor = "Laq;" + descriptor = "Lke;" ) - class35 field661; + static NodeDeque field611; + @ObfuscatedName("em") + @ObfuscatedSignature( + descriptor = "Lnv;" + ) + Buffer field595; + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "Lf;" + ) + class7 field445; static { - field730 = true; // L: 194 - worldId = 1; // L: 195 - worldProperties = 0; // L: 196 - gameBuild = 0; // L: 198 - isMembersWorld = false; // L: 201 - isLowDetail = false; // L: 202 - clientType = -1; // L: 207 - field625 = -1; // L: 208 - onMobile = false; // L: 209 - gameState = 0; // L: 210 - isLoading = true; // L: 231 - cycle = 0; // L: 232 - mouseLastLastPressedTimeMillis = -1L; // L: 233 - field843 = -1; // L: 235 - field633 = -1; // L: 236 - field760 = -1L; // L: 237 - hadFocus = true; // L: 238 - displayFps = false; // L: 239 - rebootTimer = 0; // L: 240 - hintArrowType = 0; // L: 241 + field634 = true; + worldId = 1; + worldProperties = 0; + gameBuild = 0; + isMembersWorld = false; + isLowDetail = false; + clientType = -1; + field473 = -1; + onMobile = false; + gameState = 0; + isLoading = true; + cycle = 0; + mouseLastLastPressedTimeMillis = -1L; + field417 = -1; + field418 = -1; + field419 = -1L; + hadFocus = true; + displayFps = false; + rebootTimer = 0; + hintArrowType = 0; hintArrowNpcIndex = 0; hintArrowPlayerIndex = 0; - hintArrowX = 0; // L: 244 - hintArrowY = 0; // L: 245 - hintArrowHeight = 0; // L: 246 - hintArrowSubX = 0; // L: 247 - hintArrowSubY = 0; // L: 248 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 250 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 251 - titleLoadingStage = 0; // L: 253 - js5ConnectState = 0; // L: 256 - field800 = 0; // L: 257 - js5Errors = 0; // L: 279 - loginState = 0; // L: 281 - field811 = 0; // L: 282 - field654 = 0; // L: 283 - field655 = 0; // L: 284 - field656 = class126.field1475; // L: 285 - Login_isUsernameRemembered = false; // L: 294 - secureRandomFuture = new SecureRandomFuture(); // L: 295 - randomDatData = null; // L: 300 - npcs = new NPC[32768]; // L: 304 - npcCount = 0; // L: 305 - npcIndices = new int[32768]; // L: 306 - field636 = 0; // L: 307 - field763 = new int[250]; // L: 308 - packetWriter = new PacketWriter(); // L: 311 - logoutTimer = 0; // L: 313 - hadNetworkError = false; // L: 314 - useBufferedSocket = true; // L: 315 - timer = new Timer(); // L: 316 - fontsMap = new HashMap(); // L: 322 - field618 = 0; // L: 329 - field789 = 1; // L: 330 - field742 = 0; // L: 331 - field677 = 1; // L: 332 - field678 = 0; // L: 333 - collisionMaps = new CollisionMap[4]; // L: 341 - isInInstance = false; // L: 342 - instanceChunkTemplates = new int[4][13][13]; // L: 343 - field682 = 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: 344 - field683 = 0; // L: 347 - field685 = 2301979; // L: 359 - field686 = 5063219; // L: 360 - field818 = 3353893; // L: 361 - field688 = 7759444; // L: 362 - field689 = false; // L: 363 - alternativeScrollbarWidth = 0; // L: 364 - camAngleX = 128; // L: 372 - camAngleY = 0; // L: 373 - camAngleDY = 0; // L: 374 - camAngleDX = 0; // L: 375 - mouseCamClickedX = 0; // L: 376 - mouseCamClickedY = 0; // L: 377 - oculusOrbState = 0; // L: 378 - camFollowHeight = 50; // L: 379 - field699 = 0; // L: 383 - field676 = 0; // L: 384 - field857 = 0; // L: 385 - oculusOrbNormalSpeed = 12; // L: 387 - oculusOrbSlowedSpeed = 6; // L: 388 - field704 = 0; // L: 389 - field705 = false; // L: 390 - field706 = 0; // L: 391 - field707 = false; // L: 392 - field708 = 0; // L: 393 - overheadTextCount = 0; // L: 394 - overheadTextLimit = 50; // L: 395 - overheadTextXs = new int[overheadTextLimit]; // L: 396 - overheadTextYs = new int[overheadTextLimit]; // L: 397 - overheadTextAscents = new int[overheadTextLimit]; // L: 398 - overheadTextXOffsets = new int[overheadTextLimit]; // L: 399 - overheadTextColors = new int[overheadTextLimit]; // L: 400 - overheadTextEffects = new int[overheadTextLimit]; // L: 401 - overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 402 - overheadText = new String[overheadTextLimit]; // L: 403 - tileLastDrawnActor = new int[104][104]; // L: 404 - viewportDrawCount = 0; // L: 405 - viewportTempX = -1; // L: 406 - viewportTempY = -1; // L: 407 - mouseCrossX = 0; // L: 408 - mouseCrossY = 0; // L: 409 - mouseCrossState = 0; // L: 410 - mouseCrossColor = 0; // L: 411 - showMouseCross = true; // L: 412 - field869 = 0; // L: 414 - field729 = 0; // L: 415 - dragItemSlotSource = 0; // L: 418 - draggedWidgetX = 0; // L: 419 - draggedWidgetY = 0; // L: 420 - dragItemSlotDestination = 0; // L: 421 - field734 = false; // L: 422 - itemDragDuration = 0; // L: 423 - field629 = 0; // L: 424 - showLoadingMessages = true; // L: 426 - players = new Player[2048]; // L: 428 - localPlayerIndex = -1; // L: 430 - field740 = 0; // L: 431 - renderSelf = true; // L: 433 - drawPlayerNames = 0; // L: 438 - field783 = 0; // L: 439 - field859 = new int[1000]; // L: 440 - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 442 - playerMenuActions = new String[8]; // L: 443 - playerOptionsPriorities = new boolean[8]; // L: 444 - defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 445 - combatTargetPlayerIndex = -1; // L: 446 - groundItems = new NodeDeque[4][104][104]; // L: 447 - pendingSpawns = new NodeDeque(); // L: 448 - projectiles = new NodeDeque(); // L: 449 - graphicsObjects = new NodeDeque(); // L: 450 - currentLevels = new int[25]; // L: 451 - levels = new int[25]; // L: 452 - experience = new int[25]; // L: 453 - leftClickOpensMenu = 0; // L: 454 - isMenuOpen = false; // L: 455 - menuOptionsCount = 0; // L: 461 - menuArguments1 = new int[500]; // L: 462 - menuArguments2 = new int[500]; // L: 463 - menuOpcodes = new int[500]; // L: 464 - menuIdentifiers = new int[500]; // L: 465 - menuActions = new String[500]; // L: 466 - menuTargets = new String[500]; // L: 467 - menuShiftClick = new boolean[500]; // L: 468 - followerOpsLowPriority = false; // L: 469 - shiftClickDrop = false; // L: 471 - tapToDrop = false; // L: 472 - showMouseOverText = true; // L: 473 - viewportX = -1; // L: 474 - viewportY = -1; // L: 475 - field773 = 0; // L: 479 - field693 = 50; // L: 480 - isItemSelected = 0; // L: 481 - selectedItemName = null; // L: 485 - isSpellSelected = false; // L: 486 - selectedSpellChildIndex = -1; // L: 488 - field634 = -1; // L: 489 - selectedSpellActionName = null; // L: 491 - selectedSpellName = null; // L: 492 - rootInterface = -1; // L: 493 - interfaceParents = new NodeHashTable(8); // L: 494 - field784 = 0; // L: 499 - field694 = -1; // L: 500 - chatEffects = 0; // L: 501 - field891 = 0; // L: 502 - meslayerContinueWidget = null; // L: 503 - runEnergy = 0; // L: 504 - weight = 0; // L: 505 - staffModLevel = 0; // L: 506 - followerIndex = -1; // L: 507 - playerMod = false; // L: 508 - viewportWidget = null; // L: 509 - clickedWidget = null; // L: 510 - clickedWidgetParent = null; // L: 511 - widgetClickX = 0; // L: 512 - widgetClickY = 0; // L: 513 - draggedOnWidget = null; // L: 514 - field821 = false; // L: 515 - field801 = -1; // L: 516 - field802 = -1; // L: 517 - field731 = false; // L: 518 - field804 = -1; // L: 519 - field805 = -1; // L: 520 - isDraggingWidget = false; // L: 521 - cycleCntr = 1; // L: 526 - changedVarps = new int[32]; // L: 529 - changedVarpCount = 0; // L: 530 - changedItemContainers = new int[32]; // L: 531 - field711 = 0; // L: 532 - changedSkills = new int[32]; // L: 533 - changedSkillsCount = 0; // L: 534 - field814 = new int[32]; // L: 535 - field759 = 0; // L: 536 - chatCycle = 0; // L: 537 - field817 = 0; // L: 538 - field882 = 0; // L: 539 - field819 = 0; // L: 540 - field820 = 0; // L: 541 - field827 = 0; // L: 542 - field822 = 0; // L: 543 - field823 = 0; // L: 544 - mouseWheelRotation = 0; // L: 550 - scriptEvents = new NodeDeque(); // L: 551 - field812 = new NodeDeque(); // L: 552 - field860 = new NodeDeque(); // L: 553 - widgetFlags = new NodeHashTable(512); // L: 554 - rootWidgetCount = 0; // L: 556 - field830 = -2; // L: 557 - field831 = new boolean[100]; // L: 558 - field712 = new boolean[100]; // L: 559 - field833 = new boolean[100]; // L: 560 - rootWidgetXs = new int[100]; // L: 561 - rootWidgetYs = new int[100]; // L: 562 - rootWidgetWidths = new int[100]; // L: 563 - rootWidgetHeights = new int[100]; // L: 564 + hintArrowX = 0; + hintArrowY = 0; + hintArrowHeight = 0; + hintArrowSubX = 0; + hintArrowSubY = 0; + playerAttackOption = AttackOption.AttackOption_hidden; + npcAttackOption = AttackOption.AttackOption_hidden; + titleLoadingStage = 0; + js5ConnectState = 0; + field435 = 0; + js5Errors = 0; + loginState = 0; + field438 = 0; + field439 = 0; + field589 = 0; + field447 = class99.field1267; + Login_isUsernameRemembered = false; + secureRandomFuture = new SecureRandomFuture(); + randomDatData = null; + npcs = new NPC[32768]; + npcCount = 0; + npcIndices = new int[32768]; + field500 = 0; + field474 = new int[250]; + packetWriter = new PacketWriter(); + logoutTimer = 0; + hadNetworkError = false; + useBufferedSocket = true; + timer = new Timer(); + fontsMap = new HashMap(); + field459 = 0; + field460 = 1; + field461 = 0; + field549 = 1; + field463 = 0; + collisionMaps = new CollisionMap[4]; + isInInstance = false; + instanceChunkTemplates = new int[4][13][13]; + field467 = 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}; + field555 = 0; + field469 = 2301979; + field470 = 5063219; + field471 = 3353893; + field632 = 7759444; + field454 = false; + alternativeScrollbarWidth = 0; + camAngleX = 128; + camAngleY = 0; + camAngleDY = 0; + camAngleDX = 0; + mouseCamClickedX = 0; + mouseCamClickedY = 0; + oculusOrbState = 0; + camFollowHeight = 50; + field433 = 0; + field440 = 0; + field485 = 0; + oculusOrbNormalSpeed = 12; + oculusOrbSlowedSpeed = 6; + field488 = 0; + field489 = false; + field607 = 0; + field491 = false; + field492 = 0; + overheadTextCount = 0; + overheadTextLimit = 50; + overheadTextXs = new int[overheadTextLimit]; + overheadTextYs = new int[overheadTextLimit]; + overheadTextAscents = new int[overheadTextLimit]; + overheadTextXOffsets = new int[overheadTextLimit]; + overheadTextColors = new int[overheadTextLimit]; + overheadTextEffects = new int[overheadTextLimit]; + overheadTextCyclesRemaining = new int[overheadTextLimit]; + overheadText = new String[overheadTextLimit]; + tileLastDrawnActor = new int[104][104]; + viewportDrawCount = 0; + viewportTempX = -1; + viewportTempY = -1; + mouseCrossX = 0; + mouseCrossY = 0; + mouseCrossState = 0; + mouseCrossColor = 0; + showMouseCross = true; + field512 = 0; + field513 = 0; + dragItemSlotSource = 0; + draggedWidgetX = 0; + draggedWidgetY = 0; + dragItemSlotDestination = 0; + field519 = false; + itemDragDuration = 0; + field521 = 0; + showLoadingMessages = true; + players = new Player[2048]; + localPlayerIndex = -1; + field525 = 0; + renderSelf = true; + drawPlayerNames = 0; + field528 = 0; + field627 = new int[1000]; + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; + playerMenuActions = new String[8]; + playerOptionsPriorities = new boolean[8]; + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; + combatTargetPlayerIndex = -1; + groundItems = new NodeDeque[4][104][104]; + pendingSpawns = new NodeDeque(); + projectiles = new NodeDeque(); + graphicsObjects = new NodeDeque(); + currentLevels = new int[25]; + levels = new int[25]; + experience = new int[25]; + leftClickOpensMenu = 0; + isMenuOpen = false; + menuOptionsCount = 0; + menuArguments1 = new int[500]; + menuArguments2 = new int[500]; + menuOpcodes = new int[500]; + menuIdentifiers = new int[500]; + menuActions = new String[500]; + menuTargets = new String[500]; + menuShiftClick = new boolean[500]; + followerOpsLowPriority = false; + shiftClickDrop = false; + tapToDrop = false; + showMouseOverText = true; + viewportX = -1; + viewportY = -1; + field648 = 0; + field559 = 50; + isItemSelected = 0; + selectedItemName = null; + isSpellSelected = false; + selectedSpellChildIndex = -1; + field564 = -1; + selectedSpellActionName = null; + selectedSpellName = null; + rootInterface = -1; + interfaceParents = new NodeHashTable(8); + field569 = 0; + field483 = -1; + chatEffects = 0; + field654 = 0; + meslayerContinueWidget = null; + runEnergy = 0; + weight = 0; + staffModLevel = 0; + followerIndex = -1; + playerMod = false; + viewportWidget = null; + clickedWidget = null; + clickedWidgetParent = null; + widgetClickX = 0; + widgetClickY = 0; + draggedOnWidget = null; + field585 = false; + field586 = -1; + field587 = -1; + field588 = false; + field678 = -1; + field676 = -1; + isDraggingWidget = false; + cycleCntr = 1; + changedVarps = new int[32]; + changedVarpCount = 0; + changedItemContainers = new int[32]; + field574 = 0; + changedSkills = new int[32]; + changedSkillsCount = 0; + field599 = new int[32]; + field600 = 0; + chatCycle = 0; + field609 = 0; + field603 = 0; + field604 = 0; + field605 = 0; + field606 = 0; + field479 = 0; + field516 = 0; + mouseWheelRotation = 0; + scriptEvents = new NodeDeque(); + field611 = new NodeDeque(); + field685 = new NodeDeque(); + widgetFlags = new NodeHashTable(512); + rootWidgetCount = 0; + field615 = -2; + field616 = new boolean[100]; + field617 = new boolean[100]; + field508 = new boolean[100]; + rootWidgetXs = new int[100]; + rootWidgetYs = new int[100]; + rootWidgetWidths = new int[100]; + rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field839 = 0L; // L: 566 + field624 = 0L; isResizable = true; - field725 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field626 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field642 = ""; + field629 = ""; crossWorldMessageIds = new long[100]; crossWorldMessageIdsIndex = 0; - field847 = 0; // L: 583 - field848 = new int[128]; - field786 = new int[128]; - field850 = -1L; + field450 = 0; + field633 = new int[128]; + field430 = new int[128]; + field635 = -1L; currentClanSettings = new ClanSettings[1]; currentClanChannels = new ClanChannel[1]; - field853 = -1; // L: 594 + field638 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; mapIcons = new SpritePixels[1000]; destinationX = 0; - destinationY = 0; // L: 600 + destinationY = 0; minimapState = 0; currentTrackGroupId = -1; - field862 = false; - soundEffectCount = 0; // L: 615 - soundEffectIds = new int[50]; // L: 616 - queuedSoundEffectLoops = new int[50]; // L: 617 - queuedSoundEffectDelays = new int[50]; // L: 618 - soundLocations = new int[50]; // L: 619 - soundEffects = new SoundEffect[50]; // L: 620 - isCameraLocked = false; // L: 622 - field871 = new boolean[5]; // L: 634 - field872 = new int[5]; // L: 635 - field873 = new int[5]; // L: 636 - field867 = new int[5]; // L: 637 - field875 = new int[5]; // L: 638 - field876 = 256; // L: 639 - field877 = 205; // L: 640 - zoomHeight = 256; // L: 641 - zoomWidth = 320; // L: 642 - field880 = 1; // L: 643 - field864 = 32767; // L: 644 - field881 = 1; // L: 645 - field690 = 32767; // L: 646 - viewportOffsetX = 0; // L: 647 - viewportOffsetY = 0; // L: 648 - viewportWidth = 0; // L: 649 - viewportHeight = 0; // L: 650 - viewportZoom = 0; // L: 651 - playerAppearance = new PlayerComposition(); // L: 653 - field890 = -1; // L: 654 - field902 = -1; // L: 655 - platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 657 - grandExchangeOffers = new GrandExchangeOffer[8]; // L: 659 - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 662 - field798 = -1; // L: 669 - archiveLoaders = new ArrayList(10); // L: 670 - archiveLoadersDone = 0; // L: 671 - field898 = 0; // L: 672 - field733 = new ApproximateRouteStrategy(); // L: 681 - field739 = new int[50]; // L: 682 - field631 = new int[50]; // L: 683 + field647 = false; + soundEffectCount = 0; + soundEffectIds = new int[50]; + queuedSoundEffectLoops = new int[50]; + queuedSoundEffectDelays = new int[50]; + soundLocations = new int[50]; + soundEffects = new SoundEffect[50]; + isCameraLocked = false; + field655 = new boolean[5]; + field436 = new int[5]; + field608 = new int[5]; + field658 = new int[5]; + field659 = new int[5]; + field660 = 256; + field631 = 205; + zoomHeight = 256; + zoomWidth = 320; + field472 = 1; + field542 = 32767; + field666 = 1; + field667 = 32767; + viewportOffsetX = 0; + viewportOffsetY = 0; + viewportWidth = 0; + viewportHeight = 0; + viewportZoom = 0; + playerAppearance = new PlayerComposition(); + field674 = -1; + field675 = -1; + platformInfoProvider = new DesktopPlatformInfoProvider(); + grandExchangeOffers = new GrandExchangeOffer[8]; + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); + field679 = -1; + archiveLoaders = new ArrayList(10); + archiveLoadersDone = 0; + field682 = 0; + field493 = new ApproximateRouteStrategy(); + field683 = new int[50]; + field665 = new int[50]; } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-95" - ) - @Export("resizeGame") - protected final void resizeGame() { - field839 = ClientPacket.currentTimeMillis() + 500L; // L: 4420 - this.resizeJS(); // L: 4421 - if (rootInterface != -1) { // L: 4422 - this.resizeRoot(true); - } - - } // L: 4423 - @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1587549695" + descriptor = "(B)V", + garbageValue = "-8" + ) + @Export("resizeGame") + protected final void resizeGame() { + field624 = UrlRequester.method2125() + 500L; + this.resizeJS(); + if (rootInterface != -1) { + this.resizeRoot(true); + } + + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-1" ) @Export("setUp") protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; // L: 898 - int[] var2 = new int[]{1000, 100, 500}; // L: 899 - if (var1 != null && var2 != null) { // L: 901 - class372.ByteArrayPool_alternativeSizes = var1; // L: 907 - WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 908 - Tiles.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 909 + int[] var1 = new int[]{20, 260, 10000}; + int[] var2 = new int[]{1000, 100, 500}; + if (var1 != null && var2 != null) { + ByteArrayPool.ByteArrayPool_alternativeSizes = var1; + class127.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; + ByteArrayPool.ByteArrayPool_arrays = new byte[var1.length][][]; - for (int var3 = 0; var3 < class372.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 910 - Tiles.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 911 + for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { + ByteArrayPool.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; } } else { - class372.ByteArrayPool_alternativeSizes = null; // L: 902 - WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts = null; // L: 903 - Tiles.ByteArrayPool_arrays = null; // L: 904 + ByteArrayPool.ByteArrayPool_alternativeSizes = null; + class127.ByteArrayPool_altSizeArrayCounts = null; + ByteArrayPool.ByteArrayPool_arrays = null; } - UserComparator7.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 914 - MouseRecorder.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 915 - UserComparator2.currentPort = UserComparator7.worldPort; // L: 916 - VarcInt.field1581 = class246.field2945; // L: 917 - class69.field568 = class246.field2944; // L: 918 - ModelData0.field2517 = class246.field2943; // L: 919 - Skills.field3175 = class246.field2946; // L: 920 - ArchiveDiskActionHandler.urlRequester = new UrlRequester(); // L: 921 - this.setUpKeyboard(); // L: 922 - this.setUpMouse(); // L: 923 - Projectile.mouseWheel = this.mouseWheel(); // L: 924 - WorldMapID.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 925 - class4.clientPreferences = VarpDefinition.method2715(); // L: 926 - this.setUpClipboard(); // L: 927 - UserComparator5.method2543(this, InvDefinition.null_string); // L: 928 - if (gameBuild != 0) { // L: 929 + WorldMapManager.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; + class4.js5Port = gameBuild == 0 ? 443 : worldId + 50000; + class290.currentPort = WorldMapManager.worldPort; + class282.field3634 = class247.field2941; + Varps.field2914 = class247.field2943; + class7.field25 = class247.field2940; + VertexNormal.field2498 = class247.field2942; + WorldMapManager.urlRequester = new UrlRequester(); + this.setUpKeyboard(); + this.setUpMouse(); + Canvas.mouseWheel = this.mouseWheel(); + class307.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + Decimator.clientPreferences = PcmPlayer.method497(); + this.setUpClipboard(); + class65.method1796(this, UserComparator10.null_string); + if (gameBuild != 0) { displayFps = true; } - WorldMapDecorationType.setWindowedMode(class4.clientPreferences.windowMode); // L: 930 - DevicePcmPlayerProvider.friendSystem = new FriendSystem(LoginScreenAnimation.loginType); // L: 931 - } // L: 932 + WorldMapLabelSize.setWindowedMode(Decimator.clientPreferences.windowMode); + Canvas.friendSystem = new FriendSystem(GraphicsObject.loginType); + } - @ObfuscatedName("aw") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2087654500" + garbageValue = "1217845372" ) @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 935 - this.doCycleJs5(); // L: 936 - class35.method422(); // L: 937 - Frames.method4257(); // L: 938 - class233.playPcmPlayers(); // L: 939 + ++cycle; + this.doCycleJs5(); + class268.method4925(); + + int var1; + try { + if (class234.musicPlayerStatus == 1) { + var1 = class234.midiPcmStream.method4474(); + if (var1 > 0 && class234.midiPcmStream.isReady()) { + var1 -= ClanChannel.pcmSampleLength; + if (var1 < 0) { + var1 = 0; + } + + class234.midiPcmStream.setPcmStreamVolume(var1); + } else { + class234.midiPcmStream.clear(); + class234.midiPcmStream.removeAll(); + if (class234.musicTrackArchive != null) { + class234.musicPlayerStatus = 2; + } else { + class234.musicPlayerStatus = 0; + } + + WorldMapLabel.musicTrack = null; + KitDefinition.soundCache = null; + } + } + } catch (Exception var66) { + var66.printStackTrace(); + class234.midiPcmStream.clear(); + class234.musicPlayerStatus = 0; + WorldMapLabel.musicTrack = null; + KitDefinition.soundCache = null; + class234.musicTrackArchive = null; + } + + class262.playPcmPlayers(); int var2; - synchronized(KeyHandler.KeyHandler_instance) { // L: 941 - ++KeyHandler.KeyHandler_idleCycles; // L: 942 - KeyHandler.field276 = KeyHandler.field277; // L: 943 - KeyHandler.field271 = 0; // L: 944 - KeyHandler.field274 = 0; // L: 945 - Arrays.fill(KeyHandler.field264, false); // L: 946 - Arrays.fill(KeyHandler.field265, false); // L: 947 - if (KeyHandler.field268 < 0) { // L: 948 - Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 949 - KeyHandler.field268 = KeyHandler.field267; // L: 950 + synchronized(KeyHandler.KeyHandler_instance) { + ++KeyHandler.KeyHandler_idleCycles; + KeyHandler.field57 = KeyHandler.field59; + KeyHandler.field35 = 0; + KeyHandler.field64 = 0; + Arrays.fill(KeyHandler.field46, false); + Arrays.fill(KeyHandler.field38, false); + if (KeyHandler.field50 < 0) { + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); + KeyHandler.field50 = KeyHandler.field49; } else { - while (KeyHandler.field267 != KeyHandler.field268) { // L: 953 - var2 = KeyHandler.field283[KeyHandler.field267]; // L: 954 - KeyHandler.field267 = KeyHandler.field267 + 1 & 127; // L: 955 - if (var2 < 0) { // L: 956 - var2 = ~var2; // L: 957 - if (KeyHandler.KeyHandler_pressedKeys[var2]) { // L: 958 - KeyHandler.KeyHandler_pressedKeys[var2] = false; // L: 959 - KeyHandler.field265[var2] = true; // L: 960 - KeyHandler.field273[KeyHandler.field274] = var2; // L: 961 - ++KeyHandler.field274; // L: 962 + while (KeyHandler.field50 != KeyHandler.field49) { + var2 = KeyHandler.field48[KeyHandler.field49]; + KeyHandler.field49 = KeyHandler.field49 + 1 & 127; + if (var2 < 0) { + var2 = ~var2; + if (KeyHandler.KeyHandler_pressedKeys[var2]) { + KeyHandler.KeyHandler_pressedKeys[var2] = false; + KeyHandler.field38[var2] = true; + KeyHandler.field55[KeyHandler.field64] = var2; + ++KeyHandler.field64; } } else { - if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field271 < KeyHandler.field257.length - 1) { // L: 966 - KeyHandler.field264[var2] = true; // L: 967 - KeyHandler.field257[++KeyHandler.field271 - 1] = var2; // L: 968 + if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field35 < KeyHandler.field53.length - 1) { + KeyHandler.field46[var2] = true; + KeyHandler.field53[++KeyHandler.field35 - 1] = var2; } - KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 970 + KeyHandler.KeyHandler_pressedKeys[var2] = true; } } } - if (KeyHandler.field271 > 0) { // L: 974 + if (KeyHandler.field35 > 0) { KeyHandler.KeyHandler_idleCycles = 0; } - KeyHandler.field277 = KeyHandler.field255; // L: 975 + KeyHandler.field59 = KeyHandler.field52; } - class34.method406(); // L: 978 - if (Projectile.mouseWheel != null) { // L: 979 - int var24 = Projectile.mouseWheel.useRotation(); // L: 980 - mouseWheelRotation = var24; // L: 981 + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; } - if (gameState == 0) { // L: 983 - class34.load(); // L: 984 - class26.method350(); // L: 985 - } else if (gameState == 5) { // L: 987 - class21.doCycleTitle(this); // L: 988 - class34.load(); // L: 989 - class26.method350(); // L: 990 - } else if (gameState != 10 && gameState != 11) { // L: 992 - if (gameState == 20) { // L: 993 - class21.doCycleTitle(this); // L: 994 - this.doCycleLoggedOut(); // L: 995 - } else if (gameState == 25) { // L: 997 - DynamicObject.method2099(false); // L: 998 - field618 = 0; // L: 999 - boolean var35 = true; // L: 1000 + if (Canvas.mouseWheel != null) { + var1 = Canvas.mouseWheel.useRotation(); + mouseWheelRotation = var1; + } - for (var2 = 0; var2 < UrlRequest.regionLandArchives.length; ++var2) { // L: 1001 - if (UrlRequester.regionMapArchiveIds[var2] != -1 && UrlRequest.regionLandArchives[var2] == null) { // L: 1002 1003 - UrlRequest.regionLandArchives[var2] = class4.archive5.takeFile(UrlRequester.regionMapArchiveIds[var2], 0); // L: 1004 - if (UrlRequest.regionLandArchives[var2] == null) { // L: 1005 - var35 = false; // L: 1006 - ++field618; // L: 1007 + if (gameState == 0) { + AbstractWorldMapIcon.load(); + Messages.clock.mark(); + + for (var1 = 0; var1 < 32; ++var1) { + GameEngine.graphicsTickTimes[var1] = 0L; + } + + for (var1 = 0; var1 < 32; ++var1) { + GameEngine.clientTickTimes[var1] = 0L; + } + + Skills.gameCyclesToDo = 0; + } else if (gameState == 5) { + ObjectComposition.doCycleTitle(this); + AbstractWorldMapIcon.load(); + Messages.clock.mark(); + + for (var1 = 0; var1 < 32; ++var1) { + GameEngine.graphicsTickTimes[var1] = 0L; + } + + for (var1 = 0; var1 < 32; ++var1) { + GameEngine.clientTickTimes[var1] = 0L; + } + + Skills.gameCyclesToDo = 0; + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + ObjectComposition.doCycleTitle(this); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + class231.method4431(false); + field459 = 0; + boolean var70 = true; + + for (var2 = 0; var2 < ClientPacket.regionLandArchives.length; ++var2) { + if (Huffman.regionMapArchiveIds[var2] != -1 && ClientPacket.regionLandArchives[var2] == null) { + ClientPacket.regionLandArchives[var2] = Skeleton.archive5.takeFile(Huffman.regionMapArchiveIds[var2], 0); + if (ClientPacket.regionLandArchives[var2] == null) { + var70 = false; + ++field459; } } - if (class286.regionLandArchiveIds[var2] != -1 && WorldMapDecorationType.regionMapArchives[var2] == null) { // L: 1011 1012 - WorldMapDecorationType.regionMapArchives[var2] = class4.archive5.takeFileEncrypted(class286.regionLandArchiveIds[var2], 0, class7.xteaKeys[var2]); // L: 1013 - if (WorldMapDecorationType.regionMapArchives[var2] == null) { // L: 1014 - var35 = false; // L: 1015 - ++field618; // L: 1016 + if (UserComparator6.regionLandArchiveIds[var2] != -1 && PlatformInfo.regionMapArchives[var2] == null) { + PlatformInfo.regionMapArchives[var2] = Skeleton.archive5.takeFileEncrypted(UserComparator6.regionLandArchiveIds[var2], 0, ScriptFrame.xteaKeys[var2]); + if (PlatformInfo.regionMapArchives[var2] == null) { + var70 = false; + ++field459; } } } - if (!var35) { // L: 1021 - field678 = 1; // L: 1022 + if (!var70) { + field463 = 1; } else { - field742 = 0; // L: 1025 - var35 = true; // L: 1026 + field461 = 0; + var70 = true; - int var4; int var5; - for (var2 = 0; var2 < UrlRequest.regionLandArchives.length; ++var2) { // L: 1027 - byte[] var3 = WorldMapDecorationType.regionMapArchives[var2]; // L: 1028 - if (var3 != null) { // L: 1029 - var4 = (UserComparator4.regions[var2] >> 8) * 64 - class15.baseX; // L: 1030 - var5 = (UserComparator4.regions[var2] & 255) * 64 - WorldMapSprite.baseY; // L: 1031 - if (isInInstance) { // L: 1032 - var4 = 10; // L: 1033 - var5 = 10; // L: 1034 + Buffer var9; + int var10; + int var11; + int var12; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var48; + for (var2 = 0; var2 < ClientPacket.regionLandArchives.length; ++var2) { + byte[] var3 = PlatformInfo.regionMapArchives[var2]; + if (var3 != null) { + var48 = (class234.regions[var2] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; + var5 = (class234.regions[var2] & 255) * 64 - NPC.baseY; + if (isInInstance) { + var48 = 10; + var5 = 10; } - var35 &= class69.method1222(var3, var4, var5); // L: 1036 + boolean var8 = true; + var9 = new Buffer(var3); + var10 = -1; + + label1339: + while (true) { + var11 = var9.method6880(); + if (var11 == 0) { + var70 &= var8; + break; + } + + var10 += var11; + var12 = 0; + boolean var13 = false; + + while (true) { + while (!var13) { + var14 = var9.readUShortSmart(); + if (var14 == 0) { + continue label1339; + } + + var12 += var14 - 1; + var15 = var12 & 63; + var16 = var12 >> 6 & 63; + var17 = var9.readUnsignedByte() >> 2; + var18 = var16 + var48; + var19 = var15 + var5; + if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { + ObjectComposition var20 = ClanChannel.getObjectDefinition(var10); + if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { + if (!var20.needsModelFiles()) { + ++field461; + var8 = false; + } + + var13 = true; + } + } + } + + var14 = var9.readUShortSmart(); + if (var14 == 0) { + break; + } + + var9.readUnsignedByte(); + } + } } } - if (!var35) { // L: 1039 - field678 = 2; // L: 1040 + if (!var70) { + field463 = 2; } else { - if (field678 != 0) { // L: 1043 - class143.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + if (field463 != 0) { + DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); } - class233.playPcmPlayers(); // L: 1044 - DevicePcmPlayerProvider.scene.clear(); // L: 1045 + class262.playPcmPlayers(); + WorldMapIcon_1.scene.clear(); - for (var2 = 0; var2 < 4; ++var2) { // L: 1046 + for (var2 = 0; var2 < 4; ++var2) { collisionMaps[var2].clear(); } - int var25; - for (var2 = 0; var2 < 4; ++var2) { // L: 1047 - for (var25 = 0; var25 < 104; ++var25) { // L: 1048 - for (var4 = 0; var4 < 104; ++var4) { // L: 1049 - Tiles.Tiles_renderFlags[var2][var25][var4] = 0; // L: 1050 + int var49; + for (var2 = 0; var2 < 4; ++var2) { + for (var49 = 0; var49 < 104; ++var49) { + for (var48 = 0; var48 < 104; ++var48) { + Tiles.Tiles_renderFlags[var2][var49][var48] = 0; } } } - class233.playPcmPlayers(); // L: 1054 - Tiles.Tiles_minPlane = 99; // L: 1056 - AccessFile.field4098 = new byte[4][104][104]; // L: 1057 - Tiles.field1111 = new byte[4][104][104]; // L: 1058 - class22.field186 = new byte[4][104][104]; // L: 1059 - class16.field132 = new byte[4][104][104]; // L: 1060 - Tiles.field1101 = new int[4][105][105]; // L: 1061 - class43.field307 = new byte[4][105][105]; // L: 1062 - NPC.field1328 = new int[105][105]; // L: 1063 - class230.Tiles_hue = new int[104]; // L: 1064 - Tiles.Tiles_saturation = new int[104]; // L: 1065 - AbstractByteArrayCopier.Tiles_lightness = new int[104]; // L: 1066 - WorldMapSectionType.Tiles_hueMultiplier = new int[104]; // L: 1067 - Tiles.field1095 = new int[104]; // L: 1068 - var2 = UrlRequest.regionLandArchives.length; // L: 1070 + class262.playPcmPlayers(); + Tiles.Tiles_minPlane = 99; + class339.field3936 = new byte[4][104][104]; + ChatChannel.field894 = new byte[4][104][104]; + Tiles.field915 = new byte[4][104][104]; + Tiles.field909 = new byte[4][104][104]; + class163.field1914 = new int[4][105][105]; + Huffman.field3113 = new byte[4][105][105]; + Tiles.field904 = new int[105][105]; + MenuAction.Tiles_hue = new int[104]; + Tiles.Tiles_saturation = new int[104]; + class256.Tiles_lightness = new int[104]; + class337.Tiles_hueMultiplier = new int[104]; + AttackOption.field1161 = new int[104]; + var2 = ClientPacket.regionLandArchives.length; - for (ObjectSound var33 = (ObjectSound)ObjectSound.objectSounds.last(); var33 != null; var33 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 1072 - if (var33.stream1 != null) { // L: 1073 - UserComparator7.pcmStreamMixer.removeSubStream(var33.stream1); // L: 1074 - var33.stream1 = null; // L: 1075 + for (ObjectSound var67 = (ObjectSound)ObjectSound.objectSounds.last(); var67 != null; var67 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var67.stream1 != null) { + TileItem.pcmStreamMixer.removeSubStream(var67.stream1); + var67.stream1 = null; } - if (var33.stream2 != null) { // L: 1077 - UserComparator7.pcmStreamMixer.removeSubStream(var33.stream2); // L: 1078 - var33.stream2 = null; // L: 1079 + if (var67.stream2 != null) { + TileItem.pcmStreamMixer.removeSubStream(var67.stream2); + var67.stream2 = null; } } - ObjectSound.objectSounds.clear(); // L: 1082 - DynamicObject.method2099(true); // L: 1084 - int var7; - int var8; - int var10; - int var11; - int var12; - int var13; - int var28; - if (!isInInstance) { // L: 1085 - var25 = 0; + ObjectSound.objectSounds.clear(); + class231.method4431(true); + int var6; + int var21; + int var22; + int var53; + int var73; + if (!isInInstance) { + byte[] var50; + for (var49 = 0; var49 < var2; ++var49) { + var48 = (class234.regions[var49] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; + var5 = (class234.regions[var49] & 255) * 64 - NPC.baseY; + var50 = ClientPacket.regionLandArchives[var49]; + if (var50 != null) { + class262.playPcmPlayers(); + Projectile.method1700(var50, var48, var5, MouseHandler.field136 * 8 - 48, class7.field26 * 8 - 48, collisionMaps); + } + } - label579: + for (var49 = 0; var49 < var2; ++var49) { + var48 = (class234.regions[var49] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; + var5 = (class234.regions[var49] & 255) * 64 - NPC.baseY; + var50 = ClientPacket.regionLandArchives[var49]; + if (var50 == null && class7.field26 < 800) { + class262.playPcmPlayers(); + WorldMapIcon_1.method3260(var48, var5, 64, 64); + } + } + + class231.method4431(true); + + for (var49 = 0; var49 < var2; ++var49) { + byte[] var4 = PlatformInfo.regionMapArchives[var49]; + if (var4 != null) { + var5 = (class234.regions[var49] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; + var6 = (class234.regions[var49] & 255) * 64 - NPC.baseY; + class262.playPcmPlayers(); + Scene var51 = WorldMapIcon_1.scene; + CollisionMap[] var52 = collisionMaps; + var9 = new Buffer(var4); + var10 = -1; + + while (true) { + var11 = var9.method6880(); + if (var11 == 0) { + break; + } + + var10 += var11; + var12 = 0; + + while (true) { + var73 = var9.readUShortSmart(); + if (var73 == 0) { + break; + } + + var12 += var73 - 1; + var14 = var12 & 63; + var15 = var12 >> 6 & 63; + var16 = var12 >> 12; + var17 = var9.readUnsignedByte(); + var18 = var17 >> 2; + var19 = var17 & 3; + var53 = var15 + var5; + var21 = var14 + var6; + if (var53 > 0 && var21 > 0 && var53 < 103 && var21 < 103) { + var22 = var16; + if ((Tiles.Tiles_renderFlags[1][var53][var21] & 2) == 2) { + var22 = var16 - 1; + } + + CollisionMap var23 = null; + if (var22 >= 0) { + var23 = var52[var22]; + } + + method1382(var16, var53, var21, var10, var19, var18, var51, var23); + } + } + } + } + } + } + + int var7; + int var54; + int var72; + if (isInInstance) { + var49 = 0; + + label1238: while (true) { - byte[] var6; - if (var25 >= var2) { - for (var25 = 0; var25 < var2; ++var25) { // L: 1114 - var4 = (UserComparator4.regions[var25] >> 8) * 64 - class15.baseX; // L: 1115 - var5 = (UserComparator4.regions[var25] & 255) * 64 - WorldMapSprite.baseY; // L: 1116 - var6 = UrlRequest.regionLandArchives[var25]; // L: 1117 - if (var6 == null && RouteStrategy.field1919 < 800) { // L: 1118 - class233.playPcmPlayers(); // L: 1119 - UrlRequest.method2520(var4, var5, 64, 64); // L: 1120 + if (var49 >= 4) { + for (var49 = 0; var49 < 13; ++var49) { + for (var48 = 0; var48 < 13; ++var48) { + var5 = instanceChunkTemplates[0][var49][var48]; + if (var5 == -1) { + WorldMapIcon_1.method3260(var49 * 8, var48 * 8, 8, 8); + } } } - DynamicObject.method2099(true); // L: 1123 - var25 = 0; + class231.method4431(true); + var49 = 0; while (true) { - if (var25 >= var2) { - break label579; + if (var49 >= 4) { + break label1238; } - byte[] var27 = WorldMapDecorationType.regionMapArchives[var25]; // L: 1125 - if (var27 != null) { // L: 1126 - var5 = (UserComparator4.regions[var25] >> 8) * 64 - class15.baseX; // L: 1127 - var28 = (UserComparator4.regions[var25] & 255) * 64 - WorldMapSprite.baseY; // L: 1128 - class233.playPcmPlayers(); // L: 1129 - Scene var29 = DevicePcmPlayerProvider.scene; // L: 1130 - CollisionMap[] var30 = collisionMaps; // L: 1131 - Buffer var34 = new Buffer(var27); // L: 1133 - var10 = -1; // L: 1134 + class262.playPcmPlayers(); - while (true) { - var11 = var34.method6628(); // L: 1136 - if (var11 == 0) { // L: 1137 + for (var48 = 0; var48 < 13; ++var48) { + for (var5 = 0; var5 < 13; ++var5) { + var6 = instanceChunkTemplates[var49][var48][var5]; + if (var6 != -1) { + var7 = var6 >> 24 & 3; + var72 = var6 >> 1 & 3; + var54 = var6 >> 14 & 1023; + var10 = var6 >> 3 & 2047; + var11 = (var54 / 8 << 8) + var10 / 8; + + for (var12 = 0; var12 < class234.regions.length; ++var12) { + if (class234.regions[var12] == var11 && PlatformInfo.regionMapArchives[var12] != null) { + class137.method2684(PlatformInfo.regionMapArchives[var12], var49, var48 * 8, var5 * 8, var7, (var54 & 7) * 8, (var10 & 7) * 8, var72, WorldMapIcon_1.scene, collisionMaps); + break; + } + } + } + } + } + + ++var49; + } + } + + class262.playPcmPlayers(); + + for (var48 = 0; var48 < 13; ++var48) { + for (var5 = 0; var5 < 13; ++var5) { + boolean var71 = false; + var7 = instanceChunkTemplates[var49][var48][var5]; + if (var7 != -1) { + var72 = var7 >> 24 & 3; + var54 = var7 >> 1 & 3; + var10 = var7 >> 14 & 1023; + var11 = var7 >> 3 & 2047; + var12 = (var10 / 8 << 8) + var11 / 8; + + for (var73 = 0; var73 < class234.regions.length; ++var73) { + if (class234.regions[var73] == var12 && ClientPacket.regionLandArchives[var73] != null) { + WorldMapRegion.method3469(ClientPacket.regionLandArchives[var73], var49, var48 * 8, var5 * 8, var72, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps); + var71 = true; break; } - - var10 += var11; // L: 1138 - var12 = 0; // L: 1139 - - while (true) { - var13 = var34.readUShortSmart(); // L: 1141 - if (var13 == 0) { // L: 1142 - break; - } - - var12 += var13 - 1; // L: 1143 - int var14 = var12 & 63; // L: 1144 - int var15 = var12 >> 6 & 63; // L: 1145 - int var16 = var12 >> 12; // L: 1146 - int var17 = var34.readUnsignedByte(); // L: 1147 - int var18 = var17 >> 2; // L: 1148 - int var19 = var17 & 3; // L: 1149 - int var20 = var5 + var15; // L: 1150 - int var21 = var14 + var28; // L: 1151 - if (var20 > 0 && var21 > 0 && var20 < 103 && var21 < 103) { // L: 1152 - int var22 = var16; // L: 1153 - if ((Tiles.Tiles_renderFlags[1][var20][var21] & 2) == 2) { // L: 1154 - var22 = var16 - 1; - } - - CollisionMap var23 = null; // L: 1155 - if (var22 >= 0) { // L: 1156 - var23 = var30[var22]; - } - - Player.method2258(var16, var20, var21, var10, var19, var18, var29, var23); // L: 1157 - } - } } } - ++var25; // L: 1124 + if (!var71) { + Language.method5236(var49, var48 * 8, var5 * 8); + } } } - var4 = (UserComparator4.regions[var25] >> 8) * 64 - class15.baseX; // L: 1087 - var5 = (UserComparator4.regions[var25] & 255) * 64 - WorldMapSprite.baseY; // L: 1088 - var6 = UrlRequest.regionLandArchives[var25]; // L: 1089 - if (var6 != null) { // L: 1090 - class233.playPcmPlayers(); // L: 1091 - var7 = class12.field111 * 8 - 48; // L: 1092 - var8 = RouteStrategy.field1919 * 8 - 48; // L: 1093 - CollisionMap[] var9 = collisionMaps; // L: 1094 - var10 = 0; - - label576: - while (true) { - if (var10 >= 4) { - Buffer var26 = new Buffer(var6); // L: 1103 - var11 = 0; - - while (true) { - if (var11 >= 4) { - break label576; - } - - for (var12 = 0; var12 < 64; ++var12) { // L: 1105 - for (var13 = 0; var13 < 64; ++var13) { // L: 1106 - Huffman.loadTerrain(var26, var11, var4 + var12, var13 + var5, var7, var8, 0); // L: 1107 - } - } - - ++var11; // L: 1104 - } - } - - for (var11 = 0; var11 < 64; ++var11) { // L: 1097 - for (var12 = 0; var12 < 64; ++var12) { // L: 1098 - if (var4 + var11 > 0 && var11 + var4 < 103 && var5 + var12 > 0 && var5 + var12 < 103) { // L: 1099 - int[] var10000 = var9[var10].flags[var4 + var11]; - var10000[var5 + var12] &= -16777217; - } - } - } - - ++var10; // L: 1096 - } - } - - ++var25; // L: 1086 + ++var49; } } - int var31; - if (isInInstance) { // L: 1165 - var25 = 0; + class231.method4431(true); + class262.playPcmPlayers(); + Scene var68 = WorldMapIcon_1.scene; + CollisionMap[] var69 = collisionMaps; - label512: - while (true) { - if (var25 >= 4) { - for (var25 = 0; var25 < 13; ++var25) { // L: 1208 - for (var4 = 0; var4 < 13; ++var4) { // L: 1209 - var5 = instanceChunkTemplates[0][var25][var4]; // L: 1210 - if (var5 == -1) { // L: 1211 - UrlRequest.method2520(var25 * 8, var4 * 8, 8, 8); // L: 1212 + for (var5 = 0; var5 < 4; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + for (var7 = 0; var7 < 104; ++var7) { + if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { + var72 = var5; + if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { + var72 = var5 - 1; + } + + if (var72 >= 0) { + var69[var72].setBlockedByFloor(var6, var7); + } + } + } + } + } + + Tiles.field913 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field913 < -8) { + Tiles.field913 = -8; + } + + if (Tiles.field913 > 8) { + Tiles.field913 = 8; + } + + Tiles.field899 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field899 < -16) { + Tiles.field899 = -16; + } + + if (Tiles.field899 > 16) { + Tiles.field899 = 16; + } + + int[] var10000; + for (var5 = 0; var5 < 4; ++var5) { + byte[][] var78 = Huffman.field3113[var5]; + var12 = (int)Math.sqrt(5100.0D); + var73 = var12 * 768 >> 8; + + int var55; + for (var14 = 1; var14 < 103; ++var14) { + for (var15 = 1; var15 < 103; ++var15) { + var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; + var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; + var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536)); + var19 = (var16 << 8) / var18; + var53 = 65536 / var18; + var21 = (var17 << 8) / var18; + var22 = (var21 * -50 + var19 * -50 + var53 * -10) / var73 + 96; + var55 = (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14 + 1] >> 3) + (var78[var15][var14] >> 1); + Tiles.field904[var15][var14] = var22 - var55; + } + } + + for (var14 = 0; var14 < 104; ++var14) { + MenuAction.Tiles_hue[var14] = 0; + Tiles.Tiles_saturation[var14] = 0; + class256.Tiles_lightness[var14] = 0; + class337.Tiles_hueMultiplier[var14] = 0; + AttackOption.field1161[var14] = 0; + } + + for (var14 = -5; var14 < 109; ++var14) { + for (var15 = 0; var15 < 104; ++var15) { + var16 = var14 + 5; + int var10002; + if (var16 >= 0 && var16 < 104) { + var17 = class339.field3936[var5][var16][var15] & 255; + if (var17 > 0) { + var19 = var17 - 1; + FloorUnderlayDefinition var74 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); + FloorUnderlayDefinition var56; + if (var74 != null) { + var56 = var74; + } else { + byte[] var57 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); + var74 = new FloorUnderlayDefinition(); + if (var57 != null) { + var74.decode(new Buffer(var57), var19); + } + + var74.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var74, (long)var19); + var56 = var74; } + + var10000 = MenuAction.Tiles_hue; + var10000[var15] += var56.hue; + var10000 = Tiles.Tiles_saturation; + var10000[var15] += var56.saturation; + var10000 = class256.Tiles_lightness; + var10000[var15] += var56.lightness; + var10000 = class337.Tiles_hueMultiplier; + var10000[var15] += var56.hueMultiplier; + var10002 = AttackOption.field1161[var15]++; } } - DynamicObject.method2099(true); // L: 1216 - var25 = 0; + var17 = var14 - 5; + if (var17 >= 0 && var17 < 104) { + var18 = class339.field3936[var5][var17][var15] & 255; + if (var18 > 0) { + var53 = var18 - 1; + FloorUnderlayDefinition var80 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var53); + FloorUnderlayDefinition var58; + if (var80 != null) { + var58 = var80; + } else { + byte[] var59 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var53); + var80 = new FloorUnderlayDefinition(); + if (var59 != null) { + var80.decode(new Buffer(var59), var53); + } - while (true) { - if (var25 >= 4) { - break label512; + var80.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var80, (long)var53); + var58 = var80; + } + + var10000 = MenuAction.Tiles_hue; + var10000[var15] -= var58.hue; + var10000 = Tiles.Tiles_saturation; + var10000[var15] -= var58.saturation; + var10000 = class256.Tiles_lightness; + var10000[var15] -= var58.lightness; + var10000 = class337.Tiles_hueMultiplier; + var10000[var15] -= var58.hueMultiplier; + var10002 = AttackOption.field1161[var15]--; + } + } + } + + if (var14 >= 1 && var14 < 103) { + var15 = 0; + var16 = 0; + var17 = 0; + var18 = 0; + var19 = 0; + + for (var53 = -5; var53 < 109; ++var53) { + var21 = var53 + 5; + if (var21 >= 0 && var21 < 104) { + var15 += MenuAction.Tiles_hue[var21]; + var16 += Tiles.Tiles_saturation[var21]; + var17 += class256.Tiles_lightness[var21]; + var18 += class337.Tiles_hueMultiplier[var21]; + var19 += AttackOption.field1161[var21]; } - class233.playPcmPlayers(); // L: 1218 + var22 = var53 - 5; + if (var22 >= 0 && var22 < 104) { + var15 -= MenuAction.Tiles_hue[var22]; + var16 -= Tiles.Tiles_saturation[var22]; + var17 -= class256.Tiles_lightness[var22]; + var18 -= class337.Tiles_hueMultiplier[var22]; + var19 -= AttackOption.field1161[var22]; + } - for (var4 = 0; var4 < 13; ++var4) { // L: 1219 - for (var5 = 0; var5 < 13; ++var5) { // L: 1220 - var28 = instanceChunkTemplates[var25][var4][var5]; // L: 1221 - if (var28 != -1) { // L: 1222 - var7 = var28 >> 24 & 3; // L: 1223 - var8 = var28 >> 1 & 3; // L: 1224 - var31 = var28 >> 14 & 1023; // L: 1225 - var10 = var28 >> 3 & 2047; // L: 1226 - var11 = (var31 / 8 << 8) + var10 / 8; // L: 1227 + if (var53 >= 1 && var53 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var53] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var53] & 16) == 0)) { + if (var5 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var5; + } - for (var12 = 0; var12 < UserComparator4.regions.length; ++var12) { // L: 1228 - if (UserComparator4.regions[var12] == var11 && WorldMapDecorationType.regionMapArchives[var12] != null) { // L: 1229 - class25.method337(WorldMapDecorationType.regionMapArchives[var12], var25, var4 * 8, var5 * 8, var7, (var31 & 7) * 8, (var10 & 7) * 8, var8, DevicePcmPlayerProvider.scene, collisionMaps); // L: 1230 - break; // L: 1231 + var55 = class339.field3936[var5][var14][var53] & 255; + int var24 = ChatChannel.field894[var5][var14][var53] & 255; + if (var55 > 0 || var24 > 0) { + int var25 = Tiles.Tiles_heights[var5][var14][var53]; + int var26 = Tiles.Tiles_heights[var5][var14 + 1][var53]; + int var27 = Tiles.Tiles_heights[var5][var14 + 1][var53 + 1]; + int var28 = Tiles.Tiles_heights[var5][var14][var53 + 1]; + int var29 = Tiles.field904[var14][var53]; + int var30 = Tiles.field904[var14 + 1][var53]; + int var31 = Tiles.field904[var14 + 1][var53 + 1]; + int var32 = Tiles.field904[var14][var53 + 1]; + int var33 = -1; + int var34 = -1; + int var35; + int var36; + int var37; + if (var55 > 0) { + var35 = var15 * 256 / var18; + var36 = var16 / var19; + var37 = var17 / var19; + var33 = SecureRandomCallable.hslToRgb(var35, var36, var37); + var35 = var35 + Tiles.field913 & 255; + var37 += Tiles.field899; + if (var37 < 0) { + var37 = 0; + } else if (var37 > 255) { + var37 = 255; + } + + var34 = SecureRandomCallable.hslToRgb(var35, var36, var37); + } + + FloorOverlayDefinition var38; + if (var5 > 0) { + boolean var76 = true; + if (var55 == 0 && Tiles.field915[var5][var14][var53] != 0) { + var76 = false; + } + + if (var24 > 0) { + var37 = var24 - 1; + var38 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var37); + FloorOverlayDefinition var60; + if (var38 != null) { + var60 = var38; + } else { + byte[] var39 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var37); + var38 = new FloorOverlayDefinition(); + if (var39 != null) { + var38.decode(new Buffer(var39), var37); + } + + var38.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var38, (long)var37); + var60 = var38; } + + if (!var60.hideUnderlay) { + var76 = false; + } + } + + if (var76 && var26 == var25 && var27 == var25 && var28 == var25) { + var10000 = class163.field1914[var5][var14]; + var10000[var53] |= 2340; + } + } + + var35 = 0; + if (var34 != -1) { + var35 = Rasterizer3D.Rasterizer3D_colorPalette[class52.method1652(var34, 96)]; + } + + if (var24 == 0) { + var68.addTile(var5, var14, var53, 0, 0, -1, var25, var26, var27, var28, class52.method1652(var33, var29), class52.method1652(var33, var30), class52.method1652(var33, var31), class52.method1652(var33, var32), 0, 0, 0, 0, var35, 0); + } else { + var36 = Tiles.field915[var5][var14][var53] + 1; + byte var77 = Tiles.field909[var5][var14][var53]; + int var61 = var24 - 1; + FloorOverlayDefinition var40 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var61); + if (var40 != null) { + var38 = var40; + } else { + byte[] var41 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var61); + var40 = new FloorOverlayDefinition(); + if (var41 != null) { + var40.decode(new Buffer(var41), var61); + } + + var40.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var40, (long)var61); + var38 = var40; + } + + int var62 = var38.texture; + int var42; + int var43; + int var44; + int var45; + if (var62 >= 0) { + var43 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var62); + var42 = -1; + } else if (var38.primaryRgb == 16711935) { + var42 = -2; + var62 = -1; + var43 = -2; + } else { + var42 = SecureRandomCallable.hslToRgb(var38.hue, var38.saturation, var38.lightness); + var44 = var38.hue + Tiles.field913 & 255; + var45 = var38.lightness + Tiles.field899; + if (var45 < 0) { + var45 = 0; + } else if (var45 > 255) { + var45 = 255; + } + + var43 = SecureRandomCallable.hslToRgb(var44, var38.saturation, var45); + } + + var44 = 0; + if (var43 != -2) { + var44 = Rasterizer3D.Rasterizer3D_colorPalette[GraphicsObject.method1638(var43, 96)]; + } + + if (var38.secondaryRgb != -1) { + var45 = var38.secondaryHue + Tiles.field913 & 255; + int var46 = var38.secondaryLightness + Tiles.field899; + if (var46 < 0) { + var46 = 0; + } else if (var46 > 255) { + var46 = 255; + } + + var43 = SecureRandomCallable.hslToRgb(var45, var38.secondarySaturation, var46); + var44 = Rasterizer3D.Rasterizer3D_colorPalette[GraphicsObject.method1638(var43, 96)]; + } + + var68.addTile(var5, var14, var53, var36, var77, var62, var25, var26, var27, var28, class52.method1652(var33, var29), class52.method1652(var33, var30), class52.method1652(var33, var31), class52.method1652(var33, var32), GraphicsObject.method1638(var42, var29), GraphicsObject.method1638(var42, var30), GraphicsObject.method1638(var42, var31), GraphicsObject.method1638(var42, var32), var35, var44); + } + } + } + } + } + } + + for (var14 = 1; var14 < 103; ++var14) { + for (var15 = 1; var15 < 103; ++var15) { + if ((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { + var53 = 0; + } else if (var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { + var53 = var5 - 1; + } else { + var53 = var5; + } + + var68.setTileMinPlane(var5, var15, var14, var53); + } + } + + class339.field3936[var5] = null; + ChatChannel.field894[var5] = null; + Tiles.field915[var5] = null; + Tiles.field909[var5] = null; + Huffman.field3113[var5] = null; + } + + var68.method4005(-50, -10, -50); + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { + var68.setLinkBelow(var5, var6); + } + } + } + + var5 = 1; + var6 = 2; + var7 = 4; + + for (var72 = 0; var72 < 4; ++var72) { + if (var72 > 0) { + var5 <<= 3; + var6 <<= 3; + var7 <<= 3; + } + + for (var54 = 0; var54 <= var72; ++var54) { + for (var10 = 0; var10 <= 104; ++var10) { + for (var11 = 0; var11 <= 104; ++var11) { + short var75; + if ((class163.field1914[var54][var11][var10] & var5) != 0) { + var12 = var10; + var73 = var10; + var14 = var54; + + for (var15 = var54; var12 > 0 && (class163.field1914[var54][var11][var12 - 1] & var5) != 0; --var12) { + } + + while (var73 < 104 && (class163.field1914[var54][var11][var73 + 1] & var5) != 0) { + ++var73; + } + + label923: + while (var14 > 0) { + for (var16 = var12; var16 <= var73; ++var16) { + if ((class163.field1914[var14 - 1][var11][var16] & var5) == 0) { + break label923; + } + } + + --var14; + } + + label912: + while (var15 < var72) { + for (var16 = var12; var16 <= var73; ++var16) { + if ((class163.field1914[var15 + 1][var11][var16] & var5) == 0) { + break label912; + } + } + + ++var15; + } + + var16 = (var73 - var12 + 1) * (var15 + 1 - var14); + if (var16 >= 8) { + var75 = 240; + var18 = Tiles.Tiles_heights[var15][var11][var12] - var75; + var19 = Tiles.Tiles_heights[var14][var11][var12]; + Scene.Scene_addOccluder(var72, 1, var11 * 128, var11 * 128, var12 * 128, var73 * 128 + 128, var18, var19); + + for (var53 = var14; var53 <= var15; ++var53) { + for (var21 = var12; var21 <= var73; ++var21) { + var10000 = class163.field1914[var53][var11]; + var10000[var21] &= ~var5; } } } } - ++var25; // L: 1217 - } - } + if ((class163.field1914[var54][var11][var10] & var6) != 0) { + var12 = var11; + var73 = var11; + var14 = var54; - class233.playPcmPlayers(); // L: 1167 + for (var15 = var54; var12 > 0 && (class163.field1914[var54][var12 - 1][var10] & var6) != 0; --var12) { + } - for (var4 = 0; var4 < 13; ++var4) { // L: 1168 - for (var5 = 0; var5 < 13; ++var5) { // L: 1169 - boolean var37 = false; // L: 1170 - var7 = instanceChunkTemplates[var25][var4][var5]; // L: 1171 - if (var7 != -1) { // L: 1172 - var8 = var7 >> 24 & 3; // L: 1173 - var31 = var7 >> 1 & 3; // L: 1174 - var10 = var7 >> 14 & 1023; // L: 1175 - var11 = var7 >> 3 & 2047; // L: 1176 - var12 = (var10 / 8 << 8) + var11 / 8; // L: 1177 + while (var73 < 104 && (class163.field1914[var54][var73 + 1][var10] & var6) != 0) { + ++var73; + } - for (var13 = 0; var13 < UserComparator4.regions.length; ++var13) { // L: 1178 - if (UserComparator4.regions[var13] == var12 && UrlRequest.regionLandArchives[var13] != null) { // L: 1179 - UserComparator6.method2580(UrlRequest.regionLandArchives[var13], var25, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var31, collisionMaps); // L: 1180 - var37 = true; // L: 1181 - break; // L: 1182 + label976: + while (var14 > 0) { + for (var16 = var12; var16 <= var73; ++var16) { + if ((class163.field1914[var14 - 1][var16][var10] & var6) == 0) { + break label976; + } + } + + --var14; + } + + label965: + while (var15 < var72) { + for (var16 = var12; var16 <= var73; ++var16) { + if ((class163.field1914[var15 + 1][var16][var10] & var6) == 0) { + break label965; + } + } + + ++var15; + } + + var16 = (var15 + 1 - var14) * (var73 - var12 + 1); + if (var16 >= 8) { + var75 = 240; + var18 = Tiles.Tiles_heights[var15][var12][var10] - var75; + var19 = Tiles.Tiles_heights[var14][var12][var10]; + Scene.Scene_addOccluder(var72, 2, var12 * 128, var73 * 128 + 128, var10 * 128, var10 * 128, var18, var19); + + for (var53 = var14; var53 <= var15; ++var53) { + for (var21 = var12; var21 <= var73; ++var21) { + var10000 = class163.field1914[var53][var21]; + var10000[var10] &= ~var6; + } } } } - if (!var37) { // L: 1186 - var8 = var25; // L: 1187 - var31 = var4 * 8; // L: 1188 - var10 = var5 * 8; // L: 1189 + if ((class163.field1914[var54][var11][var10] & var7) != 0) { + var12 = var11; + var73 = var11; + var14 = var10; - for (var11 = 0; var11 < 8; ++var11) { // L: 1191 - for (var12 = 0; var12 < 8; ++var12) { // L: 1192 - Tiles.Tiles_heights[var8][var11 + var31][var10 + var12] = 0; - } + for (var15 = var10; var14 > 0 && (class163.field1914[var54][var11][var14 - 1] & var7) != 0; --var14) { } - if (var31 > 0) { // L: 1194 - for (var11 = 1; var11 < 8; ++var11) { // L: 1195 - Tiles.Tiles_heights[var8][var31][var11 + var10] = Tiles.Tiles_heights[var8][var31 - 1][var11 + var10]; - } + while (var15 < 104 && (class163.field1914[var54][var11][var15 + 1] & var7) != 0) { + ++var15; } - if (var10 > 0) { // L: 1197 - for (var11 = 1; var11 < 8; ++var11) { // L: 1198 - Tiles.Tiles_heights[var8][var11 + var31][var10] = Tiles.Tiles_heights[var8][var11 + var31][var10 - 1]; + label1029: + while (var12 > 0) { + for (var16 = var14; var16 <= var15; ++var16) { + if ((class163.field1914[var54][var12 - 1][var16] & var7) == 0) { + break label1029; + } } + + --var12; } - if (var31 > 0 && Tiles.Tiles_heights[var8][var31 - 1][var10] != 0) { // L: 1200 - Tiles.Tiles_heights[var8][var31][var10] = Tiles.Tiles_heights[var8][var31 - 1][var10]; - } else if (var10 > 0 && Tiles.Tiles_heights[var8][var31][var10 - 1] != 0) { // L: 1201 - Tiles.Tiles_heights[var8][var31][var10] = Tiles.Tiles_heights[var8][var31][var10 - 1]; - } else if (var31 > 0 && var10 > 0 && Tiles.Tiles_heights[var8][var31 - 1][var10 - 1] != 0) { // L: 1202 - Tiles.Tiles_heights[var8][var31][var10] = Tiles.Tiles_heights[var8][var31 - 1][var10 - 1]; + label1018: + while (var73 < 104) { + for (var16 = var14; var16 <= var15; ++var16) { + if ((class163.field1914[var54][var73 + 1][var16] & var7) == 0) { + break label1018; + } + } + + ++var73; + } + + if ((var73 - var12 + 1) * (var15 - var14 + 1) >= 4) { + var16 = Tiles.Tiles_heights[var54][var12][var14]; + Scene.Scene_addOccluder(var72, 4, var12 * 128, var73 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); + + for (var17 = var12; var17 <= var73; ++var17) { + for (var18 = var14; var18 <= var15; ++var18) { + var10000 = class163.field1914[var54][var17]; + var10000[var18] &= ~var7; + } + } } } } } - - ++var25; // L: 1166 } } - DynamicObject.method2099(true); // L: 1239 - class233.playPcmPlayers(); // L: 1240 - class69.method1225(DevicePcmPlayerProvider.scene, collisionMaps); // L: 1241 - DynamicObject.method2099(true); // L: 1242 - var25 = Tiles.Tiles_minPlane; // L: 1243 - if (var25 > SoundSystem.Client_plane) { // L: 1244 - var25 = SoundSystem.Client_plane; + class231.method4431(true); + var5 = Tiles.Tiles_minPlane; + if (var5 > GrandExchangeEvent.Client_plane) { + var5 = GrandExchangeEvent.Client_plane; } - if (var25 < SoundSystem.Client_plane - 1) { // L: 1245 - var25 = SoundSystem.Client_plane - 1; + if (var5 < GrandExchangeEvent.Client_plane - 1) { + var5 = GrandExchangeEvent.Client_plane - 1; } - if (isLowDetail) { // L: 1246 - DevicePcmPlayerProvider.scene.init(Tiles.Tiles_minPlane); + if (isLowDetail) { + WorldMapIcon_1.scene.init(Tiles.Tiles_minPlane); } else { - DevicePcmPlayerProvider.scene.init(0); // L: 1247 + WorldMapIcon_1.scene.init(0); } - for (var4 = 0; var4 < 104; ++var4) { // L: 1248 - for (var5 = 0; var5 < 104; ++var5) { // L: 1249 - class26.updateItemPile(var4, var5); // L: 1250 + for (var6 = 0; var6 < 104; ++var6) { + for (var7 = 0; var7 < 104; ++var7) { + FriendSystem.updateItemPile(var6, var7); } } - class233.playPcmPlayers(); // L: 1253 - GraphicsObject.method2014(); // L: 1254 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1255 - PacketBufferNode var36; - if (class1.client.hasFrame()) { // L: 1256 - var36 = InterfaceParent.getPacketBufferNode(ClientPacket.field2574, packetWriter.isaacCipher); // L: 1258 - var36.packetBuffer.writeInt(1057001181); // L: 1259 - packetWriter.addNode(var36); // L: 1260 + class262.playPcmPlayers(); + class161.method3210(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var79; + if (Script.client.hasFrame()) { + var79 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2621, packetWriter.isaacCipher); + var79.packetBuffer.writeInt(1057001181); + packetWriter.addNode(var79); } - if (!isInInstance) { // L: 1262 - var4 = (class12.field111 - 6) / 8; // L: 1263 - var5 = (class12.field111 + 6) / 8; // L: 1264 - var28 = (RouteStrategy.field1919 - 6) / 8; // L: 1265 - var7 = (RouteStrategy.field1919 + 6) / 8; // L: 1266 + if (!isInInstance) { + var6 = (MouseHandler.field136 - 6) / 8; + var7 = (MouseHandler.field136 + 6) / 8; + var72 = (class7.field26 - 6) / 8; + var54 = (class7.field26 + 6) / 8; - for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { // L: 1267 - for (var31 = var28 - 1; var31 <= var7 + 1; ++var31) { // L: 1268 - if (var8 < var4 || var8 > var5 || var31 < var28 || var31 > var7) { // L: 1269 - class4.archive5.loadRegionFromName("m" + var8 + "_" + var31); // L: 1270 - class4.archive5.loadRegionFromName("l" + var8 + "_" + var31); // L: 1271 + for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { + for (var11 = var72 - 1; var11 <= var54 + 1; ++var11) { + if (var10 < var6 || var10 > var7 || var11 < var72 || var11 > var54) { + Skeleton.archive5.loadRegionFromName("m" + var10 + "_" + var11); + Skeleton.archive5.loadRegionFromName("l" + var10 + "_" + var11); } } } } - Projectile.updateGameState(30); // L: 1275 - class233.playPcmPlayers(); // L: 1276 - AccessFile.field4098 = null; // L: 1278 - Tiles.field1111 = null; // L: 1279 - class22.field186 = null; // L: 1280 - class16.field132 = null; // L: 1281 - Tiles.field1101 = null; // L: 1282 - class43.field307 = null; // L: 1283 - NPC.field1328 = null; // L: 1284 - class230.Tiles_hue = null; // L: 1285 - Tiles.Tiles_saturation = null; // L: 1286 - AbstractByteArrayCopier.Tiles_lightness = null; // L: 1287 - WorldMapSectionType.Tiles_hueMultiplier = null; // L: 1288 - Tiles.field1095 = null; // L: 1289 - var36 = InterfaceParent.getPacketBufferNode(ClientPacket.field2585, packetWriter.isaacCipher); // L: 1291 - packetWriter.addNode(var36); // L: 1292 - class26.method350(); // L: 1293 + class16.updateGameState(30); + class262.playPcmPlayers(); + class339.field3936 = null; + ChatChannel.field894 = null; + Tiles.field915 = null; + Tiles.field909 = null; + class163.field1914 = null; + Huffman.field3113 = null; + Tiles.field904 = null; + MenuAction.Tiles_hue = null; + Tiles.Tiles_saturation = null; + class256.Tiles_lightness = null; + class337.Tiles_hueMultiplier = null; + AttackOption.field1161 = null; + var79 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); + packetWriter.addNode(var79); + Messages.clock.mark(); + + for (var7 = 0; var7 < 32; ++var7) { + GameEngine.graphicsTickTimes[var7] = 0L; + } + + for (var7 = 0; var7 < 32; ++var7) { + GameEngine.clientTickTimes[var7] = 0L; + } + + Skills.gameCyclesToDo = 0; } } } } else { - class21.doCycleTitle(this); + ObjectComposition.doCycleTitle(this); } - if (gameState == 30) { // L: 1295 + if (gameState == 30) { this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 1296 + } else if (gameState == 40 || gameState == 45) { this.doCycleLoggedOut(); } - } // L: 1297 + } - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "49" + descriptor = "(ZI)V", + garbageValue = "-1475528453" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2 = RouteStrategy.method3252(); // L: 1300 - if (var2 && field862 && SoundCache.pcmPlayer0 != null) { // L: 1301 1302 - SoundCache.pcmPlayer0.tryDiscard(); + boolean var2 = GameEngine.method345(); + if (var2 && field647 && WorldMapDecoration.pcmPlayer0 != null) { + WorldMapDecoration.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field839 && ClientPacket.currentTimeMillis() > field839) { // L: 1304 1305 - WorldMapDecorationType.setWindowedMode(class302.getWindowedMode()); // L: 1306 + if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field624 && UrlRequester.method2125() > field624) { + WorldMapLabelSize.setWindowedMode(MusicPatch.getWindowedMode()); } int var3; - if (var1) { // L: 1309 - for (var3 = 0; var3 < 100; ++var3) { // L: 1310 - field831[var3] = true; + if (var1) { + for (var3 = 0; var3 < 100; ++var3) { + field616[var3] = true; } } - if (gameState == 0) { // L: 1312 + if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 1313 - NetFileRequest.drawTitle(class309.fontBold12, UserComparator10.fontPlain11, AbstractSocket.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 1314 - if (gameState == 20) { // L: 1315 - NetFileRequest.drawTitle(class309.fontBold12, UserComparator10.fontPlain11, AbstractSocket.fontPlain12); - } else if (gameState == 25) { // L: 1316 - if (field678 == 1) { // L: 1317 - if (field618 > field789) { // L: 1318 - field789 = field618; + } else if (gameState == 5) { + ModeWhere.drawTitle(TaskHandler.fontBold12, GrandExchangeOfferOwnWorldComparator.fontPlain11, WorldMapDecorationType.fontPlain12); + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + ModeWhere.drawTitle(TaskHandler.fontBold12, GrandExchangeOfferOwnWorldComparator.fontPlain11, WorldMapDecorationType.fontPlain12); + } else if (gameState == 25) { + if (field463 == 1) { + if (field459 > field460) { + field460 = field459; } - var3 = (field789 * 50 - field618 * 50) / field789; // L: 1319 - class143.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1320 - } else if (field678 == 2) { // L: 1322 - if (field742 > field677) { // L: 1323 - field677 = field742; + var3 = (field460 * 50 - field459 * 50) / field460; + DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); + } else if (field463 == 2) { + if (field461 > field549) { + field549 = field461; } - var3 = (field677 * 50 - field742 * 50) / field677 + 50; // L: 1324 - class143.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1325 + var3 = (field549 * 50 - field461 * 50) / field549 + 50; + DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); } else { - class143.drawLoadingMessage("Loading - please wait.", false); // L: 1327 + DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait.", false); } - } else if (gameState == 30) { // L: 1329 + } else if (gameState == 30) { this.drawLoggedIn(); - } else if (gameState == 40) { // L: 1330 - class143.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 1331 - class143.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { + DevicePcmPlayerProvider.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { + DevicePcmPlayerProvider.drawLoadingMessage("Please wait...", false); } } else { - NetFileRequest.drawTitle(class309.fontBold12, UserComparator10.fontPlain11, AbstractSocket.fontPlain12); // L: 1321 + ModeWhere.drawTitle(TaskHandler.fontBold12, GrandExchangeOfferOwnWorldComparator.fontPlain11, WorldMapDecorationType.fontPlain12); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1332 - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1333 - if (field712[var3]) { // L: 1334 - AbstractWorldMapData.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1335 - field712[var3] = false; // L: 1336 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { + for (var3 = 0; var3 < rootWidgetCount; ++var3) { + if (field617[var3]) { + class263.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); + field617[var3] = false; } } - } else if (gameState > 0) { // L: 1340 - AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 1341 + } else if (gameState > 0) { + class263.rasterProvider.drawFull(0, 0); - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1342 - field712[var3] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { + field617[var3] = false; } } - } // L: 1344 + } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1785168903" + descriptor = "(B)V", + garbageValue = "46" ) @Export("kill0") protected final void kill0() { - if (class20.varcs.hasUnwrittenChanges()) { // L: 1347 - class20.varcs.write(); + if (Decimator.varcs.hasUnwrittenChanges()) { + Decimator.varcs.write(); } - if (UrlRequester.mouseRecorder != null) { // L: 1348 - UrlRequester.mouseRecorder.isRunning = false; + if (class6.mouseRecorder != null) { + class6.mouseRecorder.isRunning = false; } - UrlRequester.mouseRecorder = null; // L: 1349 - packetWriter.close(); // L: 1350 - if (KeyHandler.KeyHandler_instance != null) { // L: 1352 - synchronized(KeyHandler.KeyHandler_instance) { // L: 1353 - KeyHandler.KeyHandler_instance = null; // L: 1354 - } // L: 1355 + class6.mouseRecorder = null; + packetWriter.close(); + ClientPacket.method4407(); + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; + } } - if (MouseHandler.MouseHandler_instance != null) { // L: 1359 - synchronized(MouseHandler.MouseHandler_instance) { // L: 1360 - MouseHandler.MouseHandler_instance = null; // L: 1361 - } // L: 1362 + Canvas.mouseWheel = null; + if (WorldMapDecoration.pcmPlayer0 != null) { + WorldMapDecoration.pcmPlayer0.shutdown(); } - Projectile.mouseWheel = null; // L: 1365 - if (SoundCache.pcmPlayer0 != null) { // L: 1366 - SoundCache.pcmPlayer0.shutdown(); + if (VarcInt.pcmPlayer1 != null) { + VarcInt.pcmPlayer1.shutdown(); } - if (UrlRequester.pcmPlayer1 != null) { // L: 1367 - UrlRequester.pcmPlayer1.shutdown(); - } - - if (NetCache.NetCache_socket != null) { // L: 1369 + if (NetCache.NetCache_socket != null) { NetCache.NetCache_socket.close(); } - GameObject.method4431(); // L: 1371 - if (ArchiveDiskActionHandler.urlRequester != null) { // L: 1372 - ArchiveDiskActionHandler.urlRequester.close(); // L: 1373 - ArchiveDiskActionHandler.urlRequester = null; // L: 1374 + Widget.method4799(); + if (WorldMapManager.urlRequester != null) { + WorldMapManager.urlRequester.close(); + WorldMapManager.urlRequester = null; } try { - JagexCache.JagexCache_dat2File.close(); // L: 1378 + JagexCache.JagexCache_dat2File.close(); - for (int var4 = 0; var4 < class24.idxCount; ++var4) { // L: 1379 - class369.JagexCache_idxFiles[var4].close(); + for (int var3 = 0; var3 < DevicePcmPlayerProvider.idxCount; ++var3) { + FriendsChat.JagexCache_idxFiles[var3].close(); } - JagexCache.JagexCache_idx255File.close(); // L: 1380 - JagexCache.JagexCache_randomDat.close(); // L: 1381 - } catch (Exception var7) { // L: 1383 + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var5) { } - } // L: 1385 + } - @ObfuscatedName("ae") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1888551887" + descriptor = "(B)V", + garbageValue = "-19" ) - protected final void vmethod1278() { - } // L: 690 + protected final void vmethod899() { + } public final void init() { try { - if (this.checkHost()) { // L: 696 - for (int var1 = 0; var1 <= 20; ++var1) { // L: 697 - String var2 = this.getParameter(Integer.toString(var1)); // L: 698 - if (var2 != null) { // L: 699 - switch(var1) { // L: 700 + if (this.checkHost()) { + for (int var1 = 0; var1 <= 20; ++var1) { + String var2 = this.getParameter(Integer.toString(var1)); + if (var2 != null) { + switch(var1) { case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 703 + useBufferedSocket = Integer.parseInt(var2) != 0; case 2: case 11: case 13: @@ -2315,273 +2880,168 @@ public final class Client extends GameEngine implements Usernamed { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 772 + if (var2.equalsIgnoreCase("true")) { isMembersWorld = true; } else { - isMembersWorld = false; // L: 773 + isMembersWorld = false; } break; case 4: - if (clientType == -1) { // L: 749 - clientType = Integer.parseInt(var2); // L: 750 + if (clientType == -1) { + clientType = Integer.parseInt(var2); } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 723 - break; // L: 724 + worldProperties = Integer.parseInt(var2); + break; case 6: - AbstractArchive.clientLanguage = Language.method5269(Integer.parseInt(var2)); // L: 708 - break; // L: 709 + GrandExchangeOfferWorldComparator.clientLanguage = Language.method5215(Integer.parseInt(var2)); + break; case 7: - WorldMapDecoration.field2084 = ReflectionCheck.method1228(Integer.parseInt(var2)); // L: 756 - break; // L: 757 + int var4 = Integer.parseInt(var2); + GameBuild[] var5 = Tiles.method1769(); + int var6 = 0; + + GameBuild var3; + while (true) { + if (var6 >= var5.length) { + var3 = null; + break; + } + + GameBuild var7 = var5[var6]; + if (var4 == var7.buildId) { + var3 = var7; + break; + } + + ++var6; + } + + FaceNormal.field2349 = var3; + break; case 8: - if (var2.equalsIgnoreCase("true")) { // L: 761 + if (var2.equalsIgnoreCase("true")) { } break; case 9: - Messages.field1397 = var2; // L: 718 - break; // L: 719 + SpotAnimationDefinition.field1660 = var2; + break; case 10: - StudioGame[] var3 = new StudioGame[]{StudioGame.stellardawn, StudioGame.game3, StudioGame.game4, StudioGame.runescape, StudioGame.game5, StudioGame.oldscape}; // L: 735 - class182.field2114 = (StudioGame)Clock.findEnumerated(var3, Integer.parseInt(var2)); // L: 737 - if (class182.field2114 == StudioGame.oldscape) { // L: 738 - LoginScreenAnimation.loginType = LoginType.oldscape; + MouseRecorder.field975 = (StudioGame)Huffman.findEnumerated(ViewportMouse.method4318(), Integer.parseInt(var2)); + if (MouseRecorder.field975 == StudioGame.oldscape) { + GraphicsObject.loginType = LoginType.oldscape; } else { - LoginScreenAnimation.loginType = LoginType.field4089; // L: 739 + GraphicsObject.loginType = LoginType.field4121; } break; case 12: - worldId = Integer.parseInt(var2); // L: 744 - break; // L: 745 + worldId = Integer.parseInt(var2); + break; case 14: - class82.field999 = Integer.parseInt(var2); // L: 713 - break; // L: 714 + class407.field4313 = Integer.parseInt(var2); + break; case 15: - gameBuild = Integer.parseInt(var2); // L: 767 - break; // L: 768 + gameBuild = Integer.parseInt(var2); + break; case 17: - class162.field1936 = var2; // L: 728 + ByteArrayPool.field3775 = var2; } } } - Scene.Scene_isLowDetail = false; // L: 780 - isLowDetail = false; // L: 781 - worldHost = this.getCodeBase().getHost(); // L: 783 - String var11 = WorldMapDecoration.field2084.name; // L: 784 - byte var12 = 0; // L: 785 + Huffman.method4834(); + Varps.worldHost = this.getCodeBase().getHost(); + String var8 = FaceNormal.field2349.name; + byte var9 = 0; try { - class24.idxCount = 21; // L: 788 - ClanChannel.cacheGamebuild = var12; // L: 789 - - try { - class23.operatingSystemName = System.getProperty("os.name"); // L: 791 - } catch (Exception var20) { // L: 793 - class23.operatingSystemName = "Unknown"; // L: 794 - } - - GraphicsObject.formattedOperatingSystemName = class23.operatingSystemName.toLowerCase(); // L: 796 - - try { - JagexCache.userHomeDirectory = System.getProperty("user.home"); // L: 798 - if (JagexCache.userHomeDirectory != null) { // L: 799 - JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/"; - } - } catch (Exception var19) { // L: 801 - } - - try { - if (GraphicsObject.formattedOperatingSystemName.startsWith("win")) { // L: 803 - if (JagexCache.userHomeDirectory == null) { // L: 804 - JagexCache.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (JagexCache.userHomeDirectory == null) { // L: 807 - JagexCache.userHomeDirectory = System.getenv("HOME"); - } - - if (JagexCache.userHomeDirectory != null) { // L: 809 - JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/"; - } - } catch (Exception var18) { // L: 811 - } - - if (JagexCache.userHomeDirectory == null) { // L: 812 - JagexCache.userHomeDirectory = "~/"; - } - - ArchiveLoader.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", JagexCache.userHomeDirectory, "/tmp/", ""}; // L: 813 - JagexCache.cacheSubPaths = new String[]{".jagex_cache_" + ClanChannel.cacheGamebuild, ".file_store_" + ClanChannel.cacheGamebuild}; // L: 814 - - int var13; - label176: - for (var13 = 0; var13 < 4; ++var13) { // L: 815 - WorldMapDecoration.cacheDir = Renderable.method4244("oldschool", var11, var13); // L: 816 - if (!WorldMapDecoration.cacheDir.exists()) { // L: 817 - WorldMapDecoration.cacheDir.mkdirs(); - } - - File[] var4 = WorldMapDecoration.cacheDir.listFiles(); // L: 818 - if (var4 == null) { // L: 819 - break; - } - - File[] var5 = var4; // L: 821 - int var6 = 0; - - while (true) { - if (var6 >= var5.length) { - break label176; - } - - File var7 = var5[var6]; // L: 823 - - boolean var8; - try { - RandomAccessFile var9 = new RandomAccessFile(var7, "rw"); // L: 828 - int var10 = var9.read(); // L: 829 - var9.seek(0L); // L: 830 - var9.write(var10); // L: 831 - var9.seek(0L); // L: 832 - var9.close(); // L: 833 - var8 = true; // L: 835 - } catch (Exception var17) { // L: 837 - var8 = false; // L: 838 - } - - if (!var8) { // L: 841 - break; - } - - ++var6; // L: 822 - } - } - - class26.method344(WorldMapDecoration.cacheDir); // L: 848 - - try { - File var24 = new File(JagexCache.userHomeDirectory, "random.dat"); // L: 851 - int var15; - if (var24.exists()) { // L: 852 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var24, "rw", 25L), 24, 0); // L: 853 - } else { - label155: - for (int var14 = 0; var14 < JagexCache.cacheSubPaths.length; ++var14) { // L: 856 - for (var15 = 0; var15 < ArchiveLoader.cacheParentPaths.length; ++var15) { // L: 857 - File var16 = new File(ArchiveLoader.cacheParentPaths[var15] + JagexCache.cacheSubPaths[var14] + File.separatorChar + "random.dat"); // L: 858 - if (var16.exists()) { // L: 859 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); // L: 860 - break label155; // L: 861 - } - } - } - } - - if (JagexCache.JagexCache_randomDat == null) { // L: 866 - RandomAccessFile var25 = new RandomAccessFile(var24, "rw"); // L: 867 - var15 = var25.read(); // L: 868 - var25.seek(0L); // L: 869 - var25.write(var15); // L: 870 - var25.seek(0L); // L: 871 - var25.close(); // L: 872 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var24, "rw", 25L), 24, 0); // L: 873 - } - } catch (IOException var21) { // L: 876 - } - - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(FloorUnderlayDefinition.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 878 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(FloorUnderlayDefinition.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 879 - class369.JagexCache_idxFiles = new BufferedFile[class24.idxCount]; // L: 880 - - for (var13 = 0; var13 < class24.idxCount; ++var13) { // L: 881 - class369.JagexCache_idxFiles[var13] = new BufferedFile(new AccessFile(FloorUnderlayDefinition.getFile("main_file_cache.idx" + var13), "rw", 1048576L), 6000, 0); // L: 882 - } - } catch (Exception var22) { // L: 886 - FriendsChat.RunException_sendStackTrace((String)null, var22); // L: 887 + WallDecoration.method4338("oldschool", var8, var9, 21); + } catch (Exception var10) { + BufferedSink.RunException_sendStackTrace((String)null, var10); } - class1.client = this; // L: 889 - GZipDecompressor.clientType = clientType; // L: 890 - if (field625 == -1) { // L: 891 - field625 = 0; // L: 892 + Script.client = this; + UserComparator6.clientType = clientType; + if (field473 == -1) { + field473 = 0; } - this.startThread(765, 503, 197); // L: 894 + this.startThread(765, 503, 198); } - } catch (RuntimeException var23) { - throw Timer.newRunException(var23, "client.init(" + ')'); + } catch (RuntimeException var11) { + throw class377.newRunException(var11, "client.init(" + ')'); } - } // L: 895 + } - @ObfuscatedName("fm") + @ObfuscatedName("et") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "80" + garbageValue = "-14" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { // L: 1444 - long var2 = ClientPacket.currentTimeMillis(); // L: 1447 - int var4 = (int)(var2 - NetCache.field3604); // L: 1448 - NetCache.field3604 = var2; // L: 1449 - if (var4 > 200) { // L: 1450 + if (gameState != 1000) { + long var2 = UrlRequester.method2125(); + int var4 = (int)(var2 - NetCache.field3596); + NetCache.field3596 = var2; + if (var4 > 200) { var4 = 200; } - NetCache.NetCache_loadTime += var4; // L: 1451 + NetCache.NetCache_loadTime += var4; boolean var1; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1452 - var1 = true; // L: 1453 - } else if (NetCache.NetCache_socket == null) { // L: 1456 - var1 = false; // L: 1457 + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { + var1 = true; + } else if (NetCache.NetCache_socket == null) { + var1 = false; } else { try { - label241: { - if (NetCache.NetCache_loadTime > 30000) { // L: 1461 + label242: { + if (NetCache.NetCache_loadTime > 30000) { throw new IOException(); } NetFileRequest var5; Buffer var6; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1462 - var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1463 - var6 = new Buffer(4); // L: 1464 - var6.writeByte(1); // L: 1465 - var6.writeMedium((int)var5.key); // L: 1466 - NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1467 - NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1468 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 1469 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1470 + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); + var6 = new Buffer(4); + var6.writeByte(1); + var6.writeMedium((int)var5.key); + NetCache.NetCache_socket.write(var6.array, 0, 4); + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); + --NetCache.NetCache_pendingPriorityWritesCount; + ++NetCache.NetCache_pendingPriorityResponsesCount; } - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1472 - var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1473 - var6 = new Buffer(4); // L: 1474 - var6.writeByte(0); // L: 1475 - var6.writeMedium((int)var5.key); // L: 1476 - NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1477 - var5.removeDual(); // L: 1478 - NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1479 - --NetCache.NetCache_pendingWritesCount; // L: 1480 - ++NetCache.NetCache_pendingResponsesCount; // L: 1481 + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); + var6 = new Buffer(4); + var6.writeByte(0); + var6.writeMedium((int)var5.key); + NetCache.NetCache_socket.write(var6.array, 0, 4); + var5.removeDual(); + NetCache.NetCache_pendingResponses.put(var5, var5.key); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingResponsesCount; } - for (int var17 = 0; var17 < 100; ++var17) { // L: 1483 - int var18 = NetCache.NetCache_socket.available(); // L: 1484 - if (var18 < 0) { // L: 1485 + for (int var17 = 0; var17 < 100; ++var17) { + int var18 = NetCache.NetCache_socket.available(); + if (var18 < 0) { throw new IOException(); } - if (var18 == 0) { // L: 1486 + if (var18 == 0) { break; } - NetCache.NetCache_loadTime = 0; // L: 1487 - byte var7 = 0; // L: 1488 - if (class34.NetCache_currentResponse == null) { // L: 1489 + NetCache.NetCache_loadTime = 0; + byte var7 = 0; + if (NetCache.NetCache_currentResponse == null) { var7 = 8; - } else if (NetCache.field3615 == 0) { // L: 1490 + } else if (NetCache.field3608 == 0) { var7 = 1; } @@ -2592,3596 +3052,4124 @@ public final class Client extends GameEngine implements Usernamed { byte[] var10000; int var10001; Buffer var25; - if (var7 > 0) { // L: 1491 - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1492 - if (var8 > var18) { // L: 1493 + if (var7 > 0) { + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; + if (var8 > var18) { var8 = var18; } - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1494 - if (NetCache.field3618 != 0) { // L: 1495 - for (var9 = 0; var9 < var8; ++var9) { // L: 1496 + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); + if (NetCache.field3612 != 0) { + for (var9 = 0; var9 < var8; ++var9) { var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3618; + var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var9; + var10000[var10001] ^= NetCache.field3612; } } - var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1498 + var25 = NetCache.NetCache_responseHeaderBuffer; var25.offset += var8; - if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1499 + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { break; } - if (class34.NetCache_currentResponse == null) { // L: 1500 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1501 - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1502 - var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1503 - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1504 - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1505 - long var13 = (long)(var10 + (var9 << 16)); // L: 1506 - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1507 - class266.field3222 = true; // L: 1508 - if (var15 == null) { // L: 1509 - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1510 - class266.field3222 = false; // L: 1511 + if (NetCache.NetCache_currentResponse == null) { + NetCache.NetCache_responseHeaderBuffer.offset = 0; + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var13 = (long)(var10 + (var9 << 16)); + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); + Script.field877 = true; + if (var15 == null) { + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); + Script.field877 = false; } - if (var15 == null) { // L: 1513 - throw new IOException(); // L: 1514 + if (var15 == null) { + throw new IOException(); } - int var16 = var11 == 0 ? 5 : 9; // L: 1516 - class34.NetCache_currentResponse = var15; // L: 1517 - class254.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + class34.NetCache_currentResponse.padding); // L: 1518 - class254.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1519 - class254.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1520 - NetCache.field3615 = 8; // L: 1521 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1522 - } else if (NetCache.field3615 == 0) { // L: 1525 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1526 - NetCache.field3615 = 1; // L: 1527 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1528 + int var16 = var11 == 0 ? 5 : 9; + NetCache.NetCache_currentResponse = var15; + UserComparator9.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + NetCache.NetCache_currentResponse.padding); + UserComparator9.NetCache_responseArchiveBuffer.writeByte(var11); + UserComparator9.NetCache_responseArchiveBuffer.writeInt(var12); + NetCache.field3608 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3608 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3608 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; } else { - class34.NetCache_currentResponse = null; // L: 1532 + NetCache.NetCache_currentResponse = null; } } } else { - var8 = class254.NetCache_responseArchiveBuffer.array.length - class34.NetCache_currentResponse.padding; // L: 1538 - var9 = 512 - NetCache.field3615; // L: 1539 - if (var9 > var8 - class254.NetCache_responseArchiveBuffer.offset) { // L: 1540 - var9 = var8 - class254.NetCache_responseArchiveBuffer.offset; + var8 = UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; + var9 = 512 - NetCache.field3608; + if (var9 > var8 - UserComparator9.NetCache_responseArchiveBuffer.offset) { + var9 = var8 - UserComparator9.NetCache_responseArchiveBuffer.offset; } - if (var9 > var18) { // L: 1541 + if (var9 > var18) { var9 = var18; } - NetCache.NetCache_socket.read(class254.NetCache_responseArchiveBuffer.array, class254.NetCache_responseArchiveBuffer.offset, var9); // L: 1542 - if (NetCache.field3618 != 0) { // L: 1543 - for (var10 = 0; var10 < var9; ++var10) { // L: 1544 - var10000 = class254.NetCache_responseArchiveBuffer.array; - var10001 = var10 + class254.NetCache_responseArchiveBuffer.offset; - var10000[var10001] ^= NetCache.field3618; + NetCache.NetCache_socket.read(UserComparator9.NetCache_responseArchiveBuffer.array, UserComparator9.NetCache_responseArchiveBuffer.offset, var9); + if (NetCache.field3612 != 0) { + for (var10 = 0; var10 < var9; ++var10) { + var10000 = UserComparator9.NetCache_responseArchiveBuffer.array; + var10001 = var10 + UserComparator9.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3612; } } - var25 = class254.NetCache_responseArchiveBuffer; // L: 1546 + var25 = UserComparator9.NetCache_responseArchiveBuffer; var25.offset += var9; - NetCache.field3615 += var9; // L: 1547 - if (var8 == class254.NetCache_responseArchiveBuffer.offset) { // L: 1548 - if (16711935L == class34.NetCache_currentResponse.key) { // L: 1549 - UserComparator6.NetCache_reference = class254.NetCache_responseArchiveBuffer; // L: 1550 + NetCache.field3608 += var9; + if (var8 == UserComparator9.NetCache_responseArchiveBuffer.offset) { + if (NetCache.NetCache_currentResponse.key == 16711935L) { + NetCache.NetCache_reference = UserComparator9.NetCache_responseArchiveBuffer; - for (var10 = 0; var10 < 256; ++var10) { // L: 1551 - Archive var19 = NetCache.NetCache_archives[var10]; // L: 1552 - if (var19 != null) { // L: 1553 - UserComparator6.NetCache_reference.offset = var10 * 8 + 5; // L: 1554 - var12 = UserComparator6.NetCache_reference.readInt(); // L: 1555 - int var20 = UserComparator6.NetCache_reference.readInt(); // L: 1556 - var19.loadIndex(var12, var20); // L: 1557 + for (var10 = 0; var10 < 256; ++var10) { + Archive var19 = NetCache.NetCache_archives[var10]; + if (var19 != null) { + NetCache.NetCache_reference.offset = var10 * 8 + 5; + var12 = NetCache.NetCache_reference.readInt(); + int var20 = NetCache.NetCache_reference.readInt(); + var19.loadIndex(var12, var20); } } } else { - NetCache.NetCache_crc.reset(); // L: 1562 - NetCache.NetCache_crc.update(class254.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1563 - var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1564 - if (var10 != class34.NetCache_currentResponse.crc) { // L: 1565 + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(UserComparator9.NetCache_responseArchiveBuffer.array, 0, var8); + var10 = (int)NetCache.NetCache_crc.getValue(); + if (var10 != NetCache.NetCache_currentResponse.crc) { try { - NetCache.NetCache_socket.close(); // L: 1567 - } catch (Exception var23) { // L: 1569 + NetCache.NetCache_socket.close(); + } catch (Exception var23) { } - ++NetCache.NetCache_crcMismatches; // L: 1570 - NetCache.NetCache_socket = null; // L: 1571 - NetCache.field3618 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1572 - var1 = false; // L: 1573 - break label241; + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3612 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + var1 = false; + break label242; } - NetCache.NetCache_crcMismatches = 0; // L: 1576 - NetCache.NetCache_ioExceptions = 0; // L: 1577 - class34.NetCache_currentResponse.archive.write((int)(class34.NetCache_currentResponse.key & 65535L), class254.NetCache_responseArchiveBuffer.array, (class34.NetCache_currentResponse.key & 16711680L) == 16711680L, class266.field3222); // L: 1578 + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), UserComparator9.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, Script.field877); } - class34.NetCache_currentResponse.remove(); // L: 1580 - if (class266.field3222) { // L: 1581 + NetCache.NetCache_currentResponse.remove(); + if (Script.field877) { --NetCache.NetCache_pendingPriorityResponsesCount; } else { - --NetCache.NetCache_pendingResponsesCount; // L: 1582 + --NetCache.NetCache_pendingResponsesCount; } - NetCache.field3615 = 0; // L: 1583 - class34.NetCache_currentResponse = null; // L: 1584 - class254.NetCache_responseArchiveBuffer = null; // L: 1585 + NetCache.field3608 = 0; + NetCache.NetCache_currentResponse = null; + UserComparator9.NetCache_responseArchiveBuffer = null; } else { - if (NetCache.field3615 != 512) { // L: 1587 + if (NetCache.field3608 != 512) { break; } - NetCache.field3615 = 0; + NetCache.field3608 = 0; } } } - var1 = true; // L: 1591 + var1 = true; } } catch (IOException var24) { try { - NetCache.NetCache_socket.close(); // L: 1595 - } catch (Exception var22) { // L: 1597 + NetCache.NetCache_socket.close(); + } catch (Exception var22) { } - ++NetCache.NetCache_ioExceptions; // L: 1598 - NetCache.NetCache_socket = null; // L: 1599 - var1 = false; // L: 1600 + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + var1 = false; } } - if (!var1) { // L: 1604 + if (!var1) { this.doCycleJs5Connect(); } } - } // L: 1605 + } - @ObfuscatedName("fl") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1568310172" + descriptor = "(B)V", + garbageValue = "-42" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1608 - this.error("js5crc"); // L: 1609 - gameState = 1000; // L: 1610 + if (NetCache.NetCache_crcMismatches >= 4) { + this.error("js5crc"); + gameState = 1000; } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 1613 - if (gameState <= 5) { // L: 1614 - this.error("js5io"); // L: 1615 - gameState = 1000; // L: 1616 - return; // L: 1617 + if (NetCache.NetCache_ioExceptions >= 4) { + if (gameState <= 5) { + this.error("js5io"); + gameState = 1000; + return; } - field800 = 3000; // L: 1620 - NetCache.NetCache_ioExceptions = 3; // L: 1621 + field435 = 3000; + NetCache.NetCache_ioExceptions = 3; } - if (--field800 + 1 <= 0) { // L: 1624 + if (--field435 + 1 <= 0) { try { - if (js5ConnectState == 0) { // L: 1626 - Buddy.js5SocketTask = GameEngine.taskHandler.newSocketTask(worldHost, UserComparator2.currentPort); // L: 1627 - ++js5ConnectState; // L: 1628 + if (js5ConnectState == 0) { + MusicPatchPcmStream.js5SocketTask = GameEngine.taskHandler.newSocketTask(Varps.worldHost, class290.currentPort); + ++js5ConnectState; } - if (js5ConnectState == 1) { // L: 1630 - if (Buddy.js5SocketTask.status == 2) { // L: 1631 - this.js5Error(-1); // L: 1632 - return; // L: 1633 + if (js5ConnectState == 1) { + if (MusicPatchPcmStream.js5SocketTask.status == 2) { + this.js5Error(-1); + return; } - if (Buddy.js5SocketTask.status == 1) { // L: 1635 + if (MusicPatchPcmStream.js5SocketTask.status == 1) { ++js5ConnectState; } } - if (js5ConnectState == 2) { // L: 1637 - if (useBufferedSocket) { // L: 1638 - BoundaryObject.js5Socket = PcmPlayer.method897((Socket)Buddy.js5SocketTask.result, 40000, 5000); // L: 1639 + if (js5ConnectState == 2) { + if (useBufferedSocket) { + Socket var2 = (Socket)MusicPatchPcmStream.js5SocketTask.result; + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); + Messages.js5Socket = var1; } else { - BoundaryObject.js5Socket = new NetSocket((Socket)Buddy.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1642 + Messages.js5Socket = new NetSocket((Socket)MusicPatchPcmStream.js5SocketTask.result, GameEngine.taskHandler, 5000); } - Buffer var1 = new Buffer(5); // L: 1644 - var1.writeByte(15); // L: 1645 - var1.writeInt(197); // L: 1646 - BoundaryObject.js5Socket.write(var1.array, 0, 5); // L: 1647 - ++js5ConnectState; // L: 1648 - VarcInt.field1586 = ClientPacket.currentTimeMillis(); // L: 1649 + Buffer var5 = new Buffer(5); + var5.writeByte(15); + var5.writeInt(198); + Messages.js5Socket.write(var5.array, 0, 5); + ++js5ConnectState; + HorizontalAlignment.field1609 = UrlRequester.method2125(); } - if (js5ConnectState == 3) { // L: 1651 - if (BoundaryObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1652 - int var2 = BoundaryObject.js5Socket.readUnsignedByte(); // L: 1653 - if (var2 != 0) { // L: 1654 - this.js5Error(var2); // L: 1655 - return; // L: 1656 + if (js5ConnectState == 3) { + if (Messages.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var3 = Messages.js5Socket.readUnsignedByte(); + if (var3 != 0) { + this.js5Error(var3); + return; } - ++js5ConnectState; // L: 1658 - } else if (ClientPacket.currentTimeMillis() - VarcInt.field1586 > 30000L) { // L: 1661 - this.js5Error(-2); // L: 1662 - return; // L: 1663 + ++js5ConnectState; + } else if (UrlRequester.method2125() - HorizontalAlignment.field1609 > 30000L) { + this.js5Error(-2); + return; } } - if (js5ConnectState == 4) { // L: 1667 - VarbitComposition.method2928(BoundaryObject.js5Socket, gameState > 20); // L: 1668 - Buddy.js5SocketTask = null; // L: 1669 - BoundaryObject.js5Socket = null; // L: 1670 - js5ConnectState = 0; // L: 1671 - js5Errors = 0; // L: 1672 + if (js5ConnectState == 4) { + class124.method2538(Messages.js5Socket, gameState > 20); + MusicPatchPcmStream.js5SocketTask = null; + Messages.js5Socket = null; + js5ConnectState = 0; + js5Errors = 0; } - } catch (IOException var3) { // L: 1675 - this.js5Error(-3); // L: 1676 + } catch (IOException var4) { + this.js5Error(-3); } } } - } // L: 1611 1678 + } - @ObfuscatedName("fv") + @ObfuscatedName("em") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "435825776" + garbageValue = "-1296949295" ) @Export("js5Error") void js5Error(int var1) { - Buddy.js5SocketTask = null; // L: 1681 - BoundaryObject.js5Socket = null; // L: 1682 - js5ConnectState = 0; // L: 1683 - if (UserComparator2.currentPort == UserComparator7.worldPort) { // L: 1684 - UserComparator2.currentPort = MouseRecorder.js5Port; + MusicPatchPcmStream.js5SocketTask = null; + Messages.js5Socket = null; + js5ConnectState = 0; + if (WorldMapManager.worldPort == class290.currentPort) { + class290.currentPort = class4.js5Port; } else { - UserComparator2.currentPort = UserComparator7.worldPort; // L: 1685 + class290.currentPort = WorldMapManager.worldPort; } - ++js5Errors; // L: 1686 - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1687 - if (gameState <= 5) { // L: 1688 - this.error("js5connect_full"); // L: 1689 - gameState = 1000; // L: 1690 + ++js5Errors; + if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { + if (gameState <= 5) { + this.error("js5connect_full"); + gameState = 1000; } else { - field800 = 3000; // L: 1692 + field435 = 3000; } - } else if (js5Errors >= 2 && var1 == 6) { // L: 1694 - this.error("js5connect_outofdate"); // L: 1695 - gameState = 1000; // L: 1696 - } else if (js5Errors >= 4) { // L: 1698 - if (gameState <= 5) { // L: 1699 - this.error("js5connect"); // L: 1700 - gameState = 1000; // L: 1701 + } else if (js5Errors >= 2 && var1 == 6) { + this.error("js5connect_outofdate"); + gameState = 1000; + } else if (js5Errors >= 4) { + if (gameState <= 5) { + this.error("js5connect"); + gameState = 1000; } else { - field800 = 3000; // L: 1703 + field435 = 3000; } } - } // L: 1705 + } - @ObfuscatedName("fa") + @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "26284" + descriptor = "(I)V", + garbageValue = "59479828" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 2425 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 2426 + Object var1 = packetWriter.getSocket(); + PacketBuffer var2 = packetWriter.packetBuffer; try { - if (loginState == 0) { // L: 2428 - if (ClanSettings.secureRandom == null && (secureRandomFuture.isDone() || field811 > 250)) { // L: 2429 - ClanSettings.secureRandom = secureRandomFuture.get(); // L: 2430 - secureRandomFuture.shutdown(); // L: 2431 - secureRandomFuture = null; // L: 2432 + if (loginState == 0) { + if (class98.secureRandom == null && (secureRandomFuture.isDone() || field438 > 250)) { + class98.secureRandom = secureRandomFuture.get(); + secureRandomFuture.shutdown(); + secureRandomFuture = null; } - if (ClanSettings.secureRandom != null) { // L: 2434 - if (var1 != null) { // L: 2435 - ((AbstractSocket)var1).close(); // L: 2436 - var1 = null; // L: 2437 + if (class98.secureRandom != null) { + if (var1 != null) { + ((AbstractSocket)var1).close(); + var1 = null; } - AbstractArchive.socketTask = null; // L: 2439 - hadNetworkError = false; // L: 2440 - field811 = 0; // L: 2441 - loginState = 1; // L: 2442 + StudioGame.socketTask = null; + hadNetworkError = false; + field438 = 0; + loginState = 1; } } - if (loginState == 1) { // L: 2445 - if (AbstractArchive.socketTask == null) { // L: 2446 - AbstractArchive.socketTask = GameEngine.taskHandler.newSocketTask(worldHost, UserComparator2.currentPort); // L: 2447 + if (loginState == 1) { + if (StudioGame.socketTask == null) { + StudioGame.socketTask = GameEngine.taskHandler.newSocketTask(Varps.worldHost, class290.currentPort); } - if (AbstractArchive.socketTask.status == 2) { // L: 2449 + if (StudioGame.socketTask.status == 2) { throw new IOException(); } - if (AbstractArchive.socketTask.status == 1) { // L: 2450 - if (useBufferedSocket) { // L: 2451 - var1 = PcmPlayer.method897((Socket)AbstractArchive.socketTask.result, 40000, 5000); // L: 2452 + if (StudioGame.socketTask.status == 1) { + if (useBufferedSocket) { + Socket var4 = (Socket)StudioGame.socketTask.result; + BufferedNetSocket var3 = new BufferedNetSocket(var4, 40000, 5000); + var1 = var3; } else { - var1 = new NetSocket((Socket)AbstractArchive.socketTask.result, GameEngine.taskHandler, 5000); // L: 2455 + var1 = new NetSocket((Socket)StudioGame.socketTask.result, GameEngine.taskHandler, 5000); } - packetWriter.setSocket((AbstractSocket)var1); // L: 2457 - AbstractArchive.socketTask = null; // L: 2458 - loginState = 2; // L: 2459 + packetWriter.setSocket((AbstractSocket)var1); + StudioGame.socketTask = null; + loginState = 2; } } - if (loginState == 2) { // L: 2462 - packetWriter.clearBuffer(); // L: 2463 - PacketBufferNode var4 = WorldMapData_1.method3583(); // L: 2466 - var4.clientPacket = null; // L: 2467 - var4.clientPacketLength = 0; // L: 2468 - var4.packetBuffer = new PacketBuffer(5000); // L: 2469 - var4.packetBuffer.writeByte(LoginPacket.field2806.id); // L: 2473 - packetWriter.addNode(var4); // L: 2474 - packetWriter.flush(); // L: 2475 - var2.offset = 0; // L: 2476 - loginState = 3; // L: 2477 + if (loginState == 2) { + packetWriter.clearBuffer(); + PacketBufferNode var22 = ArchiveLoader.method1779(); + var22.packetBuffer.writeByte(LoginPacket.field2791.id); + packetWriter.addNode(var22); + packetWriter.flush(); + var2.offset = 0; + loginState = 3; } - boolean var13; - int var14; - if (loginState == 3) { // L: 2479 - if (SoundCache.pcmPlayer0 != null) { // L: 2480 - SoundCache.pcmPlayer0.method844(); + boolean var12; + int var13; + if (loginState == 3) { + if (WorldMapDecoration.pcmPlayer0 != null) { + WorldMapDecoration.pcmPlayer0.method479(); } - if (UrlRequester.pcmPlayer1 != null) { // L: 2481 - UrlRequester.pcmPlayer1.method844(); + if (VarcInt.pcmPlayer1 != null) { + VarcInt.pcmPlayer1.method479(); } - var13 = true; // L: 2482 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2483 2484 - var13 = false; + var12 = true; + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { + var12 = false; } - if (var13) { // L: 2486 - var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2487 - if (SoundCache.pcmPlayer0 != null) { // L: 2488 - SoundCache.pcmPlayer0.method844(); + if (var12) { + var13 = ((AbstractSocket)var1).readUnsignedByte(); + if (WorldMapDecoration.pcmPlayer0 != null) { + WorldMapDecoration.pcmPlayer0.method479(); } - if (UrlRequester.pcmPlayer1 != null) { // L: 2489 - UrlRequester.pcmPlayer1.method844(); + if (VarcInt.pcmPlayer1 != null) { + VarcInt.pcmPlayer1.method479(); } - if (var14 != 0) { // L: 2490 - WorldMapDecorationType.getLoginError(var14); // L: 2491 - return; // L: 2492 + if (var13 != 0) { + StudioGame.getLoginError(var13); + return; } - var2.offset = 0; // L: 2494 - loginState = 4; // L: 2495 + var2.offset = 0; + loginState = 4; } } - int var32; - if (loginState == 4) { // L: 2498 - if (var2.offset < 8) { // L: 2499 - var32 = ((AbstractSocket)var1).available(); // L: 2500 - if (var32 > 8 - var2.offset) { // L: 2501 - var32 = 8 - var2.offset; + int var33; + if (loginState == 4) { + if (var2.offset < 8) { + var33 = ((AbstractSocket)var1).available(); + if (var33 > 8 - var2.offset) { + var33 = 8 - var2.offset; } - if (var32 > 0) { // L: 2502 - ((AbstractSocket)var1).read(var2.array, var2.offset, var32); // L: 2503 - var2.offset += var32; // L: 2504 + if (var33 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var33); + var2.offset += var33; } } - if (var2.offset == 8) { // L: 2507 - var2.offset = 0; // L: 2508 - class160.field1929 = var2.readLong(); // L: 2509 - loginState = 5; // L: 2510 + if (var2.offset == 8) { + var2.offset = 0; + WorldMapCacheName.field2119 = var2.readLong(); + loginState = 5; } } - if (loginState == 5) { // L: 2513 - packetWriter.packetBuffer.offset = 0; // L: 2514 - packetWriter.clearBuffer(); // L: 2515 - PacketBuffer var3 = new PacketBuffer(500); // L: 2516 - int[] var24 = new int[]{ClanSettings.secureRandom.nextInt(), ClanSettings.secureRandom.nextInt(), ClanSettings.secureRandom.nextInt(), ClanSettings.secureRandom.nextInt()}; // L: 2517 2518 2519 2520 2521 - var3.offset = 0; // L: 2522 - var3.writeByte(1); // L: 2523 - var3.writeInt(var24[0]); // L: 2524 - var3.writeInt(var24[1]); // L: 2525 - var3.writeInt(var24[2]); // L: 2526 - var3.writeInt(var24[3]); // L: 2527 - var3.writeLong(class160.field1929); // L: 2528 - if (gameState == 40) { // L: 2529 - var3.writeInt(SoundCache.field438[0]); // L: 2530 - var3.writeInt(SoundCache.field438[1]); // L: 2531 - var3.writeInt(SoundCache.field438[2]); // L: 2532 - var3.writeInt(SoundCache.field438[3]); // L: 2533 + int var7; + int var8; + if (loginState == 5) { + packetWriter.packetBuffer.offset = 0; + packetWriter.clearBuffer(); + PacketBuffer var23 = new PacketBuffer(500); + int[] var25 = new int[]{class98.secureRandom.nextInt(), class98.secureRandom.nextInt(), class98.secureRandom.nextInt(), class98.secureRandom.nextInt()}; + var23.offset = 0; + var23.writeByte(1); + var23.writeInt(var25[0]); + var23.writeInt(var25[1]); + var23.writeInt(var25[2]); + var23.writeInt(var25[3]); + var23.writeLong(WorldMapCacheName.field2119); + if (gameState == 40) { + var23.writeInt(class41.field356[0]); + var23.writeInt(class41.field356[1]); + var23.writeInt(class41.field356[2]); + var23.writeInt(class41.field356[3]); } else { - var3.writeByte(field656.rsOrdinal()); // L: 2536 - switch(field656.field1476) { // L: 2537 + var23.writeByte(field447.rsOrdinal()); + switch(field447.field1269) { case 0: - var3.offset += 4; // L: 2540 - break; // L: 2541 case 1: + var23.writeMedium(class282.field3639); + ++var23.offset; + break; case 2: - var3.writeMedium(class0.field2); // L: 2551 - ++var3.offset; // L: 2552 + var23.offset += 4; break; case 3: - var3.writeInt((Integer)class4.clientPreferences.parameters.get(class125.method2586(Login.Login_username))); // L: 2545 + var23.writeInt((Integer)Decimator.clientPreferences.parameters.get(WorldMapIcon_1.method3265(Login.Login_username))); } - var3.writeByte(class387.field4211.rsOrdinal()); // L: 2556 - var3.writeStringCp1252NullTerminated(Login.Login_password); // L: 2557 + var23.writeByte(class388.field4230.rsOrdinal()); + var23.writeStringCp1252NullTerminated(Login.Login_password); } - var3.encryptRsa(class82.field1000, class82.field996); // L: 2559 - SoundCache.field438 = var24; // L: 2560 - PacketBufferNode var6 = WorldMapData_1.method3583(); // L: 2563 - var6.clientPacket = null; // L: 2564 - var6.clientPacketLength = 0; // L: 2565 - var6.packetBuffer = new PacketBuffer(5000); // L: 2566 - var6.packetBuffer.offset = 0; // L: 2570 - if (gameState == 40) { // L: 2571 - var6.packetBuffer.writeByte(LoginPacket.field2803.id); // L: 2572 + var23.encryptRsa(class54.field792, class54.field791); + class41.field356 = var25; + PacketBufferNode var6 = CollisionMap.method3205(); + var6.clientPacket = null; + var6.clientPacketLength = 0; + var6.packetBuffer = new PacketBuffer(5000); + var6.packetBuffer.offset = 0; + if (gameState == 40) { + var6.packetBuffer.writeByte(LoginPacket.field2792.id); } else { - var6.packetBuffer.writeByte(LoginPacket.field2802.id); // L: 2575 + var6.packetBuffer.writeByte(LoginPacket.field2789.id); } - var6.packetBuffer.writeShort(0); // L: 2577 - int var7 = var6.packetBuffer.offset; // L: 2578 - var6.packetBuffer.writeInt(197); // L: 2579 - var6.packetBuffer.writeInt(1); // L: 2580 - var6.packetBuffer.writeByte(clientType); // L: 2581 - var6.packetBuffer.writeByte(field625); // L: 2582 - var6.packetBuffer.writeBytes(var3.array, 0, var3.offset); // L: 2583 - int var8 = var6.packetBuffer.offset; // L: 2584 - var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2585 - var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2586 - var6.packetBuffer.writeShort(AttackOption.canvasWidth); // L: 2587 - var6.packetBuffer.writeShort(class0.canvasHeight); // L: 2588 - PacketBuffer var9 = var6.packetBuffer; // L: 2589 - if (randomDatData != null) { // L: 2591 - var9.writeBytes(randomDatData, 0, randomDatData.length); // L: 2592 - } else { - byte[] var10 = PlatformInfo.method6115(); // L: 2595 - var9.writeBytes(var10, 0, var10.length); // L: 2596 + var6.packetBuffer.writeShort(0); + var7 = var6.packetBuffer.offset; + var6.packetBuffer.writeInt(198); + var6.packetBuffer.writeInt(1); + var6.packetBuffer.writeByte(clientType); + var6.packetBuffer.writeByte(field473); + var6.packetBuffer.writeBytes(var23.array, 0, var23.offset); + var8 = var6.packetBuffer.offset; + var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var6.packetBuffer.writeShort(MouseRecorder.canvasWidth); + var6.packetBuffer.writeShort(canvasHeight); + class144.method2803(var6.packetBuffer); + var6.packetBuffer.writeStringCp1252NullTerminated(SpotAnimationDefinition.field1660); + var6.packetBuffer.writeInt(class407.field4313); + Buffer var9 = new Buffer(ServerPacket.platformInfo.size()); + ServerPacket.platformInfo.write(var9); + var6.packetBuffer.writeBytes(var9.array, 0, var9.array.length); + var6.packetBuffer.writeByte(clientType); + var6.packetBuffer.writeInt(0); + var6.packetBuffer.method6703(class339.archive11.hash); + var6.packetBuffer.method6701(GameEngine.archive17.hash); + var6.packetBuffer.writeInt(Decimator.archive3.hash); + var6.packetBuffer.writeIntME(Tiles.archive15.hash); + var6.packetBuffer.method6703(ClanChannel.archive13.hash); + var6.packetBuffer.method6703(class126.archive9.hash); + var6.packetBuffer.method6703(InvDefinition.archive4.hash); + var6.packetBuffer.method6703(Skeleton.archive5.hash); + var6.packetBuffer.writeIntME(ClanChannelMember.archive10.hash); + var6.packetBuffer.writeIntME(class74.archive7.hash); + var6.packetBuffer.writeIntME(Language.archive1.hash); + var6.packetBuffer.method6701(class270.archive8.hash); + var6.packetBuffer.method6701(Decimator.archive19.hash); + var6.packetBuffer.writeInt(ApproximateRouteStrategy.archive12.hash); + var6.packetBuffer.method6701(0); + var6.packetBuffer.method6701(ClanMate.archive20.hash); + var6.packetBuffer.method6701(ItemLayer.archive14.hash); + var6.packetBuffer.method6701(class108.archive6.hash); + var6.packetBuffer.writeIntME(class15.archive18.hash); + var6.packetBuffer.writeIntME(ItemLayer.archive2.hash); + var6.packetBuffer.writeInt(class120.archive0.hash); + var6.packetBuffer.xteaEncrypt(var25, var8, var6.packetBuffer.offset); + var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); + packetWriter.addNode(var6); + packetWriter.flush(); + packetWriter.isaacCipher = new IsaacCipher(var25); + int[] var10 = new int[4]; + + for (int var11 = 0; var11 < 4; ++var11) { + var10[var11] = var25[var11] + 50; } - var6.packetBuffer.writeStringCp1252NullTerminated(Messages.field1397); // L: 2598 - var6.packetBuffer.writeInt(class82.field999); // L: 2599 - Buffer var31 = new Buffer(ClanSettings.platformInfo.size()); // L: 2600 - ClanSettings.platformInfo.write(var31); // L: 2601 - var6.packetBuffer.writeBytes(var31.array, 0, var31.array.length); // L: 2602 - var6.packetBuffer.writeByte(clientType); // L: 2603 - var6.packetBuffer.writeInt(0); // L: 2604 - var6.packetBuffer.method6659(KitDefinition.archive1.hash); // L: 2605 - var6.packetBuffer.method6658(Varcs.archive12.hash); // L: 2606 - var6.packetBuffer.writeInt(class4.archive5.hash); // L: 2607 - var6.packetBuffer.method6658(0); // L: 2608 - var6.packetBuffer.writeIntME(class26.archive4.hash); // L: 2609 - var6.packetBuffer.method6658(PcmPlayer.archive7.hash); // L: 2610 - var6.packetBuffer.method6658(class160.archive11.hash); // L: 2611 - var6.packetBuffer.writeIntME(class18.archive3.hash); // L: 2612 - var6.packetBuffer.method6659(JagexCache.archive10.hash); // L: 2613 - var6.packetBuffer.writeInt(ClanChannel.archive0.hash); // L: 2614 - var6.packetBuffer.method6658(PacketWriter.archive14.hash); // L: 2615 - var6.packetBuffer.method6659(DynamicObject.archive6.hash); // L: 2616 - var6.packetBuffer.writeInt(SecureRandomFuture.archive2.hash); // L: 2617 - var6.packetBuffer.writeInt(WorldMapEvent.archive19.hash); // L: 2618 - var6.packetBuffer.writeInt(class6.archive18.hash); // L: 2619 - var6.packetBuffer.method6659(class10.archive17.hash); // L: 2620 - var6.packetBuffer.writeIntME(GrandExchangeOfferOwnWorldComparator.archive13.hash); // L: 2621 - var6.packetBuffer.method6658(class16.archive9.hash); // L: 2622 - var6.packetBuffer.writeIntME(class306.archive15.hash); // L: 2623 - var6.packetBuffer.writeInt(ModeWhere.archive8.hash); // L: 2624 - var6.packetBuffer.method6659(WorldMapLabel.archive20.hash); // L: 2625 - var6.packetBuffer.xteaEncrypt(var24, var8, var6.packetBuffer.offset); // L: 2626 - var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); // L: 2627 - packetWriter.addNode(var6); // L: 2628 - packetWriter.flush(); // L: 2629 - packetWriter.isaacCipher = new IsaacCipher(var24); // L: 2630 - int[] var11 = new int[4]; // L: 2631 - - for (int var12 = 0; var12 < 4; ++var12) { // L: 2632 - var11[var12] = var24[var12] + 50; - } - - var2.newIsaacCipher(var11); // L: 2633 - loginState = 6; // L: 2634 + var2.newIsaacCipher(var10); + loginState = 6; } - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2636 2637 - var32 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2638 - if (var32 == 21 && gameState == 20) { // L: 2639 - loginState = 12; // L: 2640 - } else if (var32 == 2) { // L: 2642 - loginState = 14; // L: 2643 - } else if (var32 == 15 && gameState == 40) { // L: 2645 - packetWriter.serverPacketLength = -1; // L: 2646 - loginState = 19; // L: 2647 - } else if (var32 == 64) { // L: 2649 - loginState = 10; // L: 2650 - } else if (var32 == 23 && field654 < 1) { // L: 2652 - ++field654; // L: 2653 - loginState = 0; // L: 2654 - } else if (var32 == 29) { // L: 2656 - loginState = 17; // L: 2657 + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { + var33 = ((AbstractSocket)var1).readUnsignedByte(); + if (var33 == 21 && gameState == 20) { + loginState = 12; + } else if (var33 == 2) { + loginState = 14; + } else if (var33 == 15 && gameState == 40) { + packetWriter.serverPacketLength = -1; + loginState = 19; + } else if (var33 == 64) { + loginState = 10; + } else if (var33 == 23 && field439 < 1) { + ++field439; + loginState = 0; + } else if (var33 == 29) { + loginState = 17; } else { - if (var32 != 69) { // L: 2659 - WorldMapDecorationType.getLoginError(var32); // L: 2663 - return; // L: 2664 + if (var33 != 69) { + StudioGame.getLoginError(var33); + return; } - loginState = 7; // L: 2660 + loginState = 7; } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2668 2669 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2670 - var2.offset = 0; // L: 2671 - ClanChannel.field30 = var2.readUnsignedShort(); // L: 2672 - loginState = 8; // L: 2673 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + class122.field1425 = var2.readUnsignedShort(); + loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= ClanChannel.field30) { // L: 2676 2677 - var2.offset = 0; // L: 2678 - ((AbstractSocket)var1).read(var2.array, var2.offset, ClanChannel.field30); // L: 2679 - class34[] var21 = new class34[]{class34.field232}; // L: 2682 - class34 var25 = var21[var2.readUnsignedByte()]; // L: 2684 + if (loginState == 8 && ((AbstractSocket)var1).available() >= class122.field1425) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, var2.offset, class122.field1425); + class6[] var24 = new class6[]{class6.field16}; + class6 var27 = var24[var2.readUnsignedByte()]; try { - switch(var25.field233) { // L: 2688 + switch(var27.field10) { case 0: - class28 var5 = new class28(); // L: 2691 - this.field661 = new class35(var2, var5); // L: 2701 - loginState = 9; // L: 2702 + class0 var5 = new class0(); + this.field445 = new class7(var2, var5); + loginState = 9; break; default: - throw new IllegalArgumentException(); // L: 2696 + throw new IllegalArgumentException(); } - } catch (Exception var19) { // L: 2704 - WorldMapDecorationType.getLoginError(22); // L: 2705 - return; // L: 2706 + } catch (Exception var20) { + StudioGame.getLoginError(22); + return; } } - if (loginState == 9 && this.field661.method420()) { // L: 2710 2711 - this.field660 = this.field661.method416(); // L: 2712 - this.field661.method410(); // L: 2713 - this.field661 = null; // L: 2714 - if (this.field660 == null) { // L: 2715 - WorldMapDecorationType.getLoginError(22); // L: 2716 - return; // L: 2717 + if (loginState == 9 && this.field445.method46()) { + this.field595 = this.field445.method57(); + this.field445.method49(); + this.field445 = null; + if (this.field595 == null) { + StudioGame.getLoginError(22); + return; } - packetWriter.clearBuffer(); // L: 2719 - PacketBufferNode var22 = ArchiveLoader.method2162(); // L: 2720 - var22.packetBuffer.writeByte(LoginPacket.field2804.id); // L: 2721 - var22.packetBuffer.writeShort(this.field660.offset); // L: 2722 - var22.packetBuffer.method6607(this.field660); // L: 2723 - packetWriter.addNode(var22); // L: 2724 - packetWriter.flush(); // L: 2725 - this.field660 = null; // L: 2726 - loginState = 6; // L: 2727 + packetWriter.clearBuffer(); + PacketBufferNode var28 = CollisionMap.method3205(); + var28.clientPacket = null; + var28.clientPacketLength = 0; + var28.packetBuffer = new PacketBuffer(5000); + var28.packetBuffer.writeByte(LoginPacket.field2793.id); + var28.packetBuffer.writeShort(this.field595.offset); + var28.packetBuffer.method6651(this.field595); + packetWriter.addNode(var28); + packetWriter.flush(); + this.field595 = null; + loginState = 6; } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2730 2731 - WorldMapEvent.field2152 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2732 - loginState = 11; // L: 2733 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { + class216.field2548 = ((AbstractSocket)var1).readUnsignedByte(); + loginState = 11; } - if (loginState == 11 && ((AbstractSocket)var1).available() >= WorldMapEvent.field2152) { // L: 2736 2737 - ((AbstractSocket)var1).read(var2.array, 0, WorldMapEvent.field2152); // L: 2738 - var2.offset = 0; // L: 2739 - loginState = 6; // L: 2740 + if (loginState == 11 && ((AbstractSocket)var1).available() >= class216.field2548) { + ((AbstractSocket)var1).read(var2.array, 0, class216.field2548); + var2.offset = 0; + loginState = 6; } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2743 2744 - field655 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2745 - loginState = 13; // L: 2746 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { + field589 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + loginState = 13; } - if (loginState == 13) { // L: 2749 - field811 = 0; // L: 2750 - CollisionMap.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field655 / 60 + " seconds."); // L: 2751 - if (--field655 <= 0) { // L: 2752 + if (loginState == 13) { + field438 = 0; + setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field589 / 60 + " seconds."); + if (--field589 <= 0) { loginState = 0; } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2755 2756 - WorldMapSection0.field2038 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2757 - loginState = 15; // L: 2758 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { + ModeWhere.field3713 = ((AbstractSocket)var1).readUnsignedByte(); + loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapSection0.field2038) { // L: 2761 2762 - var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2763 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2764 - var2.offset = 0; // L: 2765 - boolean var33 = false; // L: 2766 - if (var13) { // L: 2767 - var14 = var2.readByteIsaac() << 24; // L: 2768 - var14 |= var2.readByteIsaac() << 16; // L: 2769 - var14 |= var2.readByteIsaac() << 8; // L: 2770 - var14 |= var2.readByteIsaac(); // L: 2771 - int var15 = class125.method2586(Login.Login_username); // L: 2772 - if (class4.clientPreferences.parameters.size() >= 10 && !class4.clientPreferences.parameters.containsKey(var15)) { // L: 2773 2774 - Iterator var30 = class4.clientPreferences.parameters.entrySet().iterator(); // L: 2775 - var30.next(); // L: 2776 - var30.remove(); // L: 2777 + if (loginState == 15 && ((AbstractSocket)var1).available() >= ModeWhere.field3713) { + var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; + ((AbstractSocket)var1).read(var2.array, 0, 4); + var2.offset = 0; + boolean var34 = false; + if (var12) { + var13 = var2.readByteIsaac() << 24; + var13 |= var2.readByteIsaac() << 16; + var13 |= var2.readByteIsaac() << 8; + var13 |= var2.readByteIsaac(); + String var32 = Login.Login_username; + var7 = var32.length(); + var8 = 0; + int var14 = 0; + + while (true) { + if (var14 >= var7) { + if (Decimator.clientPreferences.parameters.size() >= 10 && !Decimator.clientPreferences.parameters.containsKey(var8)) { + Iterator var16 = Decimator.clientPreferences.parameters.entrySet().iterator(); + var16.next(); + var16.remove(); + } + + Decimator.clientPreferences.parameters.put(var8, var13); + break; + } + + var8 = (var8 << 5) - var8 + var32.charAt(var14); + ++var14; } - - class4.clientPreferences.parameters.put(var15, var14); // L: 2780 } - if (Login_isUsernameRemembered) { // L: 2782 - class4.clientPreferences.rememberedUsername = Login.Login_username; // L: 2783 + if (Login_isUsernameRemembered) { + Decimator.clientPreferences.rememberedUsername = Login.Login_username; } else { - class4.clientPreferences.rememberedUsername = null; // L: 2786 + Decimator.clientPreferences.rememberedUsername = null; } - Actor.savePreferences(); // L: 2788 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2789 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2790 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2791 - localPlayerIndex <<= 8; // L: 2792 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2793 - field740 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2794 - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2795 - var2.offset = 0; // L: 2796 - ServerPacket[] var27 = WorldMapIcon_0.ServerPacket_values(); // L: 2797 - int var16 = var2.readSmartByteShortIsaac(); // L: 2798 - if (var16 < 0 || var16 >= var27.length) { // L: 2799 - throw new IOException(var16 + " " + var2.offset); + MilliClock.savePreferences(); + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); + localPlayerIndex <<= 8; + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); + field525 = ((AbstractSocket)var1).readUnsignedByte(); + ((AbstractSocket)var1).read(var2.array, 0, 1); + var2.offset = 0; + ServerPacket[] var29 = WorldMapAreaData.ServerPacket_values(); + int var17 = var2.readSmartByteShortIsaac(); + if (var17 < 0 || var17 >= var29.length) { + throw new IOException(var17 + " " + var2.offset); } - packetWriter.serverPacket = var27[var16]; // L: 2800 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2801 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2802 - var2.offset = 0; // L: 2803 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2804 + packetWriter.serverPacket = var29[var17]; + packetWriter.serverPacketLength = packetWriter.serverPacket.length; + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - class42.method521(class1.client, "zap"); // L: 2806 - } catch (Throwable var18) { // L: 2808 + class14.method148(Script.client, "zap"); + } catch (Throwable var19) { } - loginState = 16; // L: 2809 + loginState = 16; } - if (loginState == 16) { // L: 2812 - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2813 - var2.offset = 0; // L: 2814 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2815 - timer.method5676(); // L: 2816 - PcmPlayer.method895(); // L: 2817 - class7.updatePlayer(var2); // L: 2818 - class12.field111 = -1; // L: 2819 - KeyHandler.loadRegions(false, var2); // L: 2820 - packetWriter.serverPacket = null; // L: 2821 + if (loginState == 16) { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + timer.method5677(); + class119.method2471(); + ScriptFrame.updatePlayer(var2); + MouseHandler.field136 = -1; + MusicPatchPcmStream.loadRegions(false, var2); + packetWriter.serverPacket = null; } } else { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2825 2826 - var2.offset = 0; // L: 2827 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2828 - var2.offset = 0; // L: 2829 - class4.field38 = var2.readUnsignedShort(); // L: 2830 - loginState = 18; // L: 2831 + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + Buddy.field3869 = var2.readUnsignedShort(); + loginState = 18; } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class4.field38) { // L: 2834 2835 - var2.offset = 0; // L: 2836 - ((AbstractSocket)var1).read(var2.array, 0, class4.field38); // L: 2837 - var2.offset = 0; // L: 2838 - String var23 = var2.readStringCp1252NullTerminated(); // L: 2839 - String var26 = var2.readStringCp1252NullTerminated(); // L: 2840 - String var28 = var2.readStringCp1252NullTerminated(); // L: 2841 - CollisionMap.setLoginResponseString(var23, var26, var28); // L: 2842 - Projectile.updateGameState(10); // L: 2843 + if (loginState == 18 && ((AbstractSocket)var1).available() >= Buddy.field3869) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, Buddy.field3869); + var2.offset = 0; + String var26 = var2.readStringCp1252NullTerminated(); + String var30 = var2.readStringCp1252NullTerminated(); + String var31 = var2.readStringCp1252NullTerminated(); + setLoginResponseString(var26, var30, var31); + class16.updateGameState(10); } - if (loginState != 19) { // L: 2846 - ++field811; // L: 2893 - if (field811 > 2000) { // L: 2894 - if (field654 < 1) { // L: 2895 - if (UserComparator2.currentPort == UserComparator7.worldPort) { // L: 2896 - UserComparator2.currentPort = MouseRecorder.js5Port; - } else { - UserComparator2.currentPort = UserComparator7.worldPort; // L: 2897 - } - - ++field654; // L: 2898 - loginState = 0; // L: 2899 - } else { - WorldMapDecorationType.getLoginError(-3); // L: 2902 - } - } - } else { - if (packetWriter.serverPacketLength == -1) { // L: 2847 - if (((AbstractSocket)var1).available() < 2) { // L: 2848 + if (loginState == 19) { + if (packetWriter.serverPacketLength == -1) { + if (((AbstractSocket)var1).available() < 2) { return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2849 - var2.offset = 0; // L: 2850 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2851 + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + packetWriter.serverPacketLength = var2.readUnsignedShort(); } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2853 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2854 - var2.offset = 0; // L: 2855 - var32 = packetWriter.serverPacketLength; // L: 2856 - timer.method5678(); // L: 2857 - packetWriter.clearBuffer(); // L: 2859 - packetWriter.packetBuffer.offset = 0; // L: 2860 - packetWriter.serverPacket = null; // L: 2861 - packetWriter.field1410 = null; // L: 2862 - packetWriter.field1411 = null; // L: 2863 - packetWriter.field1399 = null; // L: 2864 - packetWriter.serverPacketLength = 0; // L: 2865 - packetWriter.field1408 = 0; // L: 2866 - rebootTimer = 0; // L: 2867 - class34.method407(); // L: 2868 - minimapState = 0; // L: 2869 - destinationX = 0; // L: 2870 - - for (var14 = 0; var14 < 2048; ++var14) { // L: 2871 - players[var14] = null; + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + var2.offset = 0; + var33 = packetWriter.serverPacketLength; + timer.method5666(); + class288.method5202(); + ScriptFrame.updatePlayer(var2); + if (var33 != var2.offset) { + throw new RuntimeException(); } - - class262.localPlayer = null; // L: 2872 - - for (var14 = 0; var14 < npcs.length; ++var14) { // L: 2873 - NPC var29 = npcs[var14]; // L: 2874 - if (var29 != null) { // L: 2875 - var29.targetIndex = -1; // L: 2876 - var29.false0 = false; // L: 2877 + } + } else { + ++field438; + if (field438 > 2000) { + if (field439 < 1) { + if (WorldMapManager.worldPort == class290.currentPort) { + class290.currentPort = class4.js5Port; + } else { + class290.currentPort = WorldMapManager.worldPort; } - } - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2881 - Projectile.updateGameState(30); // L: 2883 - - for (var14 = 0; var14 < 100; ++var14) { // L: 2884 - field831[var14] = true; - } - - BufferedSink.method5992(); // L: 2885 - class7.updatePlayer(var2); // L: 2887 - if (var32 != var2.offset) { // L: 2888 - throw new RuntimeException(); // L: 2889 + ++field439; + loginState = 0; + } else { + StudioGame.getLoginError(-3); } } } } } - } catch (IOException var20) { // L: 2906 - if (field654 < 1) { // L: 2907 - if (UserComparator7.worldPort == UserComparator2.currentPort) { // L: 2908 - UserComparator2.currentPort = MouseRecorder.js5Port; + } catch (IOException var21) { + if (field439 < 1) { + if (class290.currentPort == WorldMapManager.worldPort) { + class290.currentPort = class4.js5Port; } else { - UserComparator2.currentPort = UserComparator7.worldPort; // L: 2909 + class290.currentPort = WorldMapManager.worldPort; } - ++field654; // L: 2910 - loginState = 0; // L: 2911 + ++field439; + loginState = 0; } else { - WorldMapDecorationType.getLoginError(-2); // L: 2914 + StudioGame.getLoginError(-2); } } - } // L: 2753 2823 2891 2900 2903 2912 2915 2917 + } - @ObfuscatedName("fr") + @ObfuscatedName("fe") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1684472042" + garbageValue = "-1917564901" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 3190 + if (rebootTimer > 1) { --rebootTimer; } - if (logoutTimer > 0) { // L: 3191 + if (logoutTimer > 0) { --logoutTimer; } - if (hadNetworkError) { // L: 3192 - hadNetworkError = false; // L: 3193 - ApproximateRouteStrategy.method1268(); // L: 3194 + if (hadNetworkError) { + hadNetworkError = false; + WorldMapSection0.method3580(); } else { - if (!isMenuOpen) { // L: 3197 - Script.addCancelMenuEntry(); + if (!isMenuOpen) { + KeyHandler.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1655(packetWriter); ++var1) { // L: 3198 3199 + for (var1 = 0; var1 < 100 && this.method914(packetWriter); ++var1) { } - if (gameState == 30) { // L: 3201 - int var2; - PacketBufferNode var14; - while (DynamicObject.method2103()) { // L: 3202 - var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2601, packetWriter.isaacCipher); // L: 3203 - var14.packetBuffer.writeByte(0); // L: 3204 - var2 = var14.packetBuffer.offset; // L: 3205 - MouseHandler.performReflectionCheck(var14.packetBuffer); // L: 3206 - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 3207 - packetWriter.addNode(var14); // L: 3208 - } - - if (timer.field3772) { // L: 3210 - var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2661, packetWriter.isaacCipher); // L: 3212 - var14.packetBuffer.writeByte(0); // L: 3213 - var2 = var14.packetBuffer.offset; // L: 3214 - timer.write(var14.packetBuffer); // L: 3215 - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 3216 - packetWriter.addNode(var14); // L: 3217 - timer.method5677(); // L: 3218 - } - - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - PacketBuffer var10000; - synchronized(UrlRequester.mouseRecorder.lock) { // L: 3221 - if (!field730) { // L: 3222 - UrlRequester.mouseRecorder.index = 0; // L: 3308 - } else if (MouseHandler.MouseHandler_lastButton != 0 || UrlRequester.mouseRecorder.index >= 40) { // L: 3223 - PacketBufferNode var15 = null; // L: 3225 - var3 = 0; // L: 3226 - var4 = 0; // L: 3227 - var5 = 0; // L: 3228 - var6 = 0; // L: 3229 - - for (var7 = 0; var7 < UrlRequester.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 3230 3231 - var4 = var7; // L: 3232 - var8 = UrlRequester.mouseRecorder.ys[var7]; // L: 3233 - if (var8 < -1) { // L: 3234 - var8 = -1; - } else if (var8 > 65534) { // L: 3235 - var8 = 65534; - } - - var9 = UrlRequester.mouseRecorder.xs[var7]; // L: 3236 - if (var9 < -1) { // L: 3237 - var9 = -1; - } else if (var9 > 65534) { // L: 3238 - var9 = 65534; - } - - if (var9 != field843 || var8 != field633) { // L: 3239 - if (var15 == null) { // L: 3242 - var15 = InterfaceParent.getPacketBufferNode(ClientPacket.field2655, packetWriter.isaacCipher); // L: 3243 - var15.packetBuffer.writeByte(0); // L: 3244 - var3 = var15.packetBuffer.offset; // L: 3245 - var10000 = var15.packetBuffer; // L: 3246 - var10000.offset += 2; - var5 = 0; // L: 3247 - var6 = 0; // L: 3248 - } - - int var12; - if (-1L != field760) { // L: 3253 - var10 = var9 - field843; // L: 3254 - var11 = var8 - field633; // L: 3255 - var12 = (int)((UrlRequester.mouseRecorder.millis[var7] - field760) / 20L); // L: 3256 - var5 = (int)((long)var5 + (UrlRequester.mouseRecorder.millis[var7] - field760) % 20L); // L: 3257 - } else { - var10 = var9; // L: 3260 - var11 = var8; // L: 3261 - var12 = Integer.MAX_VALUE; // L: 3262 - } - - field843 = var9; // L: 3264 - field633 = var8; // L: 3265 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3266 - var10 += 32; // L: 3267 - var11 += 32; // L: 3268 - var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3269 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3271 - var10 += 128; // L: 3272 - var11 += 128; // L: 3273 - var15.packetBuffer.writeByte(var12 + 128); // L: 3274 - var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3275 - } else if (var12 < 32) { // L: 3277 - var15.packetBuffer.writeByte(var12 + 192); // L: 3278 - if (var9 != -1 && var8 != -1) { // L: 3279 - var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3280 - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3283 - if (var9 != -1 && var8 != -1) { // L: 3284 - var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3285 - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } - - ++var6; // L: 3287 - field760 = UrlRequester.mouseRecorder.millis[var7]; // L: 3288 - } - } - - if (var15 != null) { // L: 3290 - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); // L: 3291 - var7 = var15.packetBuffer.offset; // L: 3292 - var15.packetBuffer.offset = var3; // L: 3293 - var15.packetBuffer.writeByte(var5 / var6); // L: 3294 - var15.packetBuffer.writeByte(var5 % var6); // L: 3295 - var15.packetBuffer.offset = var7; // L: 3296 - packetWriter.addNode(var15); // L: 3297 - } - - if (var4 >= UrlRequester.mouseRecorder.index) { // L: 3299 - UrlRequester.mouseRecorder.index = 0; - } else { - MouseRecorder var46 = UrlRequester.mouseRecorder; // L: 3301 - var46.index -= var4; - System.arraycopy(UrlRequester.mouseRecorder.xs, var4, UrlRequester.mouseRecorder.xs, 0, UrlRequester.mouseRecorder.index); // L: 3302 - System.arraycopy(UrlRequester.mouseRecorder.ys, var4, UrlRequester.mouseRecorder.ys, 0, UrlRequester.mouseRecorder.index); // L: 3303 - System.arraycopy(UrlRequester.mouseRecorder.millis, var4, UrlRequester.mouseRecorder.millis, 0, UrlRequester.mouseRecorder.index); // L: 3304 - } - } - } - - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3310 - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3311 - if (var16 > 32767L) { // L: 3312 - var16 = 32767L; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3313 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3314 - if (var3 < 0) { // L: 3315 - var3 = 0; - } else if (var3 > class0.canvasHeight) { // L: 3316 - var3 = class0.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3317 - if (var4 < 0) { // L: 3318 - var4 = 0; - } else if (var4 > AttackOption.canvasWidth) { // L: 3319 - var4 = AttackOption.canvasWidth; - } - - var5 = (int)var16; // L: 3320 - var18 = InterfaceParent.getPacketBufferNode(ClientPacket.field2586, packetWriter.isaacCipher); // L: 3321 - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 3322 - var18.packetBuffer.writeShort(var4); // L: 3323 - var18.packetBuffer.writeShort(var3); // L: 3324 - packetWriter.addNode(var18); // L: 3325 - } - - if (KeyHandler.field271 > 0) { // L: 3327 - var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2594, packetWriter.isaacCipher); // L: 3328 - var14.packetBuffer.writeShort(0); // L: 3329 - var2 = var14.packetBuffer.offset; // L: 3330 - long var19 = ClientPacket.currentTimeMillis(); // L: 3331 - - for (var5 = 0; var5 < KeyHandler.field271; ++var5) { // L: 3332 - long var21 = var19 - field850; // L: 3333 - if (var21 > 16777215L) { // L: 3334 - var21 = 16777215L; - } - - field850 = var19; // L: 3335 - var14.packetBuffer.method6660((int)var21); // L: 3336 - var14.packetBuffer.method6639(KeyHandler.field257[var5]); // L: 3337 - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3339 - packetWriter.addNode(var14); // L: 3340 - } - - if (field706 > 0) { // L: 3342 - --field706; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3343 - field707 = true; - } - - if (field707 && field706 <= 0) { // L: 3344 - field706 = 20; // L: 3345 - field707 = false; // L: 3346 - var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2609, packetWriter.isaacCipher); // L: 3348 - var14.packetBuffer.writeShort(camAngleY); // L: 3349 - var14.packetBuffer.method6705(camAngleX); // L: 3350 - packetWriter.addNode(var14); // L: 3351 - } - - if (class397.hasFocus && !hadFocus) { // L: 3353 - hadFocus = true; // L: 3354 - var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2581, packetWriter.isaacCipher); // L: 3356 - var14.packetBuffer.writeByte(1); // L: 3357 - packetWriter.addNode(var14); // L: 3358 - } - - if (!class397.hasFocus && hadFocus) { // L: 3360 - hadFocus = false; // L: 3361 - var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2581, packetWriter.isaacCipher); // L: 3363 - var14.packetBuffer.writeByte(0); // L: 3364 - packetWriter.addNode(var14); // L: 3365 - } - - if (class80.worldMap != null) { // L: 3368 - class80.worldMap.method6239(); - } - - BuddyRankComparator.method2579(); // L: 3369 - if (class170.field2016) { // L: 3371 - CollisionMap.method3244(); // L: 3372 - class170.field2016 = false; // L: 3373 - } - - if (field853 != SoundSystem.Client_plane) { // L: 3377 - field853 = SoundSystem.Client_plane; // L: 3378 - var1 = SoundSystem.Client_plane; // L: 3379 - int[] var36 = class69.sceneMinimapSprite.pixels; // L: 3381 - var3 = var36.length; // L: 3382 - - for (var4 = 0; var4 < var3; ++var4) { // L: 3383 - var36[var4] = 0; - } - - for (var4 = 1; var4 < 103; ++var4) { // L: 3384 - var5 = (103 - var4) * 2048 + 24628; // L: 3385 - - for (var6 = 1; var6 < 103; ++var6) { // L: 3386 - if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { // L: 3387 - DevicePcmPlayerProvider.scene.drawTileMinimap(var36, var5, 512, var1, var6, var4); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { // L: 3388 - DevicePcmPlayerProvider.scene.drawTileMinimap(var36, var5, 512, var1 + 1, var6, var4); - } - - var5 += 4; // L: 3389 - } - } - - var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3392 - var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3393 - class69.sceneMinimapSprite.setRaster(); // L: 3394 - - for (var6 = 1; var6 < 103; ++var6) { // L: 3395 - for (var7 = 1; var7 < 103; ++var7) { // L: 3396 - if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { // L: 3397 - WorldMapIcon_0.drawObject(var1, var7, var6, var4, var5); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { // L: 3398 - WorldMapIcon_0.drawObject(var1 + 1, var7, var6, var4, var5); - } - } - } - - mapIconCount = 0; // L: 3401 - - for (var6 = 0; var6 < 104; ++var6) { // L: 3402 - for (var7 = 0; var7 < 104; ++var7) { // L: 3403 - long var23 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(SoundSystem.Client_plane, var6, var7); // L: 3404 - if (0L != var23) { // L: 3405 - var10 = Message.Entity_unpackID(var23); // L: 3406 - var11 = Tiles.getObjectDefinition(var10).mapIconId; // L: 3407 - if (var11 >= 0 && Archive.WorldMapElement_get(var11).field1567) { // L: 3408 3409 - mapIcons[mapIconCount] = Archive.WorldMapElement_get(var11).getSpriteBool(false); // L: 3412 - mapIconXs[mapIconCount] = var6; // L: 3413 - mapIconYs[mapIconCount] = var7; // L: 3414 - ++mapIconCount; // L: 3415 - } - } - } - } - - AbstractWorldMapData.rasterProvider.apply(); // L: 3420 - } - - if (gameState == 30) { // L: 3424 - class17.method261(); // L: 3425 - - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3427 - var10002 = queuedSoundEffectDelays[var1]--; // L: 3428 - if (queuedSoundEffectDelays[var1] >= -10) { // L: 3429 - SoundEffect var37 = soundEffects[var1]; // L: 3441 - if (var37 == null) { // L: 3442 - var10000 = null; // L: 3443 - var37 = SoundEffect.readSoundEffect(class26.archive4, soundEffectIds[var1], 0); - if (var37 == null) { // L: 3444 - continue; - } - - int[] var47 = queuedSoundEffectDelays; // L: 3445 - var47[var1] += var37.calculateDelay(); - soundEffects[var1] = var37; // L: 3446 - } - - if (queuedSoundEffectDelays[var1] < 0) { // L: 3452 - if (soundLocations[var1] != 0) { // L: 3454 - var4 = (soundLocations[var1] & 255) * 128; // L: 3455 - var5 = soundLocations[var1] >> 16 & 255; // L: 3456 - var6 = var5 * 128 + 64 - class262.localPlayer.x; // L: 3457 - if (var6 < 0) { // L: 3458 - var6 = -var6; - } - - var7 = soundLocations[var1] >> 8 & 255; // L: 3459 - var8 = var7 * 128 + 64 - class262.localPlayer.y; // L: 3460 - if (var8 < 0) { // L: 3461 - var8 = -var8; - } - - var9 = var8 + var6 - 128; // L: 3462 - if (var9 > var4) { // L: 3463 - queuedSoundEffectDelays[var1] = -100; // L: 3464 - continue; // L: 3465 - } - - if (var9 < 0) { // L: 3467 - var9 = 0; - } - - var3 = (var4 - var9) * class4.clientPreferences.areaSoundEffectsVolume / var4; // L: 3468 - } else { - var3 = class4.clientPreferences.soundEffectsVolume; // L: 3470 - } - - if (var3 > 0) { // L: 3471 - RawSound var25 = var37.toRawSound().resample(WorldMapAreaData.decimator); // L: 3472 - RawPcmStream var26 = RawPcmStream.createRawPcmStream(var25, 100, var3); // L: 3473 - var26.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3474 - UserComparator7.pcmStreamMixer.addSubStream(var26); // L: 3475 - } - - queuedSoundEffectDelays[var1] = -100; // L: 3477 - } - } else { - --soundEffectCount; // L: 3430 - - for (var2 = var1; var2 < soundEffectCount; ++var2) { // L: 3431 - soundEffectIds[var2] = soundEffectIds[var2 + 1]; // L: 3432 - soundEffects[var2] = soundEffects[var2 + 1]; // L: 3433 - queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; // L: 3434 - queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; // L: 3435 - soundLocations[var2] = soundLocations[var2 + 1]; // L: 3436 - } - - --var1; // L: 3438 - } - } - - if (field862 && !ApproximateRouteStrategy.method1269()) { // L: 3480 - if (class4.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3481 - class105.method2357(DynamicObject.archive6, currentTrackGroupId, 0, class4.clientPreferences.musicVolume, false); - } - - field862 = false; // L: 3482 - } - - ++packetWriter.field1408; // L: 3485 - if (packetWriter.field1408 > 750) { // L: 3486 - ApproximateRouteStrategy.method1268(); // L: 3487 + if (gameState == 30) { + while (true) { + ReflectionCheck var2 = (ReflectionCheck)class41.reflectionChecks.last(); + boolean var31; + if (var2 == null) { + var31 = false; } else { - WorldMapLabelSize.method3274(); // L: 3490 + var31 = true; + } - for (var1 = 0; var1 < npcCount; ++var1) { // L: 3492 - var2 = npcIndices[var1]; // L: 3493 - NPC var27 = npcs[var2]; // L: 3494 - if (var27 != null) { // L: 3495 - World.updateActorSequence(var27, var27.definition.size); // L: 3496 + int var3; + PacketBufferNode var32; + if (!var31) { + PacketBufferNode var14; + int var15; + if (timer.field3781) { + var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2575, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var15 = var14.packetBuffer.offset; + timer.write(var14.packetBuffer); + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); + timer.method5661(); + } + + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + synchronized(class6.mouseRecorder.lock) { + if (!field634) { + class6.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || class6.mouseRecorder.index >= 40) { + var32 = null; + var3 = 0; + var4 = 0; + var5 = 0; + var6 = 0; + + for (var7 = 0; var7 < class6.mouseRecorder.index && (var32 == null || var32.packetBuffer.offset - var3 < 246); ++var7) { + var4 = var7; + var8 = class6.mouseRecorder.ys[var7]; + if (var8 < -1) { + var8 = -1; + } else if (var8 > 65534) { + var8 = 65534; + } + + var9 = class6.mouseRecorder.xs[var7]; + if (var9 < -1) { + var9 = -1; + } else if (var9 > 65534) { + var9 = 65534; + } + + if (var9 != field417 || var8 != field418) { + if (var32 == null) { + var32 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2625, packetWriter.isaacCipher); + var32.packetBuffer.writeByte(0); + var3 = var32.packetBuffer.offset; + PacketBuffer var10000 = var32.packetBuffer; + var10000.offset += 2; + var5 = 0; + var6 = 0; + } + + if (field419 != -1L) { + var10 = var9 - field417; + var11 = var8 - field418; + var12 = (int)((class6.mouseRecorder.millis[var7] - field419) / 20L); + var5 = (int)((long)var5 + (class6.mouseRecorder.millis[var7] - field419) % 20L); + } else { + var10 = var9; + var11 = var8; + var12 = Integer.MAX_VALUE; + } + + field417 = var9; + field418 = var8; + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { + var10 += 32; + var11 += 32; + var32.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { + var10 += 128; + var11 += 128; + var32.packetBuffer.writeByte(var12 + 128); + var32.packetBuffer.writeShort(var11 + (var10 << 8)); + } else if (var12 < 32) { + var32.packetBuffer.writeByte(var12 + 192); + if (var9 != -1 && var8 != -1) { + var32.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var32.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var32.packetBuffer.writeShort((var12 & 8191) + 57344); + if (var9 != -1 && var8 != -1) { + var32.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var32.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; + field419 = class6.mouseRecorder.millis[var7]; + } + } + + if (var32 != null) { + var32.packetBuffer.writeLengthByte(var32.packetBuffer.offset - var3); + var7 = var32.packetBuffer.offset; + var32.packetBuffer.offset = var3; + var32.packetBuffer.writeByte(var5 / var6); + var32.packetBuffer.writeByte(var5 % var6); + var32.packetBuffer.offset = var7; + packetWriter.addNode(var32); + } + + if (var4 >= class6.mouseRecorder.index) { + class6.mouseRecorder.index = 0; + } else { + MouseRecorder var46 = class6.mouseRecorder; + var46.index -= var4; + System.arraycopy(class6.mouseRecorder.xs, var4, class6.mouseRecorder.xs, 0, class6.mouseRecorder.index); + System.arraycopy(class6.mouseRecorder.ys, var4, class6.mouseRecorder.ys, 0, class6.mouseRecorder.index); + System.arraycopy(class6.mouseRecorder.millis, var4, class6.mouseRecorder.millis, 0, class6.mouseRecorder.index); + } } } - WorldMapManager.method3557(); // L: 3500 - ++field683; // L: 3501 - if (mouseCrossColor != 0) { // L: 3502 - mouseCrossState += 20; // L: 3503 - if (mouseCrossState >= 400) { // L: 3504 + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; + if (var16 > 32767L) { + var16 = 32767L; + } + + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; + var3 = MouseHandler.MouseHandler_lastPressedY; + if (var3 < 0) { + var3 = 0; + } else if (var3 > canvasHeight) { + var3 = canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; + if (var4 < 0) { + var4 = 0; + } else if (var4 > MouseRecorder.canvasWidth) { + var4 = MouseRecorder.canvasWidth; + } + + var5 = (int)var16; + var18 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2579, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); + var18.packetBuffer.writeShort(var4); + var18.packetBuffer.writeShort(var3); + packetWriter.addNode(var18); + } + + if (KeyHandler.field35 > 0) { + var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2563, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(0); + var15 = var14.packetBuffer.offset; + long var19 = UrlRequester.method2125(); + + for (var5 = 0; var5 < KeyHandler.field35; ++var5) { + long var21 = var19 - field635; + if (var21 > 16777215L) { + var21 = 16777215L; + } + + field635 = var19; + var14.packetBuffer.writeMedium((int)var21); + var14.packetBuffer.writeByte(KeyHandler.field53[var5]); + } + + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); + } + + if (field607 > 0) { + --field607; + } + + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { + field491 = true; + } + + if (field491 && field607 <= 0) { + field607 = 20; + field491 = false; + var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2641, packetWriter.isaacCipher); + var14.packetBuffer.method6692(camAngleY); + var14.packetBuffer.method6786(camAngleX); + packetWriter.addNode(var14); + } + + if (class255.hasFocus && !hadFocus) { + hadFocus = true; + var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2598, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(1); + packetWriter.addNode(var14); + } + + if (!class255.hasFocus && hadFocus) { + hadFocus = false; + var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2598, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + packetWriter.addNode(var14); + } + + if (PcmPlayer.worldMap != null) { + PcmPlayer.worldMap.method6324(); + } + + ChatChannel.method1734(); + MusicPatchPcmStream.method4644(); + int[] var33; + if (field638 != GrandExchangeEvent.Client_plane) { + field638 = GrandExchangeEvent.Client_plane; + var1 = GrandExchangeEvent.Client_plane; + var33 = class376.sceneMinimapSprite.pixels; + var3 = var33.length; + + for (var4 = 0; var4 < var3; ++var4) { + var33[var4] = 0; + } + + for (var4 = 1; var4 < 103; ++var4) { + var5 = (103 - var4) * 2048 + 24628; + + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { + WorldMapIcon_1.scene.drawTileMinimap(var33, var5, 512, var1, var6, var4); + } + + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { + WorldMapIcon_1.scene.drawTileMinimap(var33, var5, 512, var1 + 1, var6, var4); + } + + var5 += 4; + } + } + + var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + class376.sceneMinimapSprite.setRaster(); + + for (var6 = 1; var6 < 103; ++var6) { + for (var7 = 1; var7 < 103; ++var7) { + if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { + Fonts.drawObject(var1, var7, var6, var4, var5); + } + + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { + Fonts.drawObject(var1 + 1, var7, var6, var4, var5); + } + } + } + + mapIconCount = 0; + + for (var6 = 0; var6 < 104; ++var6) { + for (var7 = 0; var7 < 104; ++var7) { + long var23 = WorldMapIcon_1.scene.getFloorDecorationTag(GrandExchangeEvent.Client_plane, var6, var7); + if (0L != var23) { + var10 = class78.Entity_unpackID(var23); + var11 = ClanChannel.getObjectDefinition(var10).mapIconId; + if (var11 >= 0 && HealthBarUpdate.WorldMapElement_get(var11).field1541) { + mapIcons[mapIconCount] = HealthBarUpdate.WorldMapElement_get(var11).getSpriteBool(false); + mapIconXs[mapIconCount] = var6; + mapIconYs[mapIconCount] = var7; + ++mapIconCount; + } + } + } + } + + class263.rasterProvider.apply(); + } + + if (gameState != 30) { + return; + } + + AbstractByteArrayCopier.method4858(); + FloorDecoration.method3877(); + ++packetWriter.field1209; + if (packetWriter.field1209 > 750) { + WorldMapSection0.method3580(); + return; + } + + var1 = Players.Players_count; + var33 = Players.Players_indices; + + for (var3 = 0; var3 < var1; ++var3) { + Player var25 = players[var33[var3]]; + if (var25 != null) { + class16.updateActorSequence(var25, 1); + } + } + + NetSocket.method2629(); + class107.method2290(); + ++field555; + if (mouseCrossColor != 0) { + mouseCrossState += 20; + if (mouseCrossState >= 400) { mouseCrossColor = 0; } } - if (Login.field1034 != null) { // L: 3506 - ++field869; // L: 3507 - if (field869 >= 15) { // L: 3508 - Script.invalidateWidget(Login.field1034); // L: 3509 - Login.field1034 = null; // L: 3510 + if (Canvas.field77 != null) { + ++field512; + if (field512 >= 15) { + AttackOption.invalidateWidget(Canvas.field77); + Canvas.field77 = null; } } - Widget var35 = MusicPatchNode.mousedOverWidgetIf1; // L: 3513 - Widget var38 = class5.field42; // L: 3514 - MusicPatchNode.mousedOverWidgetIf1 = null; // L: 3515 - class5.field42 = null; // L: 3516 - draggedOnWidget = null; // L: 3517 - field731 = false; // L: 3518 - field821 = false; // L: 3519 - field847 = 0; // L: 3520 + Widget var39 = Coord.mousedOverWidgetIf1; + Widget var34 = ModeWhere.field3698; + Coord.mousedOverWidgetIf1 = null; + ModeWhere.field3698 = null; + draggedOnWidget = null; + field588 = false; + field585 = false; + field450 = 0; - while (SecureRandomCallable.isKeyDown() && field847 < 128) { // L: 3521 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && SoundCache.field446 == 66) { // L: 3522 - String var41 = ""; // L: 3525 + while (IgnoreList.isKeyDown() && field450 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class120.field1417 == 66) { + String var41 = ""; - Message var39; - for (Iterator var43 = Messages.Messages_hashTable.iterator(); var43.hasNext(); var41 = var41 + var39.sender + ':' + var39.text + '\n') { // L: 3526 3529 - var39 = (Message)var43.next(); // L: 3527 + Message var40; + for (Iterator var26 = Messages.Messages_hashTable.iterator(); var26.hasNext(); var41 = var41 + var40.sender + ':' + var40.text + '\n') { + var40 = (Message)var26.next(); } - class1.client.clipboardSetString(var41); // L: 3535 - } else if (oculusOrbState != 1 || Timer.field3780 <= 0) { // L: 3538 - field786[field847] = SoundCache.field446; // L: 3541 - field848[field847] = Timer.field3780; // L: 3542 - ++field847; // L: 3543 + Script.client.clipboardSetString(var41); + } else if (oculusOrbState != 1 || class126.field1449 <= 0) { + field430[field450] = class120.field1417; + field633[field450] = class126.field1449; + ++field450; } } - boolean var32 = staffModLevel >= 2; // L: 3547 - PacketBufferNode var28; - if (var32 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3549 - var4 = class262.localPlayer.plane - mouseWheelRotation; // L: 3550 - if (var4 < 0) { // L: 3551 - var4 = 0; - } else if (var4 > 3) { // L: 3552 - var4 = 3; + if (KitDefinition.method2779() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var3 = MouseHandler.localPlayer.plane - mouseWheelRotation; + if (var3 < 0) { + var3 = 0; + } else if (var3 > 3) { + var3 = 3; } - if (var4 != class262.localPlayer.plane) { // L: 3553 - var5 = class262.localPlayer.pathX[0] + class15.baseX; // L: 3554 - var6 = class262.localPlayer.pathY[0] + WorldMapSprite.baseY; // L: 3555 - var28 = InterfaceParent.getPacketBufferNode(ClientPacket.field2596, packetWriter.isaacCipher); // L: 3558 - var28.packetBuffer.writeShort(var5); // L: 3559 - var28.packetBuffer.method6659(0); // L: 3560 - var28.packetBuffer.method6640(var4); // L: 3561 - var28.packetBuffer.method6648(var6); // L: 3562 - packetWriter.addNode(var28); // L: 3563 + if (var3 != MouseHandler.localPlayer.plane) { + var4 = MouseHandler.localPlayer.pathX[0] + GrandExchangeOfferNameComparator.baseX; + var5 = MouseHandler.localPlayer.pathY[0] + NPC.baseY; + var18 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2634, packetWriter.isaacCipher); + var18.packetBuffer.writeByte(var3); + var18.packetBuffer.writeShort(var5); + var18.packetBuffer.method6786(var4); + var18.packetBuffer.writeInt(0); + packetWriter.addNode(var18); } - mouseWheelRotation = 0; // L: 3566 + mouseWheelRotation = 0; } - if (rootInterface != -1) { // L: 3568 - PacketWriter.updateRootInterface(rootInterface, 0, 0, AttackOption.canvasWidth, class0.canvasHeight, 0, 0); + if (rootInterface != -1) { + class245.updateRootInterface(rootInterface, 0, 0, MouseRecorder.canvasWidth, canvasHeight, 0, 0); } - ++cycleCntr; // L: 3569 + ++cycleCntr; while (true) { - Widget var40; - ScriptEvent var42; - Widget var44; + ScriptEvent var27; + Widget var42; + Widget var43; do { - var42 = (ScriptEvent)field812.removeLast(); // L: 3571 - if (var42 == null) { // L: 3572 + var27 = (ScriptEvent)field611.removeLast(); + if (var27 == null) { while (true) { do { - var42 = (ScriptEvent)field860.removeLast(); // L: 3583 - if (var42 == null) { // L: 3584 + var27 = (ScriptEvent)field685.removeLast(); + if (var27 == null) { while (true) { do { - var42 = (ScriptEvent)scriptEvents.removeLast(); // L: 3595 - if (var42 == null) { // L: 3596 - this.menu(); // L: 3606 - class19.method282(); // L: 3607 - if (clickedWidget != null) { // L: 3608 - this.method1298(); + var27 = (ScriptEvent)scriptEvents.removeLast(); + if (var27 == null) { + this.menu(); + if (PcmPlayer.worldMap != null) { + PcmPlayer.worldMap.method6162(GrandExchangeEvent.Client_plane, (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX, (MouseHandler.localPlayer.y >> 7) + NPC.baseY, false); + PcmPlayer.worldMap.loadCache(); } - if (VerticalAlignment.dragInventoryWidget != null) { // L: 3609 - Script.invalidateWidget(VerticalAlignment.dragInventoryWidget); // L: 3610 - ++itemDragDuration; // L: 3611 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3612 - if (field734) { // L: 3613 - if (VerticalAlignment.dragInventoryWidget == UserComparator2.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3614 - Widget var45 = VerticalAlignment.dragInventoryWidget; // L: 3615 - byte var33 = 0; // L: 3616 - if (field891 == 1 && var45.contentType == 206) { // L: 3617 - var33 = 1; + if (clickedWidget != null) { + this.method920(); + } + + PacketBufferNode var28; + if (dragInventoryWidget != null) { + AttackOption.invalidateWidget(dragInventoryWidget); + ++itemDragDuration; + if (MouseHandler.MouseHandler_currentButton == 0) { + if (field519) { + if (hoveredItemContainer == dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { + Widget var45 = dragInventoryWidget; + byte var35 = 0; + if (field654 == 1 && var45.contentType == 206) { + var35 = 1; } - if (var45.itemIds[dragItemSlotDestination] <= 0) { // L: 3618 - var33 = 0; + if (var45.itemIds[dragItemSlotDestination] <= 0) { + var35 = 0; } - var7 = class22.getWidgetFlags(var45); // L: 3620 - boolean var34 = (var7 >> 29 & 1) != 0; // L: 3622 - if (var34) { // L: 3624 - var8 = dragItemSlotSource; // L: 3625 - var9 = dragItemSlotDestination; // L: 3626 - var45.itemIds[var9] = var45.itemIds[var8]; // L: 3627 - var45.itemQuantities[var9] = var45.itemQuantities[var8]; // L: 3628 - var45.itemIds[var8] = -1; // L: 3629 - var45.itemQuantities[var8] = 0; // L: 3630 - } else if (var33 == 1) { // L: 3632 - var8 = dragItemSlotSource; // L: 3633 - var9 = dragItemSlotDestination; // L: 3634 + var6 = MusicPatchNode.getWidgetFlags(var45); + boolean var36 = (var6 >> 29 & 1) != 0; + if (var36) { + var7 = dragItemSlotSource; + var8 = dragItemSlotDestination; + var45.itemIds[var8] = var45.itemIds[var7]; + var45.itemQuantities[var8] = var45.itemQuantities[var7]; + var45.itemIds[var7] = -1; + var45.itemQuantities[var7] = 0; + } else if (var35 == 1) { + var7 = dragItemSlotSource; + var8 = dragItemSlotDestination; - while (var8 != var9) { // L: 3635 - if (var8 > var9) { // L: 3636 - var45.swapItems(var8 - 1, var8); // L: 3637 - --var8; // L: 3638 - } else if (var8 < var9) { // L: 3640 - var45.swapItems(var8 + 1, var8); // L: 3641 - ++var8; // L: 3642 + while (var7 != var8) { + if (var7 > var8) { + var45.swapItems(var7 - 1, var7); + --var7; + } else if (var7 < var8) { + var45.swapItems(var7 + 1, var7); + ++var7; } } } else { - var45.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3647 + var45.swapItems(dragItemSlotDestination, dragItemSlotSource); } - PacketBufferNode var29 = InterfaceParent.getPacketBufferNode(ClientPacket.field2635, packetWriter.isaacCipher); // L: 3650 - var29.packetBuffer.writeIntME(VerticalAlignment.dragInventoryWidget.id); // L: 3651 - var29.packetBuffer.writeShort(dragItemSlotDestination); // L: 3652 - var29.packetBuffer.writeShort(dragItemSlotSource); // L: 3653 - var29.packetBuffer.method6639(var33); // L: 3654 - packetWriter.addNode(var29); // L: 3655 + var28 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2577, packetWriter.isaacCipher); + var28.packetBuffer.writeIntME(dragInventoryWidget.id); + var28.packetBuffer.method6786(dragItemSlotSource); + var28.packetBuffer.method6692(dragItemSlotDestination); + var28.packetBuffer.writeByte(var35); + packetWriter.addNode(var28); } - } else if (this.shouldLeftClickOpenMenu()) { // L: 3659 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3660 - } else if (menuOptionsCount > 0) { // L: 3662 - var4 = draggedWidgetX; // L: 3663 - var5 = draggedWidgetY; // L: 3664 - TaskHandler.method2625(class29.tempMenuAction, var4, var5); // L: 3666 - class29.tempMenuAction = null; // L: 3667 + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(draggedWidgetX, draggedWidgetY); + } else if (menuOptionsCount > 0) { + var3 = draggedWidgetX; + var4 = draggedWidgetY; + SoundCache.method542(ClanChannelMember.tempMenuAction, var3, var4); + ClanChannelMember.tempMenuAction = null; } - field869 = 10; // L: 3671 - MouseHandler.MouseHandler_lastButton = 0; // L: 3672 - VerticalAlignment.dragInventoryWidget = null; // L: 3673 - } 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: 3676 3677 - field734 = true; // L: 3678 + field512 = 10; + MouseHandler.MouseHandler_lastButton = 0; + dragInventoryWidget = null; + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { + field519 = true; } } - if (Scene.shouldSendWalk()) { // L: 3683 - var4 = Scene.Scene_selectedX; // L: 3684 - var5 = Scene.Scene_selectedY; // L: 3685 - var18 = InterfaceParent.getPacketBufferNode(ClientPacket.field2670, packetWriter.isaacCipher); // L: 3687 - var18.packetBuffer.writeByte(5); // L: 3688 - var18.packetBuffer.writeShort(var5 + WorldMapSprite.baseY); // L: 3689 - var18.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3690 - var18.packetBuffer.method6649(var4 + class15.baseX); // L: 3691 - packetWriter.addNode(var18); // L: 3692 - Scene.method4069(); // L: 3693 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3694 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3695 - mouseCrossColor = 1; // L: 3696 - mouseCrossState = 0; // L: 3697 - destinationX = var4; // L: 3698 - destinationY = var5; // L: 3699 + if (Scene.shouldSendWalk()) { + var3 = Scene.Scene_selectedX; + var4 = Scene.Scene_selectedY; + PacketBufferNode var44 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2612, packetWriter.isaacCipher); + var44.packetBuffer.writeByte(5); + var44.packetBuffer.method6786(var3 + GrandExchangeOfferNameComparator.baseX); + var44.packetBuffer.writeShort(var4 + NPC.baseY); + var44.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + packetWriter.addNode(var44); + Scene.method4014(); + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; + mouseCrossColor = 1; + mouseCrossState = 0; + destinationX = var3; + destinationY = var4; } - if (var35 != MusicPatchNode.mousedOverWidgetIf1) { // L: 3701 - if (var35 != null) { // L: 3702 - Script.invalidateWidget(var35); + if (var39 != Coord.mousedOverWidgetIf1) { + if (var39 != null) { + AttackOption.invalidateWidget(var39); } - if (MusicPatchNode.mousedOverWidgetIf1 != null) { // L: 3703 - Script.invalidateWidget(MusicPatchNode.mousedOverWidgetIf1); + if (Coord.mousedOverWidgetIf1 != null) { + AttackOption.invalidateWidget(Coord.mousedOverWidgetIf1); } } - if (var38 != class5.field42 && field693 == field773) { // L: 3705 - if (var38 != null) { // L: 3706 - Script.invalidateWidget(var38); + if (var34 != ModeWhere.field3698 && field648 == field559) { + if (var34 != null) { + AttackOption.invalidateWidget(var34); } - if (class5.field42 != null) { // L: 3707 - Script.invalidateWidget(class5.field42); + if (ModeWhere.field3698 != null) { + AttackOption.invalidateWidget(ModeWhere.field3698); } } - if (class5.field42 != null) { // L: 3709 - if (field773 < field693) { // L: 3710 - ++field773; // L: 3711 - if (field773 == field693) { // L: 3712 - Script.invalidateWidget(class5.field42); + if (ModeWhere.field3698 != null) { + if (field648 < field559) { + ++field648; + if (field648 == field559) { + AttackOption.invalidateWidget(ModeWhere.field3698); } } - } else if (field773 > 0) { // L: 3715 - --field773; + } else if (field648 > 0) { + --field648; } - Varps.method4783(); // L: 3716 - if (isCameraLocked) { // L: 3717 - Coord.method4790(); + if (oculusOrbState == 0) { + var3 = MouseHandler.localPlayer.x; + var4 = MouseHandler.localPlayer.y; + if (KeyHandler.oculusOrbFocalPointX - var3 < -500 || KeyHandler.oculusOrbFocalPointX - var3 > 500 || ArchiveDiskAction.oculusOrbFocalPointY - var4 < -500 || ArchiveDiskAction.oculusOrbFocalPointY - var4 > 500) { + KeyHandler.oculusOrbFocalPointX = var3; + ArchiveDiskAction.oculusOrbFocalPointY = var4; + } + + if (var3 != KeyHandler.oculusOrbFocalPointX) { + KeyHandler.oculusOrbFocalPointX += (var3 - KeyHandler.oculusOrbFocalPointX) / 16; + } + + if (var4 != ArchiveDiskAction.oculusOrbFocalPointY) { + ArchiveDiskAction.oculusOrbFocalPointY += (var4 - ArchiveDiskAction.oculusOrbFocalPointY) / 16; + } + + var5 = KeyHandler.oculusOrbFocalPointX >> 7; + var6 = ArchiveDiskAction.oculusOrbFocalPointY >> 7; + var7 = class122.getTileHeight(KeyHandler.oculusOrbFocalPointX, ArchiveDiskAction.oculusOrbFocalPointY, GrandExchangeEvent.Client_plane); + var8 = 0; + if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { + for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { + var11 = GrandExchangeEvent.Client_plane; + if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { + ++var11; + } + + var12 = var7 - Tiles.Tiles_heights[var11][var9][var10]; + if (var12 > var8) { + var8 = var12; + } + } + } + } + + var9 = var8 * 192; + if (var9 > 98048) { + var9 = 98048; + } + + if (var9 < 32768) { + var9 = 32768; + } + + if (var9 > field492) { + field492 += (var9 - field492) / 24; + } else if (var9 < field492) { + field492 += (var9 - field492) / 80; + } + + class270.field3532 = class122.getTileHeight(MouseHandler.localPlayer.x, MouseHandler.localPlayer.y, GrandExchangeEvent.Client_plane) - camFollowHeight; + } else if (oculusOrbState == 1) { + class108.method2294(); + short var37 = -1; + if (KeyHandler.KeyHandler_pressedKeys[33]) { + var37 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { + var37 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { + if (var37 == 0) { + var37 = 1792; + } else if (var37 == 1024) { + var37 = 1280; + } else { + var37 = 1536; + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { + if (var37 == 0) { + var37 = 256; + } else if (var37 == 1024) { + var37 = 768; + } else { + var37 = 512; + } + } + + byte var38 = 0; + if (KeyHandler.KeyHandler_pressedKeys[35]) { + var38 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { + var38 = 1; + } + + var5 = 0; + if (var37 >= 0 || var38 != 0) { + var5 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -410802453 * 701944259 : oculusOrbNormalSpeed * -2093914857 * 196485799; + var5 *= 16; + field440 = var37; + field485 = var38; + } + + if (field433 < var5) { + field433 += var5 / 8; + if (field433 > var5) { + field433 = var5; + } + } else if (field433 > var5) { + field433 = field433 * 9 / 10; + } + + if (field433 > 0) { + var6 = field433 / 16; + if (field440 >= 0) { + var3 = field440 - class117.cameraYaw & 2047; + var7 = Rasterizer3D.Rasterizer3D_sine[var3]; + var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; + KeyHandler.oculusOrbFocalPointX += var6 * var7 / 65536; + ArchiveDiskAction.oculusOrbFocalPointY += var6 * var8 / 65536; + } + + if (field485 != 0) { + class270.field3532 += var6 * field485; + if (class270.field3532 > 0) { + class270.field3532 = 0; + } + } + } else { + field440 = -1; + field485 = -1; + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { + packetWriter.addNode(VerticalAlignment.getPacketBufferNode(ClientPacket.field2633, packetWriter.isaacCipher)); + oculusOrbState = 0; + } } - for (var4 = 0; var4 < 5; ++var4) { // L: 3718 - var10002 = field875[var4]++; + if (MouseHandler.MouseHandler_currentButton == 4 && class310.mouseCam) { + var3 = MouseHandler.MouseHandler_y - mouseCamClickedY; + camAngleDX = var3 * 2; + mouseCamClickedY = var3 != -1 && var3 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 722992051 * 1434528635; + var4 = mouseCamClickedX - MouseHandler.MouseHandler_x; + camAngleDY = var4 * 2; + mouseCamClickedX = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_x + mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * 1500047367 * 674629047; + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { + camAngleDY += (-24 - camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { + camAngleDY += (24 - camAngleDY) / 2; + } else { + camAngleDY /= 2; + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { + camAngleDX += (12 - camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { + camAngleDX += (-12 - camAngleDX) / 2; + } else { + camAngleDX /= 2; + } + + mouseCamClickedY = MouseHandler.MouseHandler_y; + mouseCamClickedX = MouseHandler.MouseHandler_x; } - class20.varcs.tryWrite(); // L: 3719 - var4 = ClanSettings.method200(); // L: 3720 - var5 = KeyHandler.KeyHandler_idleCycles; // L: 3723 - if (var4 > 15000 && var5 > 15000) { // L: 3726 - logoutTimer = 250; // L: 3727 - MouseHandler.MouseHandler_idleCycles = 14500; // L: 3729 - var28 = InterfaceParent.getPacketBufferNode(ClientPacket.field2644, packetWriter.isaacCipher); // L: 3732 - packetWriter.addNode(var28); // L: 3733 + camAngleY = camAngleDY / 2 + camAngleY & 2047; + camAngleX += camAngleDX / 2; + if (camAngleX < 128) { + camAngleX = 128; } - DevicePcmPlayerProvider.friendSystem.processFriendUpdates(); // L: 3735 - ++packetWriter.pendingWrites; // L: 3736 - if (packetWriter.pendingWrites > 50) { // L: 3737 - var28 = InterfaceParent.getPacketBufferNode(ClientPacket.field2647, packetWriter.isaacCipher); // L: 3739 - packetWriter.addNode(var28); // L: 3740 + if (camAngleX > 383) { + camAngleX = 383; + } + + if (isCameraLocked) { + class161.method3211(); + } + + for (var3 = 0; var3 < 5; ++var3) { + int var10002 = field659[var3]++; + } + + Decimator.varcs.tryWrite(); + var3 = ++MouseHandler.MouseHandler_idleCycles - 1; + var5 = KeyHandler.KeyHandler_idleCycles; + if (var3 > 15000 && var5 > 15000) { + logoutTimer = 250; + MouseHandler.MouseHandler_idleCycles = 14500; + var28 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2663, packetWriter.isaacCipher); + packetWriter.addNode(var28); + } + + Canvas.friendSystem.processFriendUpdates(); + ++packetWriter.pendingWrites; + if (packetWriter.pendingWrites > 50) { + var28 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2573, packetWriter.isaacCipher); + packetWriter.addNode(var28); } try { - packetWriter.flush(); // L: 3743 - } catch (IOException var30) { // L: 3745 - ApproximateRouteStrategy.method1268(); // L: 3746 + packetWriter.flush(); + } catch (IOException var29) { + WorldMapSection0.method3580(); } - return; // L: 3748 + return; } - var44 = var42.widget; // L: 3597 - if (var44.childIndex < 0) { // L: 3598 + var42 = var27.widget; + if (var42.childIndex < 0) { break; } - var40 = WorldMapData_1.getWidget(var44.parentId); // L: 3599 - } while(var40 == null || var40.children == null || var44.childIndex >= var40.children.length || var44 != var40.children[var44.childIndex]); // L: 3600 + var43 = UrlRequester.getWidget(var42.parentId); + } while(var43 == null || var43.children == null || var42.childIndex >= var43.children.length || var42 != var43.children[var42.childIndex]); - WorldMapSection1.runScriptEvent(var42); // L: 3604 + UserComparator10.runScriptEvent(var27); } } - var44 = var42.widget; // L: 3585 - if (var44.childIndex < 0) { // L: 3586 + var42 = var27.widget; + if (var42.childIndex < 0) { break; } - var40 = WorldMapData_1.getWidget(var44.parentId); // L: 3587 - } while(var40 == null || var40.children == null || var44.childIndex >= var40.children.length || var44 != var40.children[var44.childIndex]); // L: 3588 + var43 = UrlRequester.getWidget(var42.parentId); + } while(var43 == null || var43.children == null || var42.childIndex >= var43.children.length || var42 != var43.children[var42.childIndex]); - WorldMapSection1.runScriptEvent(var42); // L: 3592 + UserComparator10.runScriptEvent(var27); } } - var44 = var42.widget; // L: 3573 - if (var44.childIndex < 0) { // L: 3574 + var42 = var27.widget; + if (var42.childIndex < 0) { break; } - var40 = WorldMapData_1.getWidget(var44.parentId); // L: 3575 - } while(var40 == null || var40.children == null || var44.childIndex >= var40.children.length || var44 != var40.children[var44.childIndex]); // L: 3576 + var43 = UrlRequester.getWidget(var42.parentId); + } while(var43 == null || var43.children == null || var42.childIndex >= var43.children.length || var42 != var43.children[var42.childIndex]); - WorldMapSection1.runScriptEvent(var42); // L: 3580 + UserComparator10.runScriptEvent(var27); } } + + var32 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2590, packetWriter.isaacCipher); + var32.packetBuffer.writeByte(0); + var3 = var32.packetBuffer.offset; + PendingSpawn.performReflectionCheck(var32.packetBuffer); + var32.packetBuffer.writeLengthByte(var32.packetBuffer.offset - var3); + packetWriter.addNode(var32); } } } - } // L: 3195 3488 + } - @ObfuscatedName("gn") + @ObfuscatedName("go") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1382818150" + garbageValue = "-684261743" ) @Export("resizeJS") void resizeJS() { - int var1 = AttackOption.canvasWidth; // L: 4426 - int var2 = class0.canvasHeight; // L: 4427 - if (super.contentWidth < var1) { // L: 4428 + int var1 = MouseRecorder.canvasWidth; + int var2 = canvasHeight; + if (super.contentWidth < var1) { var1 = super.contentWidth; } - if (super.contentHeight < var2) { // L: 4429 + if (super.contentHeight < var2) { var2 = super.contentHeight; } - if (class4.clientPreferences != null) { // L: 4430 + if (Decimator.clientPreferences != null) { try { - Client var3 = class1.client; // L: 4432 - Object[] var4 = new Object[]{class302.getWindowedMode()}; // L: 4433 - JSObject.getWindow(var3).call("resize", var4); // L: 4436 - } catch (Throwable var5) { // L: 4439 + class14.method155(Script.client, "resize", new Object[]{MusicPatch.getWindowedMode()}); + } catch (Throwable var4) { } } - } // L: 4441 + } - @ObfuscatedName("gb") + @ObfuscatedName("gp") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "110" + descriptor = "(I)V", + garbageValue = "2084613464" ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootInterface != -1) { // L: 4444 - class25.method330(rootInterface); - } - int var1; - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4445 - if (field831[var1]) { // L: 4446 - field712[var1] = true; - } - - field833[var1] = field831[var1]; // L: 4447 - field831[var1] = false; // L: 4448 - } - - field830 = cycle; // L: 4450 - viewportX = -1; // L: 4451 - viewportY = -1; // L: 4452 - UserComparator2.hoveredItemContainer = null; // L: 4453 - if (rootInterface != -1) { // L: 4454 - rootWidgetCount = 0; // L: 4455 - SoundSystem.drawWidgets(rootInterface, 0, 0, AttackOption.canvasWidth, class0.canvasHeight, 0, 0, -1); // L: 4456 - } - - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4458 - if (showMouseCross) { // L: 4459 - if (mouseCrossColor == 1) { // L: 4460 - NPCComposition.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4461 - } - - if (mouseCrossColor == 2) { // L: 4463 - NPCComposition.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4464 + if (rootInterface != -1) { + var1 = rootInterface; + if (Huffman.loadInterface(var1)) { + VarcInt.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); } } - if (!isMenuOpen) { // L: 4467 - if (viewportX != -1) { // L: 4468 - class15.method241(viewportX, viewportY); + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field616[var1]) { + field617[var1] = true; + } + + field508[var1] = field616[var1]; + field616[var1] = false; + } + + field615 = cycle; + viewportX = -1; + viewportY = -1; + hoveredItemContainer = null; + if (rootInterface != -1) { + rootWidgetCount = 0; + class41.drawWidgets(rootInterface, 0, 0, MouseRecorder.canvasWidth, canvasHeight, 0, 0, -1); + } + + Rasterizer2D.Rasterizer2D_resetClip(); + if (showMouseCross) { + if (mouseCrossColor == 1) { + Varcs.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + } + + if (mouseCrossColor == 2) { + Varcs.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + } + } + + int var2; + int var3; + if (!isMenuOpen) { + if (viewportX != -1) { + var1 = viewportX; + var2 = viewportY; + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { + var3 = CollisionMap.method3204(); + String var13; + if (isItemSelected == 1 && menuOptionsCount < 2) { + var13 = "Use" + " " + selectedItemName + " " + "->"; + } else if (isSpellSelected && menuOptionsCount < 2) { + var13 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + } else { + String var14; + if (var3 < 0) { + var14 = ""; + } else if (menuTargets[var3].length() > 0) { + var14 = menuActions[var3] + " " + menuTargets[var3]; + } else { + var14 = menuActions[var3]; + } + + var13 = var14; + } + + if (menuOptionsCount > 2) { + var13 = var13 + ScriptFrame.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + } + + TaskHandler.fontBold12.drawRandomAlphaAndSpacing(var13, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + } } } else { - var1 = StructComposition.menuX; // L: 4471 - int var2 = class143.menuY; // L: 4472 - int var3 = UserComparator3.menuWidth; // L: 4473 - int var4 = PendingSpawn.menuHeight; // L: 4474 - int var5 = 6116423; // L: 4475 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4476 - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4477 - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4478 - class309.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4479 - int var6 = MouseHandler.MouseHandler_x; // L: 4480 - int var7 = MouseHandler.MouseHandler_y; // L: 4481 + var1 = SpotAnimationDefinition.menuX; + var2 = DefaultsGroup.menuY; + var3 = DevicePcmPlayerProvider.menuWidth; + int var4 = GraphicsObject.menuHeight; + int var5 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); + Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); + TaskHandler.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); + int var6 = MouseHandler.MouseHandler_x; + int var7 = MouseHandler.MouseHandler_y; - for (int var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4482 - int var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; // L: 4483 - int var10 = 16777215; // L: 4484 - if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4485 + for (int var8 = 0; var8 < menuOptionsCount; ++var8) { + int var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; + int var10 = 16777215; + if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { var10 = 16776960; } - class309.fontBold12.draw(class0.method1(var8), var1 + 3, var9, var10, 0); // L: 4486 + Font var11 = TaskHandler.fontBold12; + String var12; + if (var8 < 0) { + var12 = ""; + } else if (menuTargets[var8].length() > 0) { + var12 = menuActions[var8] + " " + menuTargets[var8]; + } else { + var12 = menuActions[var8]; + } + + var11.draw(var12, var1 + 3, var9, var10, 0); } - ReflectionCheck.method1229(StructComposition.menuX, class143.menuY, UserComparator3.menuWidth, PendingSpawn.menuHeight); // L: 4488 + NPCComposition.method2830(SpotAnimationDefinition.menuX, DefaultsGroup.menuY, DevicePcmPlayerProvider.menuWidth, GraphicsObject.menuHeight); } - if (gameDrawingMode == 3) { // L: 4490 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4491 - if (field833[var1]) { // L: 4492 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4493 - } else if (field712[var1]) { // L: 4495 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4496 + if (gameDrawingMode == 3) { + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field508[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); + } else if (field617[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - UrlRequest.method2519(SoundSystem.Client_plane, class262.localPlayer.x, class262.localPlayer.y, field683); // L: 4500 - field683 = 0; // L: 4501 - } // L: 4502 + World.method1427(GrandExchangeEvent.Client_plane, MouseHandler.localPlayer.x, MouseHandler.localPlayer.y, field555); + field555 = 0; + } - @ObfuscatedName("hn") + @ObfuscatedName("hl") @ObfuscatedSignature( - descriptor = "(Ldq;I)Z", - garbageValue = "-372201617" + descriptor = "(Lcj;B)Z", + garbageValue = "28" ) - final boolean method1655(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5859 - PacketBuffer var3 = var1.packetBuffer; // L: 5860 - if (var2 == null) { // L: 5861 + final boolean method914(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); + PacketBuffer var3 = var1.packetBuffer; + if (var2 == null) { return false; } else { int var6; - String var26; + String var18; try { int var5; - if (var1.serverPacket == null) { // L: 5863 - if (var1.field1412) { // L: 5864 - if (!var2.isAvailable(1)) { // L: 5865 + if (var1.serverPacket == null) { + if (var1.field1210) { + if (!var2.isAvailable(1)) { return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 5866 - var1.field1408 = 0; // L: 5867 - var1.field1412 = false; // L: 5868 + var2.read(var1.packetBuffer.array, 0, 1); + var1.field1209 = 0; + var1.field1210 = false; } - var3.offset = 0; // L: 5870 - if (var3.method6569()) { // L: 5871 - if (!var2.isAvailable(1)) { // L: 5872 + var3.offset = 0; + if (var3.method6598()) { + if (!var2.isAvailable(1)) { return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 5873 - var1.field1408 = 0; // L: 5874 + var2.read(var1.packetBuffer.array, 1, 1); + var1.field1209 = 0; } - var1.field1412 = true; // L: 5876 - ServerPacket[] var4 = WorldMapIcon_0.ServerPacket_values(); // L: 5877 - var5 = var3.readSmartByteShortIsaac(); // L: 5878 - if (var5 < 0 || var5 >= var4.length) { // L: 5879 + var1.field1210 = true; + ServerPacket[] var4 = WorldMapAreaData.ServerPacket_values(); + var5 = var3.readSmartByteShortIsaac(); + if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 5880 - var1.serverPacketLength = var1.serverPacket.length; // L: 5881 + var1.serverPacket = var4[var5]; + var1.serverPacketLength = var1.serverPacket.length; } - if (var1.serverPacketLength == -1) { // L: 5883 - if (!var2.isAvailable(1)) { // L: 5884 + if (var1.serverPacketLength == -1) { + if (!var2.isAvailable(1)) { return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 5885 - var1.serverPacketLength = var3.array[0] & 255; // L: 5886 + var1.getSocket().read(var3.array, 0, 1); + var1.serverPacketLength = var3.array[0] & 255; } - if (var1.serverPacketLength == -2) { // L: 5888 - if (!var2.isAvailable(2)) { // L: 5889 + if (var1.serverPacketLength == -2) { + if (!var2.isAvailable(2)) { return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 5890 - var3.offset = 0; // L: 5891 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 5892 + var1.getSocket().read(var3.array, 0, 2); + var3.offset = 0; + var1.serverPacketLength = var3.readUnsignedShort(); } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5894 + if (!var2.isAvailable(var1.serverPacketLength)) { return false; } - var3.offset = 0; // L: 5895 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 5896 - var1.field1408 = 0; // L: 5897 - timer.method5690(); // L: 5898 - var1.field1399 = var1.field1411; // L: 5899 - var1.field1411 = var1.field1410; // L: 5900 - var1.field1410 = var1.serverPacket; // L: 5901 - if (ServerPacket.field2776 == var1.serverPacket) { // L: 5902 - DevicePcmPlayerProvider.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5903 - field817 = cycleCntr; // L: 5904 - var1.serverPacket = null; // L: 5905 - return true; // L: 5906 - } - - if (ServerPacket.field2704 == var1.serverPacket) { // L: 5908 - if (rootInterface != -1) { // L: 5909 - class8.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; // L: 5910 - return true; // L: 5911 - } - - int var7; - int var17; - if (ServerPacket.field2774 == var1.serverPacket) { // L: 5913 - WorldMapID.method3717(); // L: 5914 - var17 = var3.method6725(); // L: 5915 - var5 = var3.readUnsignedByte(); // L: 5916 - var6 = var3.method6642(); // L: 5917 - experience[var6] = var17; // L: 5918 - currentLevels[var6] = var5; // L: 5919 - levels[var6] = 1; // L: 5920 - - for (var7 = 0; var7 < 98; ++var7) { // L: 5921 - if (var17 >= Skills.Skills_experienceTable[var7]) { - levels[var6] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var6; // L: 5922 - var1.serverPacket = null; // L: 5923 - return true; // L: 5924 - } - - long var18; - long var20; - String var22; - String var48; - int var54; - if (ServerPacket.field2732 == var1.serverPacket) { // L: 5926 - var48 = var3.readStringCp1252NullTerminated(); // L: 5927 - var18 = (long)var3.readUnsignedShort(); // L: 5928 - var20 = (long)var3.readMedium(); // L: 5929 - PlayerType var9 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var3.readUnsignedByte()); // L: 5930 - long var10 = (var18 << 32) + var20; // L: 5931 - boolean var12 = false; // L: 5932 - - for (var54 = 0; var54 < 100; ++var54) { // L: 5933 - if (var10 == crossWorldMessageIds[var54]) { // L: 5934 - var12 = true; // L: 5935 - break; // L: 5936 - } - } - - if (DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var48, LoginScreenAnimation.loginType))) { // L: 5939 - var12 = true; - } - - if (!var12 && field629 == 0) { // L: 5940 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var10; // L: 5941 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5942 - var22 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(var3))); // L: 5943 - byte var56; - if (var9.isPrivileged) { // L: 5945 - var56 = 7; - } else { - var56 = 3; // L: 5946 - } - - if (var9.modIcon != -1) { // L: 5947 - UserComparator10.addGameMessage(var56, MusicPatchPcmStream.method4743(var9.modIcon) + var48, var22); - } else { - UserComparator10.addGameMessage(var56, var48, var22); // L: 5948 - } - } - - var1.serverPacket = null; // L: 5950 - return true; // L: 5951 - } - - if (ServerPacket.field2718 == var1.serverPacket) { // L: 5953 - UrlRequest.method2511(class226.field2686); // L: 5954 - var1.serverPacket = null; // L: 5955 - return true; // L: 5956 - } - - if (ServerPacket.field2758 == var1.serverPacket) { // L: 5958 - class10.field74 = new class340(class26.HitSplatDefinition_cachedSprites); // L: 5959 - var1.serverPacket = null; // L: 5960 - return true; // L: 5961 - } - - int var8; - long var23; - if (ServerPacket.field2736 == var1.serverPacket) { // L: 5963 - var17 = var3.readUnsignedShort(); // L: 5964 - if (var17 == 65535) { // L: 5965 - var17 = -1; - } - - var5 = var3.readInt(); // L: 5966 - var6 = var3.method6725(); // L: 5967 - var7 = var3.method6653(); // L: 5968 - if (var7 == 65535) { // L: 5969 - var7 = -1; - } - - for (var8 = var17; var8 <= var7; ++var8) { // L: 5970 - var23 = ((long)var5 << 32) + (long)var8; // L: 5971 - Node var53 = widgetFlags.get(var23); // L: 5972 - if (var53 != null) { // L: 5973 - var53.remove(); - } - - widgetFlags.put(new IntegerNode(var6), var23); // L: 5974 - } - - var1.serverPacket = null; // L: 5976 - return true; // L: 5977 - } - - if (ServerPacket.field2766 == var1.serverPacket) { // L: 5979 - var3.offset += 28; // L: 5980 - if (var3.checkCrc()) { // L: 5981 - WorldMapRectangle.method3709(var3, var3.offset - 28); - } - - var1.serverPacket = null; // L: 5982 - return true; // L: 5983 - } - - if (ServerPacket.field2724 == var1.serverPacket) { // L: 5985 - var17 = var3.readInt(); // L: 5986 - var5 = var3.readInt(); // L: 5987 - var6 = class29.getGcDuration(); // L: 5988 - PacketBufferNode var61 = InterfaceParent.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); // L: 5990 - var61.packetBuffer.method6641(GameEngine.fps); // L: 5991 - var61.packetBuffer.method6659(var17); // L: 5992 - var61.packetBuffer.method6658(var5); // L: 5993 - var61.packetBuffer.writeByte(var6); // L: 5994 - packetWriter.addNode(var61); // L: 5995 - var1.serverPacket = null; // L: 5996 - return true; // L: 5997 - } - - if (ServerPacket.field2705 == var1.serverPacket) { // L: 5999 - isCameraLocked = false; // L: 6000 - - for (var17 = 0; var17 < 5; ++var17) { // L: 6001 - field871[var17] = false; - } - - var1.serverPacket = null; // L: 6002 - return true; // L: 6003 - } - - Widget var68; - if (ServerPacket.field2708 == var1.serverPacket) { // L: 6005 - var17 = var3.method6662(); // L: 6006 - var68 = WorldMapData_1.getWidget(var17); // L: 6007 - var68.modelType = 3; // L: 6008 - var68.modelId = class262.localPlayer.appearance.getChatHeadId(); // L: 6009 - Script.invalidateWidget(var68); // L: 6010 - var1.serverPacket = null; // L: 6011 - return true; // L: 6012 - } - - if (ServerPacket.field2771 == var1.serverPacket) { // L: 6014 - var17 = var3.readUnsignedByte(); // L: 6015 - var5 = var3.readUnsignedByte(); // L: 6016 - var6 = var3.readUnsignedByte(); // L: 6017 - var7 = var3.readUnsignedByte(); // L: 6018 - field871[var17] = true; // L: 6019 - field872[var17] = var5; // L: 6020 - field873[var17] = var6; // L: 6021 - field867[var17] = var7; // L: 6022 - field875[var17] = 0; // L: 6023 - var1.serverPacket = null; // L: 6024 - return true; // L: 6025 - } - - if (ServerPacket.field2765 == var1.serverPacket) { // L: 6027 - var48 = var3.readStringCp1252NullTerminated(); // L: 6028 - Object[] var72 = new Object[var48.length() + 1]; // L: 6029 - - for (var6 = var48.length() - 1; var6 >= 0; --var6) { // L: 6030 - if (var48.charAt(var6) == 's') { // L: 6031 - var72[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var72[var6 + 1] = new Integer(var3.readInt()); // L: 6032 - } - } - - var72[0] = new Integer(var3.readInt()); // L: 6034 - ScriptEvent var79 = new ScriptEvent(); // L: 6035 - var79.args = var72; // L: 6036 - WorldMapSection1.runScriptEvent(var79); // L: 6037 - var1.serverPacket = null; // L: 6038 - return true; // L: 6039 - } - - if (ServerPacket.field2779 == var1.serverPacket) { // L: 6041 - var48 = var3.readStringCp1252NullTerminated(); // L: 6042 - var26 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(var3))); // L: 6043 - UserComparator10.addGameMessage(6, var48, var26); // L: 6044 - var1.serverPacket = null; // L: 6045 - return true; // L: 6046 - } - - byte var58; - if (ServerPacket.field2795 == var1.serverPacket) { // L: 6048 - SecureRandomFuture.method2085(); // L: 6049 - var58 = var3.readByte(); // L: 6050 - if (var1.serverPacketLength == 1) { // L: 6051 - if (var58 >= 0) { // L: 6052 - currentClanSettings[var58] = null; - } else { - WorldMapManager.guestClanSettings = null; // L: 6053 - } - - var1.serverPacket = null; // L: 6054 - return true; // L: 6055 - } - - if (var58 >= 0) { // L: 6057 - currentClanSettings[var58] = new ClanSettings(var3); // L: 6058 - } else { - WorldMapManager.guestClanSettings = new ClanSettings(var3); // L: 6061 - } - - var1.serverPacket = null; // L: 6063 - return true; // L: 6064 - } - - if (ServerPacket.field2753 == var1.serverPacket) { // L: 6066 - var17 = var3.readUnsignedByte(); // L: 6067 - if (var3.readUnsignedByte() == 0) { // L: 6068 - grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 6069 - var3.offset += 18; // L: 6070 - } else { - --var3.offset; // L: 6073 - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6074 - } - - field827 = cycleCntr; // L: 6076 - var1.serverPacket = null; // L: 6077 - return true; // L: 6078 - } - - if (ServerPacket.field2709 == var1.serverPacket) { // L: 6080 - WorldMapID.method3717(); // L: 6081 - weight = var3.readShort(); // L: 6082 - field823 = cycleCntr; // L: 6083 - var1.serverPacket = null; // L: 6084 - return true; // L: 6085 - } - - if (ServerPacket.field2762 == var1.serverPacket) { // L: 6087 - UrlRequest.method2511(class226.field2687); // L: 6088 - var1.serverPacket = null; // L: 6089 - return true; // L: 6090 - } - - if (ServerPacket.field2722 == var1.serverPacket) { // L: 6092 - class16.updateNpcs(true, var3); // L: 6093 - var1.serverPacket = null; // L: 6094 - return true; // L: 6095 - } - - Widget var59; - if (ServerPacket.field2799 == var1.serverPacket) { // L: 6097 - var17 = var3.method6653(); // L: 6098 - if (var17 == 65535) { // L: 6099 - var17 = -1; - } - - var5 = var3.method6662(); // L: 6100 - var6 = var3.method6725(); // L: 6101 - var59 = WorldMapData_1.getWidget(var5); // L: 6102 - ItemComposition var71; - if (!var59.isIf3) { // L: 6103 - if (var17 == -1) { // L: 6104 - var59.modelType = 0; // L: 6105 - var1.serverPacket = null; // L: 6106 - return true; // L: 6107 - } - - var71 = class250.ItemDefinition_get(var17); // L: 6109 - var59.modelType = 4; // L: 6110 - var59.modelId = var17; // L: 6111 - var59.modelAngleX = var71.xan2d; // L: 6112 - var59.modelAngleY = var71.yan2d; // L: 6113 - var59.modelZoom = var71.zoom2d * 100 / var6; // L: 6114 - Script.invalidateWidget(var59); // L: 6115 - } else { - var59.itemId = var17; // L: 6118 - var59.itemQuantity = var6; // L: 6119 - var71 = class250.ItemDefinition_get(var17); // L: 6120 - var59.modelAngleX = var71.xan2d; // L: 6121 - var59.modelAngleY = var71.yan2d; // L: 6122 - var59.modelAngleZ = var71.zan2d; // L: 6123 - var59.modelOffsetX = var71.offsetX2d; // L: 6124 - var59.modelOffsetY = var71.offsetY2d; // L: 6125 - var59.modelZoom = var71.zoom2d; // L: 6126 - if (var71.isStackable == 1) { // L: 6127 - var59.itemQuantityMode = 1; - } else { - var59.itemQuantityMode = 2; // L: 6128 - } - - if (var59.field3011 > 0) { // L: 6129 - var59.modelZoom = var59.modelZoom * 32 / var59.field3011; - } else if (var59.rawWidth > 0) { // L: 6130 - var59.modelZoom = var59.modelZoom * 32 / var59.rawWidth; - } - - Script.invalidateWidget(var59); // L: 6131 - } - - var1.serverPacket = null; // L: 6133 - return true; // L: 6134 - } - - if (ServerPacket.field2750 == var1.serverPacket) { // L: 6136 - SecureRandomFuture.method2085(); // L: 6137 - var58 = var3.readByte(); // L: 6138 - class2 var70 = new class2(var3); // L: 6139 - ClanSettings var78; - if (var58 >= 0) { // L: 6141 - var78 = currentClanSettings[var58]; - } else { - var78 = WorldMapManager.guestClanSettings; // L: 6142 - } - - var70.method24(var78); // L: 6143 - var1.serverPacket = null; // L: 6144 - return true; // L: 6145 - } - - boolean var63; - if (ServerPacket.field2707 == var1.serverPacket) { // L: 6147 - var63 = var3.readUnsignedByte() == 1; // L: 6148 - if (var63) { // L: 6149 - WorldMapEvent.field2150 = ClientPacket.currentTimeMillis() - var3.readLong(); // L: 6150 - class267.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6151 - } else { - class267.grandExchangeEvents = null; // L: 6153 - } - - field822 = cycleCntr; // L: 6154 - var1.serverPacket = null; // L: 6155 - return true; // L: 6156 - } - - if (ServerPacket.field2759 == var1.serverPacket) { // L: 6158 - isCameraLocked = true; // L: 6159 - SoundCache.field448 = var3.readUnsignedByte(); // L: 6160 - AttackOption.field1351 = var3.readUnsignedByte(); // L: 6161 - field659 = var3.readUnsignedShort(); // L: 6162 - Message.field602 = var3.readUnsignedByte(); // L: 6163 - FloorUnderlayDefinition.field1707 = var3.readUnsignedByte(); // L: 6164 - if (FloorUnderlayDefinition.field1707 >= 100) { // L: 6165 - ObjectSound.cameraX = SoundCache.field448 * 128 + 64; // L: 6166 - Canvas.cameraZ = AttackOption.field1351 * 128 + 64; // L: 6167 - class160.cameraY = ItemContainer.getTileHeight(ObjectSound.cameraX, Canvas.cameraZ, SoundSystem.Client_plane) - field659; // L: 6168 - } - - var1.serverPacket = null; // L: 6170 - return true; // L: 6171 - } - - if (ServerPacket.field2706 == var1.serverPacket) { // L: 6173 - UrlRequest.method2511(class226.field2693); // L: 6174 - var1.serverPacket = null; // L: 6175 - return true; // L: 6176 - } - - if (ServerPacket.field2746 == var1.serverPacket) { // L: 6178 - UrlRequest.method2511(class226.field2689); // L: 6179 - var1.serverPacket = null; // L: 6180 - return true; // L: 6181 - } - - if (ServerPacket.field2740 == var1.serverPacket) { // L: 6183 - World var50 = new World(); // L: 6184 - var50.host = var3.readStringCp1252NullTerminated(); // L: 6185 - var50.id = var3.readUnsignedShort(); // L: 6186 - var5 = var3.readInt(); // L: 6187 - var50.properties = var5; // L: 6188 - Projectile.updateGameState(45); // L: 6189 - var2.close(); // L: 6190 - var2 = null; // L: 6191 - GrandExchangeOfferAgeComparator.changeWorld(var50); // L: 6192 - var1.serverPacket = null; // L: 6193 - return false; // L: 6194 - } - - if (ServerPacket.field2792 == var1.serverPacket) { // L: 6196 - var17 = var3.readInt(); // L: 6197 - var5 = var3.method6757(); // L: 6198 - var6 = var3.method6654(); // L: 6199 - var59 = WorldMapData_1.getWidget(var17); // L: 6200 - if (var5 != var59.rawX || var6 != var59.rawY || var59.xAlignment != 0 || var59.yAlignment != 0) { // L: 6201 - var59.rawX = var5; // L: 6202 - var59.rawY = var6; // L: 6203 - var59.xAlignment = 0; // L: 6204 - var59.yAlignment = 0; // L: 6205 - Script.invalidateWidget(var59); // L: 6206 - this.alignWidget(var59); // L: 6207 - if (var59.type == 0) { // L: 6208 - WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var17 >> 16], var59, false); - } - } - - var1.serverPacket = null; // L: 6210 - return true; // L: 6211 - } - - if (ServerPacket.field2777 == var1.serverPacket) { // L: 6213 - UrlRequest.method2511(class226.field2690); // L: 6214 - var1.serverPacket = null; // L: 6215 - return true; // L: 6216 - } - - int var29; - int var30; - if (ServerPacket.field2743 == var1.serverPacket) { // L: 6218 - isCameraLocked = true; // L: 6219 - WorldMapIcon_0.field2029 = var3.readUnsignedByte(); // L: 6220 - class44.field315 = var3.readUnsignedByte(); // L: 6221 - FriendsChat.field3815 = var3.readUnsignedShort(); // L: 6222 - GrandExchangeOfferOwnWorldComparator.field607 = var3.readUnsignedByte(); // L: 6223 - class20.field166 = var3.readUnsignedByte(); // L: 6224 - if (class20.field166 >= 100) { // L: 6225 - var17 = WorldMapIcon_0.field2029 * 128 + 64; // L: 6226 - var5 = class44.field315 * 128 + 64; // L: 6227 - var6 = ItemContainer.getTileHeight(var17, var5, SoundSystem.Client_plane) - FriendsChat.field3815; // L: 6228 - var7 = var17 - ObjectSound.cameraX; // L: 6229 - var8 = var6 - class160.cameraY; // L: 6230 - var29 = var5 - Canvas.cameraZ; // L: 6231 - var30 = (int)Math.sqrt((double)(var7 * var7 + var29 * var29)); // L: 6232 - class69.cameraPitch = (int)(Math.atan2((double)var8, (double)var30) * 325.949D) & 2047; // L: 6233 - class32.cameraYaw = (int)(Math.atan2((double)var7, (double)var29) * -325.949D) & 2047; // L: 6234 - if (class69.cameraPitch < 128) { // L: 6235 - class69.cameraPitch = 128; - } - - if (class69.cameraPitch > 383) { // L: 6236 - class69.cameraPitch = 383; - } - } - - var1.serverPacket = null; // L: 6238 - return true; // L: 6239 - } - - if (ServerPacket.field2726 == var1.serverPacket) { // L: 6241 - class126.readReflectionCheck(var3, var1.serverPacketLength); // L: 6242 - var1.serverPacket = null; // L: 6243 - return true; // L: 6244 - } - - if (ServerPacket.field2786 == var1.serverPacket) { // L: 6246 - PcmPlayer.logOut(); // L: 6247 - var1.serverPacket = null; // L: 6248 - return false; // L: 6249 - } - - if (ServerPacket.field2721 == var1.serverPacket) { // L: 6251 - DevicePcmPlayerProvider.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6252 - World.FriendSystem_invalidateIgnoreds(); // L: 6253 - field817 = cycleCntr; // L: 6254 - var1.serverPacket = null; // L: 6255 - return true; // L: 6256 - } - - if (ServerPacket.field2703 == var1.serverPacket) { // L: 6258 - var17 = var3.method6651(); // L: 6259 - byte var57 = var3.method6682(); // L: 6260 - Varps.Varps_temp[var17] = var57; // L: 6261 - if (Varps.Varps_main[var17] != var57) { // L: 6262 - Varps.Varps_main[var17] = var57; // L: 6263 - } - - class6.changeGameOptions(var17); // L: 6265 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6266 - var1.serverPacket = null; // L: 6267 - return true; // L: 6268 - } - - if (ServerPacket.field2723 == var1.serverPacket) { // L: 6270 - var17 = var3.method6653(); // L: 6271 - var5 = var3.method6675(); // L: 6272 - Varps.Varps_temp[var17] = var5; // L: 6273 - if (Varps.Varps_main[var17] != var5) { // L: 6274 - Varps.Varps_main[var17] = var5; // L: 6275 - } - - class6.changeGameOptions(var17); // L: 6277 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6278 - var1.serverPacket = null; // L: 6279 - return true; // L: 6280 - } - - InterfaceParent var25; - if (ServerPacket.field2751 == var1.serverPacket) { // L: 6282 - var17 = var3.method6644(); // L: 6283 - var5 = var3.method6725(); // L: 6284 - var6 = var3.method6651(); // L: 6285 - var25 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6286 - if (var25 != null) { // L: 6287 - InvDefinition.closeInterface(var25, var6 != var25.group); - } - - FriendSystem.method1867(var5, var6, var17); // L: 6288 - var1.serverPacket = null; // L: 6289 - return true; // L: 6290 - } - - if (ServerPacket.field2768 == var1.serverPacket) { // L: 6292 - var17 = var3.readUnsignedByte(); // L: 6293 - ViewportMouse.method4410(var17); // L: 6294 - var1.serverPacket = null; // L: 6295 - return true; // L: 6296 - } - - if (ServerPacket.field2757 == var1.serverPacket) { // L: 6298 - KeyHandler.loadRegions(false, var1.packetBuffer); // L: 6299 - var1.serverPacket = null; // L: 6300 - return true; // L: 6301 - } - - if (ServerPacket.field2791 == var1.serverPacket) { // L: 6303 - var17 = var3.method6662(); // L: 6304 - var68 = WorldMapData_1.getWidget(var17); // L: 6305 - - for (var6 = 0; var6 < var68.itemIds.length; ++var6) { // L: 6306 - var68.itemIds[var6] = -1; // L: 6307 - var68.itemIds[var6] = 0; // L: 6308 - } - - Script.invalidateWidget(var68); // L: 6310 - var1.serverPacket = null; // L: 6311 - return true; // L: 6312 - } - - Widget var27; - if (ServerPacket.field2775 == var1.serverPacket) { // L: 6314 - var17 = var3.method6654(); // L: 6315 - var5 = var3.method6675(); // L: 6316 - var27 = WorldMapData_1.getWidget(var5); // L: 6317 - if (var17 != var27.sequenceId || var17 == -1) { // L: 6318 - var27.sequenceId = var17; // L: 6319 - var27.modelFrame = 0; // L: 6320 - var27.modelFrameCycle = 0; // L: 6321 - Script.invalidateWidget(var27); // L: 6322 - } - - var1.serverPacket = null; // L: 6324 - return true; // L: 6325 - } - - if (ServerPacket.field2778 == var1.serverPacket) { // L: 6327 - class10.field74 = null; // L: 6328 - var1.serverPacket = null; // L: 6329 - return true; // L: 6330 - } - - if (ServerPacket.field2748 == var1.serverPacket) { // L: 6332 - var17 = var3.readUnsignedShort(); // L: 6333 - var5 = var3.readUnsignedByte(); // L: 6334 - var6 = var3.readUnsignedShort(); // L: 6335 - ClanSettings.queueSoundEffect(var17, var5, var6); // L: 6336 - var1.serverPacket = null; // L: 6337 - return true; // L: 6338 - } - - if (ServerPacket.field2783 == var1.serverPacket) { // L: 6340 - class15.field128 = var3.method6643(); // L: 6341 - WorldMapSection0.field2047 = var3.method6642(); // L: 6342 - var1.serverPacket = null; // L: 6343 - return true; // L: 6344 - } - - String var74; - if (ServerPacket.field2710 == var1.serverPacket) { // L: 6346 - var17 = var3.method6643(); // L: 6347 - var5 = var3.readUnsignedByte(); // L: 6348 - var74 = var3.readStringCp1252NullTerminated(); // L: 6349 - if (var5 >= 1 && var5 <= 8) { // L: 6350 - if (var74.equalsIgnoreCase("null")) { // L: 6351 - var74 = null; - } - - playerMenuActions[var5 - 1] = var74; // L: 6352 - playerOptionsPriorities[var5 - 1] = var17 == 0; // L: 6353 - } - - var1.serverPacket = null; // L: 6355 - return true; // L: 6356 - } - - if (ServerPacket.field2725 == var1.serverPacket) { // L: 6358 - hintArrowType = var3.readUnsignedByte(); // L: 6359 - if (hintArrowType == 1) { // L: 6360 - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6361 - if (hintArrowType == 2) { // L: 6362 - hintArrowSubX = 64; // L: 6363 - hintArrowSubY = 64; // L: 6364 - } - - if (hintArrowType == 3) { // L: 6366 - hintArrowSubX = 0; // L: 6367 - hintArrowSubY = 64; // L: 6368 - } - - if (hintArrowType == 4) { // L: 6370 - hintArrowSubX = 128; // L: 6371 - hintArrowSubY = 64; // L: 6372 - } - - if (hintArrowType == 5) { // L: 6374 - hintArrowSubX = 64; // L: 6375 - hintArrowSubY = 0; // L: 6376 - } - - if (hintArrowType == 6) { // L: 6378 - hintArrowSubX = 64; // L: 6379 - hintArrowSubY = 128; // L: 6380 - } - - hintArrowType = 2; // L: 6382 - hintArrowX = var3.readUnsignedShort(); // L: 6383 - hintArrowY = var3.readUnsignedShort(); // L: 6384 - hintArrowHeight = var3.readUnsignedByte(); // L: 6385 - } - - if (hintArrowType == 10) { // L: 6387 - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; // L: 6388 - return true; // L: 6389 - } - - if (ServerPacket.field2782 == var1.serverPacket) { // L: 6391 - for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 6392 - if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { // L: 6393 - Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 6394 - class6.changeGameOptions(var17); // L: 6395 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6396 - } - } - - var1.serverPacket = null; // L: 6399 - return true; // L: 6400 - } - - Widget var28; - if (ServerPacket.field2755 == var1.serverPacket) { // L: 6402 - var17 = var3.method6653(); // L: 6403 - var5 = var3.method6675(); // L: 6404 - var6 = var3.method6652(); // L: 6405 - var7 = var3.method6652(); // L: 6406 - var28 = WorldMapData_1.getWidget(var5); // L: 6407 - if (var17 != var28.modelAngleX || var6 != var28.modelAngleY || var7 != var28.modelZoom) { // L: 6408 - var28.modelAngleX = var17; // L: 6409 - var28.modelAngleY = var6; // L: 6410 - var28.modelZoom = var7; // L: 6411 - Script.invalidateWidget(var28); // L: 6412 - } - - var1.serverPacket = null; // L: 6414 - return true; // L: 6415 - } - - boolean var51; - if (ServerPacket.field2737 == var1.serverPacket) { // L: 6417 - var17 = var3.readUShortSmart(); // L: 6418 - var51 = var3.readUnsignedByte() == 1; // L: 6419 - var74 = ""; // L: 6420 - boolean var52 = false; // L: 6421 - if (var51) { // L: 6422 - var74 = var3.readStringCp1252NullTerminated(); // L: 6423 - if (DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var74, LoginScreenAnimation.loginType))) { // L: 6424 - var52 = true; - } - } - - String var66 = var3.readStringCp1252NullTerminated(); // L: 6426 - if (!var52) { // L: 6427 - UserComparator10.addGameMessage(var17, var74, var66); - } - - var1.serverPacket = null; // L: 6428 - return true; // L: 6429 - } - - if (ServerPacket.field2752 == var1.serverPacket) { // L: 6431 - field820 = cycleCntr; // L: 6432 - var58 = var3.readByte(); // L: 6433 - if (var1.serverPacketLength == 1) { // L: 6434 - if (var58 >= 0) { // L: 6435 - currentClanChannels[var58] = null; - } else { - AttackOption.guestClanChannel = null; // L: 6436 - } - - var1.serverPacket = null; // L: 6437 - return true; // L: 6438 - } - - if (var58 >= 0) { // L: 6440 - currentClanChannels[var58] = new ClanChannel(var3); // L: 6441 - } else { - AttackOption.guestClanChannel = new ClanChannel(var3); // L: 6444 - } - - var1.serverPacket = null; // L: 6446 - return true; // L: 6447 - } - - if (ServerPacket.field2796 == var1.serverPacket) { // L: 6449 - var17 = var3.method6652(); // L: 6450 - var5 = var3.method6725(); // L: 6451 - var6 = var3.method6651(); // L: 6452 - var59 = WorldMapData_1.getWidget(var5); // L: 6453 - var59.field2981 = var17 + (var6 << 16); // L: 6454 - var1.serverPacket = null; // L: 6455 - return true; // L: 6456 - } - - if (ServerPacket.field2738 == var1.serverPacket) { // L: 6458 - var17 = var3.method6675(); // L: 6459 - var5 = var3.method6653(); // L: 6460 - var27 = WorldMapData_1.getWidget(var17); // L: 6461 - if (var27.modelType != 1 || var5 != var27.modelId) { // L: 6462 - var27.modelType = 1; // L: 6463 - var27.modelId = var5; // L: 6464 - Script.invalidateWidget(var27); // L: 6465 - } - - var1.serverPacket = null; // L: 6467 - return true; // L: 6468 - } - - if (ServerPacket.field2773 == var1.serverPacket) { // L: 6470 - WorldMapID.method3717(); // L: 6471 - runEnergy = var3.readUnsignedByte(); // L: 6472 - field823 = cycleCntr; // L: 6473 - var1.serverPacket = null; // L: 6474 - return true; // L: 6475 - } - - if (ServerPacket.field2767 == var1.serverPacket) { // L: 6477 - class16.updateNpcs(false, var3); // L: 6478 - var1.serverPacket = null; // L: 6479 - return true; // L: 6480 - } - - if (ServerPacket.field2789 == var1.serverPacket) { // L: 6482 - var63 = var3.readBoolean(); // L: 6483 - if (var63) { // L: 6484 - if (LoginPacket.field2800 == null) { // L: 6485 - LoginPacket.field2800 = new class286(); + var3.offset = 0; + var2.read(var3.array, 0, var1.serverPacketLength); + var1.field1209 = 0; + timer.method5657(); + var1.field1212 = var1.field1213; + var1.field1213 = var1.field1211; + var1.field1211 = var1.serverPacket; + boolean var68; + if (ServerPacket.field2720 == var1.serverPacket) { + var68 = var3.readBoolean(); + if (var68) { + if (class367.field4127 == null) { + class367.field4127 = new class287(); } } else { - LoginPacket.field2800 = null; // L: 6487 + class367.field4127 = null; } - var1.serverPacket = null; // L: 6488 - return true; // L: 6489 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2770 == var1.serverPacket) { // L: 6491 - var17 = var3.readInt(); // L: 6492 - var5 = var3.readUnsignedShort(); // L: 6493 - if (var17 < -70000) { // L: 6494 - var5 += 32768; + if (ServerPacket.field2708 == var1.serverPacket) { + if (rootInterface != -1) { + WorldMapData_0.runIntfCloseListeners(rootInterface, 0); } - if (var17 >= 0) { // L: 6496 - var27 = WorldMapData_1.getWidget(var17); - } else { - var27 = null; // L: 6497 + var1.serverPacket = null; + return true; + } + + int var58; + Widget var67; + if (ServerPacket.field2731 == var1.serverPacket) { + var58 = var3.method6704(); + var67 = UrlRequester.getWidget(var58); + + for (var6 = 0; var6 < var67.itemIds.length; ++var6) { + var67.itemIds[var6] = -1; + var67.itemIds[var6] = 0; } - for (; var3.offset < var1.serverPacketLength; ByteArrayPool.itemContainerSetItem(var5, var7, var8 - 1, var29)) { // L: 6498 6512 - var7 = var3.readUShortSmart(); // L: 6499 - var8 = var3.readUnsignedShort(); // L: 6500 - var29 = 0; // L: 6501 - if (var8 != 0) { // L: 6502 - var29 = var3.readUnsignedByte(); // L: 6503 - if (var29 == 255) { // L: 6504 - var29 = var3.readInt(); - } - } + AttackOption.invalidateWidget(var67); + var1.serverPacket = null; + return true; + } - if (var27 != null && var7 >= 0 && var7 < var27.itemIds.length) { // L: 6506 6507 - var27.itemIds[var7] = var8; // L: 6508 - var27.itemQuantities[var7] = var29; // L: 6509 + if (ServerPacket.field2729 == var1.serverPacket) { + class79.updatePlayers(var3, var1.serverPacketLength); + HitSplatDefinition.method2981(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2781 == var1.serverPacket) { + publicChatMode = var3.method6873(); + tradeChatMode = var3.method6688(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2719 == var1.serverPacket) { + for (var58 = 0; var58 < players.length; ++var58) { + if (players[var58] != null) { + players[var58].sequence = -1; } } - if (var27 != null) { // L: 6514 - Script.invalidateWidget(var27); - } - - WorldMapID.method3717(); // L: 6515 - changedItemContainers[++field711 - 1 & 31] = var5 & 32767; // L: 6516 - var1.serverPacket = null; // L: 6517 - return true; // L: 6518 - } - - if (ServerPacket.field2794 == var1.serverPacket) { // L: 6520 - UrlRequest.method2511(class226.field2691); // L: 6521 - var1.serverPacket = null; // L: 6522 - return true; // L: 6523 - } - - if (ServerPacket.field2745 == var1.serverPacket) { // L: 6525 - var17 = var3.method6662(); // L: 6526 - var5 = var3.method6652(); // L: 6527 - var27 = WorldMapData_1.getWidget(var17); // L: 6528 - if (var27 != null && var27.type == 0) { // L: 6529 - if (var5 > var27.scrollHeight - var27.height) { // L: 6530 - var5 = var27.scrollHeight - var27.height; - } - - if (var5 < 0) { // L: 6531 - var5 = 0; - } - - if (var5 != var27.scrollY) { // L: 6532 - var27.scrollY = var5; // L: 6533 - Script.invalidateWidget(var27); // L: 6534 + for (var58 = 0; var58 < npcs.length; ++var58) { + if (npcs[var58] != null) { + npcs[var58].sequence = -1; } } - var1.serverPacket = null; // L: 6537 - return true; // L: 6538 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2760 == var1.serverPacket) { // L: 6540 - DevicePcmPlayerProvider.friendSystem.method1817(); // L: 6541 - field817 = cycleCntr; // L: 6542 - var1.serverPacket = null; // L: 6543 - return true; // L: 6544 - } - - if (ServerPacket.field2797 == var1.serverPacket) { // L: 6546 - ClanChannel.privateChatMode = class244.method4812(var3.readUnsignedByte()); // L: 6547 - var1.serverPacket = null; // L: 6548 - return true; // L: 6549 - } - - if (ServerPacket.field2763 == var1.serverPacket) { // L: 6551 - var17 = var3.method6652(); // L: 6552 - MouseHandler.method750(var17); // L: 6553 - changedItemContainers[++field711 - 1 & 31] = var17 & 32767; // L: 6554 - var1.serverPacket = null; // L: 6555 - return true; // L: 6556 - } - - if (ServerPacket.field2728 == var1.serverPacket) { // L: 6558 - destinationX = var3.readUnsignedByte(); // L: 6559 - if (destinationX == 255) { // L: 6560 - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); // L: 6561 - if (destinationY == 255) { // L: 6562 - destinationY = 0; - } - - var1.serverPacket = null; // L: 6563 - return true; // L: 6564 - } - - if (ServerPacket.field2784 == var1.serverPacket) { // L: 6566 - var17 = var3.readInt(); // L: 6567 - InterfaceParent var67 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6568 - if (var67 != null) { // L: 6569 - InvDefinition.closeInterface(var67, true); - } - - if (meslayerContinueWidget != null) { // L: 6570 - Script.invalidateWidget(meslayerContinueWidget); // L: 6571 - meslayerContinueWidget = null; // L: 6572 - } - - var1.serverPacket = null; // L: 6574 - return true; // L: 6575 - } - - if (ServerPacket.field2719 == var1.serverPacket) { // L: 6577 - var17 = var3.method6651(); // L: 6578 - var5 = var3.method6662(); // L: 6579 - var6 = var17 >> 10 & 31; // L: 6580 - var7 = var17 >> 5 & 31; // L: 6581 - var8 = var17 & 31; // L: 6582 - var29 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 6583 - Widget var77 = WorldMapData_1.getWidget(var5); // L: 6584 - if (var29 != var77.color) { // L: 6585 - var77.color = var29; // L: 6586 - Script.invalidateWidget(var77); // L: 6587 - } - - var1.serverPacket = null; // L: 6589 - return true; // L: 6590 - } - - if (ServerPacket.field2747 == var1.serverPacket) { // L: 6592 - UrlRequest.method2511(class226.field2684); // L: 6593 - var1.serverPacket = null; // L: 6594 - return true; // L: 6595 - } - - if (ServerPacket.field2731 == var1.serverPacket) { // L: 6597 - if (class289.friendsChat != null) { // L: 6598 - class289.friendsChat.method5751(var3); // L: 6599 - } - - class248.method4916(); // L: 6601 - var1.serverPacket = null; // L: 6602 - return true; // L: 6603 - } - - if (ServerPacket.field2711 == var1.serverPacket) { // L: 6605 - class15.field128 = var3.method6644(); // L: 6606 - WorldMapSection0.field2047 = var3.method6643(); // L: 6607 - - while (var3.offset < var1.serverPacketLength) { // L: 6608 - var17 = var3.readUnsignedByte(); // L: 6609 - class226 var65 = WorldMapData_1.method3582()[var17]; // L: 6610 - UrlRequest.method2511(var65); // L: 6611 - } - - var1.serverPacket = null; // L: 6613 - return true; // L: 6614 - } - - if (ServerPacket.field2790 == var1.serverPacket) { // L: 6616 - var58 = var3.readByte(); // L: 6617 - var18 = (long)var3.readUnsignedShort(); // L: 6618 - var20 = (long)var3.readMedium(); // L: 6619 - var23 = var20 + (var18 << 32); // L: 6620 - boolean var75 = false; // L: 6621 - ClanChannel var33 = var58 >= 0 ? currentClanChannels[var58] : AttackOption.guestClanChannel; // L: 6622 - if (var33 == null) { // L: 6623 - var75 = true; - } else { - for (var54 = 0; var54 < 100; ++var54) { // L: 6625 - if (var23 == crossWorldMessageIds[var54]) { // L: 6626 - var75 = true; // L: 6627 - break; // L: 6628 - } + boolean var57; + String var71; + if (ServerPacket.field2740 == var1.serverPacket) { + var58 = var3.readUShortSmart(); + var57 = var3.readUnsignedByte() == 1; + var71 = ""; + boolean var54 = false; + if (var57) { + var71 = var3.readStringCp1252NullTerminated(); + if (Canvas.friendSystem.isIgnored(new Username(var71, GraphicsObject.loginType))) { + var54 = true; } } - if (!var75) { // L: 6632 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var23; // L: 6633 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6634 - var22 = WorldMapIcon_1.method3304(var3); // L: 6635 - int var55 = var58 >= 0 ? 43 : 46; // L: 6636 - SecureRandomCallable.addChatMessage(var55, "", var22, var33.name); // L: 6637 + String var52 = var3.readStringCp1252NullTerminated(); + if (!var54) { + class120.addGameMessage(var58, var71, var52); } - var1.serverPacket = null; // L: 6639 - return true; // L: 6640 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2749 == var1.serverPacket) { // L: 6642 - byte[] var49 = new byte[var1.serverPacketLength]; // L: 6643 - var3.method6561(var49, 0, var49.length); // L: 6644 - Buffer var64 = new Buffer(var49); // L: 6645 - var74 = var64.readStringCp1252NullTerminated(); // L: 6646 - AttackOption.openURL(var74, true, false); // L: 6647 - var1.serverPacket = null; // L: 6648 - return true; // L: 6649 - } - - if (ServerPacket.field2727 == var1.serverPacket) { // L: 6651 - TaskHandler.method2615(var3.readStringCp1252NullTerminated()); // L: 6652 - var1.serverPacket = null; // L: 6653 - return true; // L: 6654 - } - - if (ServerPacket.field2772 == var1.serverPacket) { // L: 6656 - UrlRequest.method2511(class226.field2683); // L: 6657 - var1.serverPacket = null; // L: 6658 - return true; // L: 6659 + if (ServerPacket.field2770 == var1.serverPacket) { + var58 = var3.method6706(); + var67 = UrlRequester.getWidget(var58); + var67.modelType = 3; + var67.modelId = MouseHandler.localPlayer.appearance.getChatHeadId(); + AttackOption.invalidateWidget(var67); + var1.serverPacket = null; + return true; } int var15; - long var34; - String var36; - if (ServerPacket.field2793 == var1.serverPacket) { // L: 6661 - var48 = var3.readStringCp1252NullTerminated(); // L: 6662 - var18 = var3.readLong(); // L: 6663 - var20 = (long)var3.readUnsignedShort(); // L: 6664 - var23 = (long)var3.readMedium(); // L: 6665 - PlayerType var11 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var3.readUnsignedByte()); // L: 6666 - var34 = var23 + (var20 << 32); // L: 6667 - boolean var14 = false; // L: 6668 - - for (var15 = 0; var15 < 100; ++var15) { // L: 6669 - if (crossWorldMessageIds[var15] == var34) { // L: 6670 - var14 = true; // L: 6671 - break; // L: 6672 - } - } - - if (var11.isUser && DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var48, LoginScreenAnimation.loginType))) { // L: 6675 6676 - var14 = true; - } - - if (!var14 && field629 == 0) { // L: 6678 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; // L: 6679 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6680 - var36 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(var3))); // L: 6681 - if (var11.modIcon != -1) { // L: 6682 - SecureRandomCallable.addChatMessage(9, MusicPatchPcmStream.method4743(var11.modIcon) + var48, var36, class80.base37DecodeLong(var18)); - } else { - SecureRandomCallable.addChatMessage(9, var48, var36, class80.base37DecodeLong(var18)); // L: 6683 - } - } - - var1.serverPacket = null; // L: 6685 - return true; // L: 6686 - } - - if (ServerPacket.field2712 == var1.serverPacket) { // L: 6688 - minimapState = var3.readUnsignedByte(); // L: 6689 - var1.serverPacket = null; // L: 6690 - return true; // L: 6691 - } - - if (ServerPacket.field2735 == var1.serverPacket) { // L: 6693 - if (class10.field74 == null) { // L: 6694 - class10.field74 = new class340(class26.HitSplatDefinition_cachedSprites); - } - - class391 var47 = class26.HitSplatDefinition_cachedSprites.method6052(var3); // L: 6695 - class10.field74.field3919.vmethod6398(var47.field4226, var47.field4227); // L: 6696 - field814[++field759 - 1 & 31] = var47.field4226; // L: 6697 - var1.serverPacket = null; // L: 6698 - return true; // L: 6699 - } - - if (ServerPacket.field2739 == var1.serverPacket) { // L: 6701 - var58 = var3.readByte(); // L: 6702 - var26 = var3.readStringCp1252NullTerminated(); // L: 6703 - long var37 = (long)var3.readUnsignedShort(); // L: 6704 - long var39 = (long)var3.readMedium(); // L: 6705 - PlayerType var76 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var3.readUnsignedByte()); // L: 6706 - long var41 = (var37 << 32) + var39; // L: 6707 - boolean var13 = false; // L: 6708 - ClanChannel var43 = null; // L: 6709 - var43 = var58 >= 0 ? currentClanChannels[var58] : AttackOption.guestClanChannel; // L: 6711 - if (var43 == null) { // L: 6712 - var13 = true; // L: 6713 + byte var17; + String var24; + if (ServerPacket.field2725 == var1.serverPacket) { + var17 = var3.readByte(); + var18 = var3.readStringCp1252NullTerminated(); + long var20 = (long)var3.readUnsignedShort(); + long var22 = (long)var3.readMedium(); + PlayerType var55 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var3.readUnsignedByte()); + long var11 = (var20 << 32) + var22; + boolean var56 = false; + ClanChannel var14 = null; + var14 = var17 >= 0 ? currentClanChannels[var17] : FriendLoginUpdate.guestClanChannel; + if (var14 == null) { + var56 = true; } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var76.isUser && DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var26, LoginScreenAnimation.loginType))) { // L: 6722 6723 - var13 = true; + if (var55.isUser && Canvas.friendSystem.isIgnored(new Username(var18, GraphicsObject.loginType))) { + var56 = true; } break; } - if (crossWorldMessageIds[var15] == var41) { // L: 6717 - var13 = true; // L: 6718 - break; // L: 6719 + if (var11 == crossWorldMessageIds[var15]) { + var56 = true; + break; } - ++var15; // L: 6716 + ++var15; } } - if (!var13) { // L: 6726 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 6727 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6728 - var36 = AbstractFont.escapeBrackets(WorldMapIcon_1.method3304(var3)); // L: 6729 - int var16 = var58 >= 0 ? 41 : 44; // L: 6730 - if (var76.modIcon != -1) { // L: 6731 - SecureRandomCallable.addChatMessage(var16, MusicPatchPcmStream.method4743(var76.modIcon) + var26, var36, var43.name); + if (!var56) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var24 = AbstractFont.escapeBrackets(WorldMapSectionType.method3608(var3)); + int var16 = var17 >= 0 ? 41 : 44; + if (var55.modIcon != -1) { + TaskHandler.addChatMessage(var16, HealthBar.method1945(var55.modIcon) + var18, var24, var14.name); } else { - SecureRandomCallable.addChatMessage(var16, var26, var36, var43.name); // L: 6732 + TaskHandler.addChatMessage(var16, var18, var24, var14.name); } } - var1.serverPacket = null; // L: 6734 - return true; // L: 6735 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2717 == var1.serverPacket) { // L: 6737 - var17 = var3.readInt(); // L: 6738 - var5 = var3.readInt(); // L: 6739 - InterfaceParent var73 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6740 - var25 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6741 - if (var25 != null) { // L: 6742 - InvDefinition.closeInterface(var25, var73 == null || var25.group != var73.group); - } + int var7; + int var9; + int var25; + int var26; + if (ServerPacket.field2775 == var1.serverPacket) { + isCameraLocked = true; + class376.field4165 = var3.readUnsignedByte(); + ItemLayer.field2147 = var3.readUnsignedByte(); + AbstractSocket.field3874 = var3.readUnsignedShort(); + KitDefinition.field1577 = var3.readUnsignedByte(); + Strings.field3397 = var3.readUnsignedByte(); + if (Strings.field3397 >= 100) { + var58 = class376.field4165 * 128 + 64; + var5 = ItemLayer.field2147 * 128 + 64; + var6 = class122.getTileHeight(var58, var5, GrandExchangeEvent.Client_plane) - AbstractSocket.field3874; + var7 = var58 - ItemContainer.cameraX; + var25 = var6 - Bounds.cameraY; + var9 = var5 - WorldMapArchiveLoader.cameraZ; + var26 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); + class116.cameraPitch = (int)(Math.atan2((double)var25, (double)var26) * 325.949D) & 2047; + class117.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; + if (class116.cameraPitch < 128) { + class116.cameraPitch = 128; + } - if (var73 != null) { // L: 6743 - var73.remove(); // L: 6744 - interfaceParents.put(var73, (long)var17); // L: 6745 - } - - var28 = WorldMapData_1.getWidget(var5); // L: 6747 - if (var28 != null) { // L: 6748 - Script.invalidateWidget(var28); - } - - var28 = WorldMapData_1.getWidget(var17); // L: 6749 - if (var28 != null) { // L: 6750 - Script.invalidateWidget(var28); // L: 6751 - WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var28.id >>> 16], var28, true); // L: 6752 - } - - if (rootInterface != -1) { // L: 6754 - class8.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; // L: 6755 - return true; // L: 6756 - } - - if (ServerPacket.field2761 == var1.serverPacket) { // L: 6758 - var17 = var3.readUnsignedByte(); // L: 6759 - class2.forceDisconnect(var17); // L: 6760 - var1.serverPacket = null; // L: 6761 - return false; // L: 6762 - } - - if (ServerPacket.field2781 == var1.serverPacket) { // L: 6764 - UrlRequest.method2511(class226.field2692); // L: 6765 - var1.serverPacket = null; // L: 6766 - return true; // L: 6767 - } - - if (ServerPacket.field2720 == var1.serverPacket) { // L: 6769 - for (var17 = 0; var17 < players.length; ++var17) { // L: 6770 - if (players[var17] != null) { // L: 6771 - players[var17].sequence = -1; + if (class116.cameraPitch > 383) { + class116.cameraPitch = 383; } } - for (var17 = 0; var17 < npcs.length; ++var17) { // L: 6773 - if (npcs[var17] != null) { // L: 6774 - npcs[var17].sequence = -1; + var1.serverPacket = null; + return true; + } + + int var13; + long var27; + long var29; + String var34; + String var48; + if (ServerPacket.field2737 == var1.serverPacket) { + var48 = var3.readStringCp1252NullTerminated(); + var27 = (long)var3.readUnsignedShort(); + var29 = (long)var3.readMedium(); + PlayerType var31 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var3.readUnsignedByte()); + long var32 = (var27 << 32) + var29; + boolean var12 = false; + + for (var13 = 0; var13 < 100; ++var13) { + if (var32 == crossWorldMessageIds[var13]) { + var12 = true; + break; } } - var1.serverPacket = null; // L: 6776 - return true; // L: 6777 - } - - if (ServerPacket.field2733 == var1.serverPacket) { // L: 6779 - field820 = cycleCntr; // L: 6780 - var58 = var3.readByte(); // L: 6781 - class19 var62 = new class19(var3); // L: 6782 - ClanChannel var69; - if (var58 >= 0) { // L: 6784 - var69 = currentClanChannels[var58]; - } else { - var69 = AttackOption.guestClanChannel; // L: 6785 + if (Canvas.friendSystem.isIgnored(new Username(var48, GraphicsObject.loginType))) { + var12 = true; } - var62.method278(var69); // L: 6786 - var1.serverPacket = null; // L: 6787 - return true; // L: 6788 + if (!var12 && field521 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var32; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var34 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(var3))); + byte var75; + if (var31.isPrivileged) { + var75 = 7; + } else { + var75 = 3; + } + + if (var31.modIcon != -1) { + class120.addGameMessage(var75, HealthBar.method1945(var31.modIcon) + var48, var34); + } else { + class120.addGameMessage(var75, var48, var34); + } + } + + var1.serverPacket = null; + return true; } - if (ServerPacket.field2714 == var1.serverPacket) { // L: 6790 - WorldMapSection0.field2047 = var3.method6643(); // L: 6791 - class15.field128 = var3.method6642(); // L: 6792 + if (ServerPacket.field2762 == var1.serverPacket) { + class124.privateChatMode = FloorOverlayDefinition.method3134(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; + } - for (var17 = WorldMapSection0.field2047; var17 < WorldMapSection0.field2047 + 8; ++var17) { // L: 6793 - for (var5 = class15.field128; var5 < class15.field128 + 8; ++var5) { // L: 6794 - if (groundItems[SoundSystem.Client_plane][var17][var5] != null) { // L: 6795 - groundItems[SoundSystem.Client_plane][var17][var5] = null; // L: 6796 - class26.updateItemPile(var17, var5); // L: 6797 + if (ServerPacket.field2701 == var1.serverPacket) { + Canvas.method114(class227.field2680); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2745 == var1.serverPacket) { + Canvas.method114(class227.field2676); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2699 == var1.serverPacket) { + Canvas.method114(class227.field2678); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2777 == var1.serverPacket) { + var48 = var3.readStringCp1252NullTerminated(); + var5 = var3.method6686(); + var6 = var3.method6686(); + if (var6 >= 1 && var6 <= 8) { + if (var48.equalsIgnoreCase("null")) { + var48 = null; + } + + playerMenuActions[var6 - 1] = var48; + playerOptionsPriorities[var6 - 1] = var5 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2748 == var1.serverPacket) { + var48 = var3.readStringCp1252NullTerminated(); + var18 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(var3))); + class120.addGameMessage(6, var48, var18); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2744 == var1.serverPacket) { + hintArrowType = var3.readUnsignedByte(); + if (hintArrowType == 1) { + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { + hintArrowSubX = 64; + hintArrowSubY = 64; + } + + if (hintArrowType == 3) { + hintArrowSubX = 0; + hintArrowSubY = 64; + } + + if (hintArrowType == 4) { + hintArrowSubX = 128; + hintArrowSubY = 64; + } + + if (hintArrowType == 5) { + hintArrowSubX = 64; + hintArrowSubY = 0; + } + + if (hintArrowType == 6) { + hintArrowSubX = 64; + hintArrowSubY = 128; + } + + hintArrowType = 2; + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); + hintArrowHeight = var3.readUnsignedByte(); + } + + if (hintArrowType == 10) { + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2782 == var1.serverPacket) { + var48 = var3.readStringCp1252NullTerminated(); + Object[] var66 = new Object[var48.length() + 1]; + + for (var6 = var48.length() - 1; var6 >= 0; --var6) { + if (var48.charAt(var6) == 's') { + var66[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var66[var6 + 1] = new Integer(var3.readInt()); + } + } + + var66[0] = new Integer(var3.readInt()); + ScriptEvent var72 = new ScriptEvent(); + var72.args = var66; + UserComparator10.runScriptEvent(var72); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2760 == var1.serverPacket) { + var17 = var3.method6690(); + var5 = var3.method6785(); + Varps.Varps_temp[var5] = var17; + if (Varps.Varps_main[var5] != var17) { + Varps.Varps_main[var5] = var17; + } + + ApproximateRouteStrategy.changeGameOptions(var5); + changedVarps[++changedVarpCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2783 == var1.serverPacket) { + SecureRandomFuture.field858 = var3.readUnsignedByte(); + Language.field3694 = var3.method6688(); + + for (var58 = Language.field3694; var58 < Language.field3694 + 8; ++var58) { + for (var5 = SecureRandomFuture.field858; var5 < SecureRandomFuture.field858 + 8; ++var5) { + if (groundItems[GrandExchangeEvent.Client_plane][var58][var5] != null) { + groundItems[GrandExchangeEvent.Client_plane][var58][var5] = null; + FriendSystem.updateItemPile(var58, var5); } } } - for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) { // L: 6801 6802 6804 - if (var46.x >= WorldMapSection0.field2047 && var46.x < WorldMapSection0.field2047 + 8 && var46.y >= class15.field128 && var46.y < class15.field128 + 8 && var46.plane == SoundSystem.Client_plane) { // L: 6803 - var46.hitpoints = 0; + for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { + if (var50.x >= Language.field3694 && var50.x < Language.field3694 + 8 && var50.y >= SecureRandomFuture.field858 && var50.y < SecureRandomFuture.field858 + 8 && var50.plane == GrandExchangeEvent.Client_plane) { + var50.hitpoints = 0; } } - var1.serverPacket = null; // L: 6806 - return true; // L: 6807 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2715 == var1.serverPacket) { // L: 6809 - UrlRequest.method2511(class226.field2688); // L: 6810 - var1.serverPacket = null; // L: 6811 - return true; // L: 6812 + if (ServerPacket.field2750 == var1.serverPacket) { + var58 = var3.readInt(); + InterfaceParent var65 = (InterfaceParent)interfaceParents.get((long)var58); + if (var65 != null) { + class161.closeInterface(var65, true); + } + + if (meslayerContinueWidget != null) { + AttackOption.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; + } + + var1.serverPacket = null; + return true; } - if (ServerPacket.field2713 == var1.serverPacket) { // L: 6814 - if (var1.serverPacketLength == 0) { // L: 6815 - class289.friendsChat = null; // L: 6816 - } else { - if (class289.friendsChat == null) { // L: 6819 - class289.friendsChat = new FriendsChat(LoginScreenAnimation.loginType, class1.client); // L: 6820 - } - - class289.friendsChat.readUpdate(var3); // L: 6822 + Widget var63; + if (ServerPacket.field2763 == var1.serverPacket) { + var58 = var3.method6672(); + var5 = var3.method6699(); + var63 = UrlRequester.getWidget(var58); + if (var5 != var63.sequenceId || var5 == -1) { + var63.sequenceId = var5; + var63.modelFrame = 0; + var63.modelFrameCycle = 0; + AttackOption.invalidateWidget(var63); } - class248.method4916(); // L: 6824 - var1.serverPacket = null; // L: 6825 - return true; // L: 6826 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2744 == var1.serverPacket) { // L: 6828 - var17 = var3.offset + var1.serverPacketLength; // L: 6829 - var5 = var3.readUnsignedShort(); // L: 6830 - var6 = var3.readUnsignedShort(); // L: 6831 - if (var5 != rootInterface) { // L: 6832 - rootInterface = var5; // L: 6833 - this.resizeRoot(false); // L: 6834 - TextureProvider.Widget_resetModelFrames(rootInterface); // L: 6835 - ScriptFrame.runWidgetOnLoadListener(rootInterface); // L: 6836 - - for (var7 = 0; var7 < 100; ++var7) { // L: 6837 - field831[var7] = true; - } - } - - InterfaceParent var31; - for (; var6-- > 0; var31.field1148 = true) { // L: 6839 6849 - var7 = var3.readInt(); // L: 6840 - var8 = var3.readUnsignedShort(); // L: 6841 - var29 = var3.readUnsignedByte(); // L: 6842 - var31 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6843 - if (var31 != null && var8 != var31.group) { // L: 6844 - InvDefinition.closeInterface(var31, true); // L: 6845 - var31 = null; // L: 6846 - } - - if (var31 == null) { // L: 6848 - var31 = FriendSystem.method1867(var7, var8, var29); - } - } - - for (var25 = (InterfaceParent)interfaceParents.first(); var25 != null; var25 = (InterfaceParent)interfaceParents.next()) { // L: 6851 - if (var25.field1148) { // L: 6852 - var25.field1148 = false; - } else { - InvDefinition.closeInterface(var25, true); // L: 6854 - } - } - - widgetFlags = new NodeHashTable(512); // L: 6857 - - while (var3.offset < var17) { // L: 6858 - var7 = var3.readInt(); // L: 6859 - var8 = var3.readUnsignedShort(); // L: 6860 - var29 = var3.readUnsignedShort(); // L: 6861 - var30 = var3.readInt(); // L: 6862 - - for (int var32 = var8; var32 <= var29; ++var32) { // L: 6863 - var34 = ((long)var7 << 32) + (long)var32; // L: 6864 - widgetFlags.put(new IntegerNode(var30), var34); // L: 6865 - } - } - - var1.serverPacket = null; // L: 6868 - return true; // L: 6869 + if (ServerPacket.field2773 == var1.serverPacket) { + byte[] var49 = new byte[var1.serverPacketLength]; + var3.method6600(var49, 0, var49.length); + Buffer var64 = new Buffer(var49); + var71 = var64.readStringCp1252NullTerminated(); + InvDefinition.openURL(var71, true, false); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2756 == var1.serverPacket) { // L: 6871 - rebootTimer = var3.readUnsignedShort() * 30; // L: 6872 - field823 = cycleCntr; // L: 6873 - var1.serverPacket = null; // L: 6874 - return true; // L: 6875 + if (ServerPacket.field2718 == var1.serverPacket) { + class107.method2291(); + runEnergy = var3.readUnsignedByte(); + field516 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2734 == var1.serverPacket) { // L: 6877 - var17 = var3.readInt(); // L: 6878 - var5 = var3.readUnsignedShort(); // L: 6879 - if (var17 < -70000) { // L: 6880 + if (ServerPacket.field2754 == var1.serverPacket) { + for (var58 = 0; var58 < Varps.Varps_main.length; ++var58) { + if (Varps.Varps_main[var58] != Varps.Varps_temp[var58]) { + Varps.Varps_main[var58] = Varps.Varps_temp[var58]; + ApproximateRouteStrategy.changeGameOptions(var58); + changedVarps[++changedVarpCount - 1 & 31] = var58; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2735 == var1.serverPacket) { + isCameraLocked = false; + + for (var58 = 0; var58 < 5; ++var58) { + field655[var58] = false; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2749 == var1.serverPacket) { + var58 = var3.method6706(); + var57 = var3.method6873() == 1; + var63 = UrlRequester.getWidget(var58); + if (var57 != var63.isHidden) { + var63.isHidden = var57; + AttackOption.invalidateWidget(var63); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2736 == var1.serverPacket) { + var58 = var3.method6704(); + var5 = var3.method6785(); + var6 = var5 >> 10 & 31; + var7 = var5 >> 5 & 31; + var25 = var5 & 31; + var9 = (var7 << 11) + (var6 << 19) + (var25 << 3); + Widget var53 = UrlRequester.getWidget(var58); + if (var9 != var53.color) { + var53.color = var9; + AttackOption.invalidateWidget(var53); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2702 == var1.serverPacket) { + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.method5724(var3); + } + + GameEngine.method343(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2767 == var1.serverPacket) { + Canvas.method114(class227.field2677); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2705 == var1.serverPacket) { + Language.field3694 = var3.method6686(); + SecureRandomFuture.field858 = var3.method6688(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2706 == var1.serverPacket) { + Canvas.friendSystem.readUpdate(var3, var1.serverPacketLength); + field609 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2695 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } + + Widget var74; + if (ServerPacket.field2723 == var1.serverPacket) { + var58 = var3.readInt(); + var5 = var3.readUnsignedShort(); + var6 = var3.method6697(); + var74 = UrlRequester.getWidget(var58); + var74.field3013 = var5 + (var6 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2752 == var1.serverPacket) { + var58 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var58 < -70000) { var5 += 32768; } - if (var17 >= 0) { // L: 6882 - var27 = WorldMapData_1.getWidget(var17); + if (var58 >= 0) { + var63 = UrlRequester.getWidget(var58); } else { - var27 = null; // L: 6883 + var63 = null; } - if (var27 != null) { // L: 6884 - for (var7 = 0; var7 < var27.itemIds.length; ++var7) { // L: 6885 - var27.itemIds[var7] = 0; // L: 6886 - var27.itemQuantities[var7] = 0; // L: 6887 + if (var63 != null) { + for (var7 = 0; var7 < var63.itemIds.length; ++var7) { + var63.itemIds[var7] = 0; + var63.itemQuantities[var7] = 0; } } - class126.clearItemContainer(var5); // L: 6890 - var7 = var3.readUnsignedShort(); // L: 6891 + class104.clearItemContainer(var5); + var7 = var3.readUnsignedShort(); - for (var8 = 0; var8 < var7; ++var8) { // L: 6892 - var29 = var3.method6642(); // L: 6893 - if (var29 == 255) { // L: 6894 - var29 = var3.method6675(); + for (var25 = 0; var25 < var7; ++var25) { + var9 = var3.method6696(); + var26 = var3.readUnsignedByte(); + if (var26 == 255) { + var26 = var3.method6706(); } - var30 = var3.method6652(); // L: 6895 - if (var27 != null && var8 < var27.itemIds.length) { // L: 6896 6897 - var27.itemIds[var8] = var30; // L: 6898 - var27.itemQuantities[var8] = var29; // L: 6899 + if (var63 != null && var25 < var63.itemIds.length) { + var63.itemIds[var25] = var9; + var63.itemQuantities[var25] = var26; } - ByteArrayPool.itemContainerSetItem(var5, var8, var30 - 1, var29); // L: 6902 + VarpDefinition.itemContainerSetItem(var5, var25, var9 - 1, var26); } - if (var27 != null) { // L: 6904 - Script.invalidateWidget(var27); + if (var63 != null) { + AttackOption.invalidateWidget(var63); } - WorldMapID.method3717(); // L: 6905 - changedItemContainers[++field711 - 1 & 31] = var5 & 32767; // L: 6906 - var1.serverPacket = null; // L: 6907 - return true; // L: 6908 + class107.method2291(); + changedItemContainers[++field574 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2730 == var1.serverPacket) { // L: 6910 - KeyHandler.loadRegions(true, var1.packetBuffer); // L: 6911 - var1.serverPacket = null; // L: 6912 - return true; // L: 6913 - } - - if (ServerPacket.field2780 == var1.serverPacket) { // L: 6915 - var17 = var3.method6652(); // L: 6916 - if (var17 == 65535) { // L: 6917 - var17 = -1; + Widget var51; + if (ServerPacket.field2747 == var1.serverPacket) { + var58 = var3.readUnsignedShort(); + var5 = var3.method6697(); + var6 = var3.method6696(); + var7 = var3.method6706(); + var51 = UrlRequester.getWidget(var7); + if (var5 != var51.modelAngleX || var6 != var51.modelAngleY || var58 != var51.modelZoom) { + var51.modelAngleX = var5; + var51.modelAngleY = var6; + var51.modelZoom = var58; + AttackOption.invalidateWidget(var51); } - class6.playSong(var17); // L: 6918 - var1.serverPacket = null; // L: 6919 - return true; // L: 6920 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2769 == var1.serverPacket) { // L: 6922 - var17 = var3.method6653(); // L: 6923 - if (var17 == 65535) { // L: 6924 - var17 = -1; + if (ServerPacket.field2712 == var1.serverPacket) { + var58 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var58] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var58] = new GrandExchangeOffer(var3, false); } - var5 = var3.readMedium(); // L: 6925 - ReflectionCheck.method1230(var17, var5); // L: 6926 - var1.serverPacket = null; // L: 6927 - return true; // L: 6928 + field606 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2764 == var1.serverPacket) { // L: 6930 - UserComparator9.updatePlayers(var3, var1.serverPacketLength); // L: 6931 - EnumComposition.method2827(); // L: 6932 - var1.serverPacket = null; // L: 6933 - return true; // L: 6934 - } + if (ServerPacket.field2721 == var1.serverPacket) { + class107.method2291(); + var58 = var3.readUnsignedByte(); + var5 = var3.method6704(); + var6 = var3.method6688(); + experience[var58] = var5; + currentLevels[var58] = var6; + levels[var58] = 1; - if (ServerPacket.field2785 == var1.serverPacket) { // L: 6936 - var17 = var3.readInt(); // L: 6937 - if (var17 != field704) { // L: 6938 - field704 = var17; // L: 6939 - FriendsChat.method5760(); // L: 6940 - } - - var1.serverPacket = null; // L: 6942 - return true; // L: 6943 - } - - if (ServerPacket.field2742 == var1.serverPacket) { // L: 6945 - var17 = var3.method6675(); // L: 6946 - var51 = var3.method6643() == 1; // L: 6947 - var27 = WorldMapData_1.getWidget(var17); // L: 6948 - if (var51 != var27.isHidden) { // L: 6949 - var27.isHidden = var51; // L: 6950 - Script.invalidateWidget(var27); // L: 6951 - } - - var1.serverPacket = null; // L: 6953 - return true; // L: 6954 - } - - if (ServerPacket.field2716 == var1.serverPacket) { // L: 6956 - for (var17 = 0; var17 < SoundSystem.VarpDefinition_fileCount; ++var17) { // L: 6957 - VarpDefinition var60 = class1.VarpDefinition_get(var17); // L: 6958 - if (var60 != null) { // L: 6959 - Varps.Varps_temp[var17] = 0; // L: 6960 - Varps.Varps_main[var17] = 0; // L: 6961 + for (var7 = 0; var7 < 98; ++var7) { + if (var5 >= Skills.Skills_experienceTable[var7]) { + levels[var58] = var7 + 2; } } - WorldMapID.method3717(); // L: 6964 - changedVarpCount += 32; // L: 6965 - var1.serverPacket = null; // L: 6966 - return true; // L: 6967 + changedSkills[++changedSkillsCount - 1 & 31] = var58; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2798 == var1.serverPacket) { // L: 6969 - var17 = var3.method6662(); // L: 6970 - var5 = var3.method6652(); // L: 6971 - var27 = WorldMapData_1.getWidget(var17); // L: 6972 - if (var27.modelType != 2 || var5 != var27.modelId) { // L: 6973 - var27.modelType = 2; // L: 6974 - var27.modelId = var5; // L: 6975 - Script.invalidateWidget(var27); // L: 6976 + if (ServerPacket.field2757 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + MouseRecorder.friendsChat = null; + } else { + if (MouseRecorder.friendsChat == null) { + MouseRecorder.friendsChat = new FriendsChat(GraphicsObject.loginType, Script.client); + } + + MouseRecorder.friendsChat.readUpdate(var3); } - var1.serverPacket = null; // L: 6978 - return true; // L: 6979 + GameEngine.method343(); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2754 == var1.serverPacket) { // L: 6981 - tradeChatMode = var3.method6644(); // L: 6982 - publicChatMode = var3.method6644(); // L: 6983 - var1.serverPacket = null; // L: 6984 - return true; // L: 6985 - } - - if (ServerPacket.field2741 == var1.serverPacket) { // L: 6987 - var17 = var3.method6651(); // L: 6988 - rootInterface = var17; // L: 6989 - this.resizeRoot(false); // L: 6990 - TextureProvider.Widget_resetModelFrames(var17); // L: 6991 - ScriptFrame.runWidgetOnLoadListener(rootInterface); // L: 6992 - - for (var5 = 0; var5 < 100; ++var5) { // L: 6993 - field831[var5] = true; + if (ServerPacket.field2766 == var1.serverPacket) { + var58 = var3.readInt(); + var5 = var3.readUnsignedShort(); + var63 = UrlRequester.getWidget(var58); + if (var63.modelType != 1 || var5 != var63.modelId) { + var63.modelType = 1; + var63.modelId = var5; + AttackOption.invalidateWidget(var63); } - var1.serverPacket = null; // L: 6994 - return true; // L: 6995 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2729 == var1.serverPacket) { // L: 6997 - var17 = var3.method6662(); // L: 6998 - var26 = var3.readStringCp1252NullTerminated(); // L: 6999 - var27 = WorldMapData_1.getWidget(var17); // L: 7000 - if (!var26.equals(var27.text)) { // L: 7001 - var27.text = var26; // L: 7002 - Script.invalidateWidget(var27); // L: 7003 + if (ServerPacket.field2716 == var1.serverPacket) { + var58 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByte(); + field655[var58] = true; + field436[var58] = var5; + field608[var58] = var6; + field658[var58] = var7; + field659[var58] = 0; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2707 == var1.serverPacket) { + var58 = var3.readInt(); + if (var58 != field488) { + field488 = var58; + class339.method6057(); } - var1.serverPacket = null; // L: 7005 - return true; // L: 7006 + var1.serverPacket = null; + return true; } - FriendsChat.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -678787115 * -1501005443 : -1) + "," + (var1.field1411 != null ? var1.field1411.id * -678787115 * -1501005443 : -1) + "," + (var1.field1399 != null ? var1.field1399.id * -678787115 * -1501005443 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7008 - PcmPlayer.logOut(); // L: 7009 - } catch (IOException var44) { // L: 7011 - ApproximateRouteStrategy.method1268(); // L: 7012 + if (ServerPacket.field2780 == var1.serverPacket) { + Interpreter.method1635(); + var17 = var3.readByte(); + class106 var62 = new class106(var3); + ClanSettings var70; + if (var17 >= 0) { + var70 = currentClanSettings[var17]; + } else { + var70 = class41.guestClanSettings; + } + + var62.method2273(var70); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2778 == var1.serverPacket) { + var58 = var3.readUnsignedShort(); + rootInterface = var58; + this.resizeRoot(false); + Timer.Widget_resetModelFrames(var58); + class112.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field616[var5] = true; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2755 == var1.serverPacket) { + var58 = var3.method6697(); + if (var58 == 65535) { + var58 = -1; + } + + class41.playSong(var58); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2697 == var1.serverPacket) { + var58 = var3.method6697(); + if (var58 == 65535) { + var58 = -1; + } + + var5 = var3.method6700(); + UrlRequest.method2136(var58, var5); + var1.serverPacket = null; + return true; + } + + long var38; + InterfaceParent var76; + if (ServerPacket.field2746 == var1.serverPacket) { + var58 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + Timer.Widget_resetModelFrames(rootInterface); + class112.runWidgetOnLoadListener(rootInterface); + + for (var7 = 0; var7 < 100; ++var7) { + field616[var7] = true; + } + } + + InterfaceParent var10; + for (; var6-- > 0; var10.field947 = true) { + var7 = var3.readInt(); + var25 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var10 = (InterfaceParent)interfaceParents.get((long)var7); + if (var10 != null && var25 != var10.group) { + class161.closeInterface(var10, true); + var10 = null; + } + + if (var10 == null) { + var10 = class106.method2275(var7, var25, var9); + } + } + + for (var76 = (InterfaceParent)interfaceParents.first(); var76 != null; var76 = (InterfaceParent)interfaceParents.next()) { + if (var76.field947) { + var76.field947 = false; + } else { + class161.closeInterface(var76, true); + } + } + + widgetFlags = new NodeHashTable(512); + + while (var3.offset < var58) { + var7 = var3.readInt(); + var25 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var26 = var3.readInt(); + + for (int var77 = var25; var77 <= var9; ++var77) { + var38 = (long)var77 + ((long)var7 << 32); + widgetFlags.put(new IntegerNode(var26), var38); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2765 == var1.serverPacket) { + Message.method879(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2751 == var1.serverPacket) { + var58 = var3.method6706(); + var5 = var3.readInt(); + InterfaceParent var69 = (InterfaceParent)interfaceParents.get((long)var58); + var76 = (InterfaceParent)interfaceParents.get((long)var5); + if (var76 != null) { + class161.closeInterface(var76, var69 == null || var69.group != var76.group); + } + + if (var69 != null) { + var69.remove(); + interfaceParents.put(var69, (long)var5); + } + + var51 = UrlRequester.getWidget(var58); + if (var51 != null) { + AttackOption.invalidateWidget(var51); + } + + var51 = UrlRequester.getWidget(var5); + if (var51 != null) { + AttackOption.invalidateWidget(var51); + AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var51.id >>> 16], var51, true); + } + + if (rootInterface != -1) { + WorldMapData_0.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2756 == var1.serverPacket) { + ParamComposition.updateNpcs(true, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2691 == var1.serverPacket) { + var58 = var3.method6686(); + var5 = var3.method6696(); + var6 = var3.readInt(); + var76 = (InterfaceParent)interfaceParents.get((long)var6); + if (var76 != null) { + class161.closeInterface(var76, var5 != var76.group); + } + + class106.method2275(var6, var5, var58); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2733 == var1.serverPacket) { + var58 = var3.method6706(); + var18 = var3.readStringCp1252NullTerminated(); + var63 = UrlRequester.getWidget(var58); + if (!var18.equals(var63.text)) { + var63.text = var18; + AttackOption.invalidateWidget(var63); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2732 == var1.serverPacket) { + class118.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2694 == var1.serverPacket) { + Language.field3694 = var3.method6873(); + SecureRandomFuture.field858 = var3.method6873(); + + while (var3.offset < var1.serverPacketLength) { + var58 = var3.readUnsignedByte(); + class227 var61 = GameObject.method4342()[var58]; + Canvas.method114(var61); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2726 == var1.serverPacket) { + Interpreter.method1635(); + var17 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var17 >= 0) { + currentClanSettings[var17] = null; + } else { + class41.guestClanSettings = null; + } + + var1.serverPacket = null; + return true; + } + + if (var17 >= 0) { + currentClanSettings[var17] = new ClanSettings(var3); + } else { + class41.guestClanSettings = new ClanSettings(var3); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2772 == var1.serverPacket) { + var58 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + class127.queueSoundEffect(var58, var5, var6); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2727 == var1.serverPacket) { + for (var58 = 0; var58 < GrandExchangeOfferAgeComparator.VarpDefinition_fileCount; ++var58) { + VarpDefinition var60 = FriendSystem.VarpDefinition_get(var58); + if (var60 != null) { + Varps.Varps_temp[var58] = 0; + Varps.Varps_main[var58] = 0; + } + } + + class107.method2291(); + changedVarpCount += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2743 == var1.serverPacket) { + ParamComposition.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2717 == var1.serverPacket) { + Canvas.friendSystem.method1440(); + field609 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2768 == var1.serverPacket) { + ScriptFrame.field371 = null; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2734 == var1.serverPacket) { + Canvas.method114(class227.field2679); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2693 == var1.serverPacket) { + MusicPatchPcmStream.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2776 == var1.serverPacket) { + var58 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var58 < -70000) { + var5 += 32768; + } + + if (var58 >= 0) { + var63 = UrlRequester.getWidget(var58); + } else { + var63 = null; + } + + for (; var3.offset < var1.serverPacketLength; VarpDefinition.itemContainerSetItem(var5, var7, var25 - 1, var9)) { + var7 = var3.readUShortSmart(); + var25 = var3.readUnsignedShort(); + var9 = 0; + if (var25 != 0) { + var9 = var3.readUnsignedByte(); + if (var9 == 255) { + var9 = var3.readInt(); + } + } + + if (var63 != null && var7 >= 0 && var7 < var63.itemIds.length) { + var63.itemIds[var7] = var25; + var63.itemQuantities[var7] = var9; + } + } + + if (var63 != null) { + AttackOption.invalidateWidget(var63); + } + + class107.method2291(); + changedItemContainers[++field574 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2764 == var1.serverPacket) { + var68 = var3.readUnsignedByte() == 1; + if (var68) { + WorldMapRectangle.field2066 = UrlRequester.method2125() - var3.readLong(); + ModeWhere.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + ModeWhere.grandExchangeEvents = null; + } + + field479 = cycleCntr; + var1.serverPacket = null; + return true; + } + + long var40; + if (ServerPacket.field2784 == var1.serverPacket) { + var48 = var3.readStringCp1252NullTerminated(); + var27 = var3.readLong(); + var29 = (long)var3.readUnsignedShort(); + var40 = (long)var3.readMedium(); + PlayerType var78 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var3.readUnsignedByte()); + var38 = (var29 << 32) + var40; + boolean var73 = false; + + for (var15 = 0; var15 < 100; ++var15) { + if (crossWorldMessageIds[var15] == var38) { + var73 = true; + break; + } + } + + if (var78.isUser && Canvas.friendSystem.isIgnored(new Username(var48, GraphicsObject.loginType))) { + var73 = true; + } + + if (!var73 && field521 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var24 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(var3))); + if (var78.modIcon != -1) { + TaskHandler.addChatMessage(9, HealthBar.method1945(var78.modIcon) + var48, var24, Varcs.base37DecodeLong(var27)); + } else { + TaskHandler.addChatMessage(9, var48, var24, Varcs.base37DecodeLong(var27)); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2758 == var1.serverPacket) { + rebootTimer = var3.method6785() * 30; + field516 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2741 == var1.serverPacket) { + var58 = var3.readUnsignedByte(); + WorldMapRectangle.method3646(var58); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2715 == var1.serverPacket) { + field605 = cycleCntr; + var17 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var17 >= 0) { + currentClanChannels[var17] = null; + } else { + FriendLoginUpdate.guestClanChannel = null; + } + + var1.serverPacket = null; + return true; + } + + if (var17 >= 0) { + currentClanChannels[var17] = new ClanChannel(var3); + } else { + FriendLoginUpdate.guestClanChannel = new ClanChannel(var3); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2711 == var1.serverPacket) { + Canvas.method114(class227.field2683); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2704 == var1.serverPacket) { + var58 = var3.method6696(); + if (var58 == 65535) { + var58 = -1; + } + + var5 = var3.readInt(); + var6 = var3.method6697(); + if (var6 == 65535) { + var6 = -1; + } + + var7 = var3.method6706(); + + for (var25 = var58; var25 <= var6; ++var25) { + var40 = ((long)var7 << 32) + (long)var25; + Node var42 = widgetFlags.get(var40); + if (var42 != null) { + var42.remove(); + } + + widgetFlags.put(new IntegerNode(var5), var40); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2728 == var1.serverPacket) { + Canvas.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + AbstractByteArrayCopier.FriendSystem_invalidateIgnoreds(); + field609 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2692 == var1.serverPacket) { + class144.logOut(); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2738 == var1.serverPacket) { + var58 = var3.method6704(); + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var3.method6704(); + var74 = UrlRequester.getWidget(var6); + ItemComposition var8; + if (!var74.isIf3) { + if (var5 == -1) { + var74.modelType = 0; + var1.serverPacket = null; + return true; + } + + var8 = KeyHandler.ItemDefinition_get(var5); + var74.modelType = 4; + var74.modelId = var5; + var74.modelAngleX = var8.xan2d; + var74.modelAngleY = var8.yan2d; + var74.modelZoom = var8.zoom2d * 100 / var58; + AttackOption.invalidateWidget(var74); + } else { + var74.itemId = var5; + var74.itemQuantity = var58; + var8 = KeyHandler.ItemDefinition_get(var5); + var74.modelAngleX = var8.xan2d; + var74.modelAngleY = var8.yan2d; + var74.modelAngleZ = var8.zan2d; + var74.modelOffsetX = var8.offsetX2d; + var74.modelOffsetY = var8.offsetY2d; + var74.modelZoom = var8.zoom2d; + if (var8.isStackable == 1) { + var74.itemQuantityMode = 1; + } else { + var74.itemQuantityMode = 2; + } + + if (var74.field3012 > 0) { + var74.modelZoom = var74.modelZoom * 32 / var74.field3012; + } else if (var74.rawWidth > 0) { + var74.modelZoom = var74.modelZoom * 32 / var74.rawWidth; + } + + AttackOption.invalidateWidget(var74); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2700 == var1.serverPacket) { + var58 = var3.readShort(); + var5 = var3.method6698(); + var6 = var3.method6704(); + var74 = UrlRequester.getWidget(var6); + if (var5 != var74.rawX || var58 != var74.rawY || var74.xAlignment != 0 || var74.yAlignment != 0) { + var74.rawX = var5; + var74.rawY = var58; + var74.xAlignment = 0; + var74.yAlignment = 0; + AttackOption.invalidateWidget(var74); + this.alignWidget(var74); + if (var74.type == 0) { + AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var6 >> 16], var74, false); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2761 == var1.serverPacket) { + var58 = var3.readUnsignedShort(); + var5 = var3.method6704(); + Varps.Varps_temp[var58] = var5; + if (Varps.Varps_main[var58] != var5) { + Varps.Varps_main[var58] = var5; + } + + ApproximateRouteStrategy.changeGameOptions(var58); + changedVarps[++changedVarpCount - 1 & 31] = var58; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2703 == var1.serverPacket) { + isCameraLocked = true; + class107.field1323 = var3.readUnsignedByte(); + HitSplatDefinition.field1713 = var3.readUnsignedByte(); + class6.field14 = var3.readUnsignedShort(); + UserComparator6.field1265 = var3.readUnsignedByte(); + class216.field2545 = var3.readUnsignedByte(); + if (class216.field2545 >= 100) { + ItemContainer.cameraX = class107.field1323 * 128 + 64; + WorldMapArchiveLoader.cameraZ = HitSplatDefinition.field1713 * 128 + 64; + Bounds.cameraY = class122.getTileHeight(ItemContainer.cameraX, WorldMapArchiveLoader.cameraZ, GrandExchangeEvent.Client_plane) - class6.field14; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2779 == var1.serverPacket) { + Canvas.method114(class227.field2674); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2724 == var1.serverPacket) { + var58 = var3.readInt(); + var5 = var3.readInt(); + var6 = class263.getGcDuration(); + PacketBufferNode var36 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2595, packetWriter.isaacCipher); + var36.packetBuffer.method6685(GameEngine.fps); + var36.packetBuffer.method6776(var6); + var36.packetBuffer.method6703(var58); + var36.packetBuffer.writeIntME(var5); + packetWriter.addNode(var36); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2714 == var1.serverPacket) { + var58 = var3.readUnsignedShort(); + Frames.method4169(var58); + changedItemContainers[++field574 - 1 & 31] = var58 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2710 == var1.serverPacket) { + if (ScriptFrame.field371 == null) { + ScriptFrame.field371 = new class339(GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites); + } + + class392 var47 = GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites.method6074(var3); + ScriptFrame.field371.field3935.vmethod6430(var47.field4240, var47.field4241); + field599[++field600 - 1 & 31] = var47.field4240; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2771 == var1.serverPacket) { + Canvas.method114(class227.field2675); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2698 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + SecureRandomCallable.method1776(var3, var3.offset - 28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2696 == var1.serverPacket) { + MusicPatchPcmStream.loadRegions(true, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2759 == var1.serverPacket) { + var58 = var3.method6706(); + var5 = var3.method6785(); + var63 = UrlRequester.getWidget(var58); + if (var63 != null && var63.type == 0) { + if (var5 > var63.scrollHeight - var63.height) { + var5 = var63.scrollHeight - var63.height; + } + + if (var5 < 0) { + var5 = 0; + } + + if (var5 != var63.scrollY) { + var63.scrollY = var5; + AttackOption.invalidateWidget(var63); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2709 == var1.serverPacket) { + class107.method2291(); + weight = var3.readShort(); + field516 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2769 == var1.serverPacket) { + Canvas.method114(class227.field2681); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2753 == var1.serverPacket) { + var58 = var3.method6785(); + var5 = var3.method6706(); + var63 = UrlRequester.getWidget(var5); + if (var63.modelType != 2 || var58 != var63.modelId) { + var63.modelType = 2; + var63.modelId = var58; + AttackOption.invalidateWidget(var63); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2713 == var1.serverPacket) { + World var46 = new World(); + var46.host = var3.readStringCp1252NullTerminated(); + var46.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var46.properties = var5; + class16.updateGameState(45); + var2.close(); + var2 = null; + ItemComposition.changeWorld(var46); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2774 == var1.serverPacket) { + Canvas.method114(class227.field2682); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2730 == var1.serverPacket) { + var58 = var3.readUnsignedByte(); + class249.forceDisconnect(var58); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2785 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2742 == var1.serverPacket) { + ScriptFrame.field371 = new class339(GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2787 == var1.serverPacket) { + field605 = cycleCntr; + var17 = var3.readByte(); + class120 var59 = new class120(var3); + ClanChannel var19; + if (var17 >= 0) { + var19 = currentClanChannels[var17]; + } else { + var19 = FriendLoginUpdate.guestClanChannel; + } + + var59.method2475(var19); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2722 == var1.serverPacket) { + var17 = var3.readByte(); + var27 = (long)var3.readUnsignedShort(); + var29 = (long)var3.readMedium(); + var40 = var29 + (var27 << 32); + boolean var37 = false; + ClanChannel var43 = var17 >= 0 ? currentClanChannels[var17] : FriendLoginUpdate.guestClanChannel; + if (var43 == null) { + var37 = true; + } else { + for (var13 = 0; var13 < 100; ++var13) { + if (crossWorldMessageIds[var13] == var40) { + var37 = true; + break; + } + } + } + + if (!var37) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var40; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var34 = WorldMapSectionType.method3608(var3); + int var35 = var17 >= 0 ? 43 : 46; + TaskHandler.addChatMessage(var35, "", var34, var43.name); + } + + var1.serverPacket = null; + return true; + } + + BufferedSink.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1005948575 * -820114081 : -1) + "," + (var1.field1213 != null ? var1.field1213.id * 1005948575 * -820114081 : -1) + "," + (var1.field1212 != null ? var1.field1212.id * 1005948575 * -820114081 : -1) + "," + var1.serverPacketLength, (Throwable)null); + class144.logOut(); + } catch (IOException var44) { + WorldMapSection0.method3580(); } catch (Exception var45) { - var26 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -678787115 * -1501005443 : -1) + "," + (var1.field1411 != null ? var1.field1411.id * -678787115 * -1501005443 : -1) + "," + (var1.field1399 != null ? var1.field1399.id * -678787115 * -1501005443 : -1) + "," + var1.serverPacketLength + "," + (class262.localPlayer.pathX[0] + class15.baseX) + "," + (class262.localPlayer.pathY[0] + WorldMapSprite.baseY) + ","; // L: 7015 + var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1005948575 * -820114081 : -1) + "," + (var1.field1213 != null ? var1.field1213.id * 1005948575 * -820114081 : -1) + "," + (var1.field1212 != null ? var1.field1212.id * 1005948575 * -820114081 : -1) + "," + var1.serverPacketLength + "," + (MouseHandler.localPlayer.pathX[0] + GrandExchangeOfferNameComparator.baseX) + "," + (MouseHandler.localPlayer.pathY[0] + NPC.baseY) + ","; - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7016 - var26 = var26 + var3.array[var6] + ","; + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { + var18 = var18 + var3.array[var6] + ","; } - FriendsChat.RunException_sendStackTrace(var26, var45); // L: 7017 - PcmPlayer.logOut(); // L: 7018 + BufferedSink.RunException_sendStackTrace(var18, var45); + class144.logOut(); } - return true; // L: 7020 + return true; } } - @ObfuscatedName("id") + @ObfuscatedName("hb") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2138631971" + descriptor = "(B)V", + garbageValue = "9" ) @Export("menu") final void menu() { - Skeleton.method4034(); // L: 7772 - if (VerticalAlignment.dragInventoryWidget == null) { // L: 7773 - if (clickedWidget == null) { // L: 7774 - int var1 = MouseHandler.MouseHandler_lastButton; // L: 7775 + SceneTilePaint.method4321(); + if (dragInventoryWidget == null) { + if (clickedWidget == null) { int var2; - int var3; int var4; int var5; int var8; - int var10; - int var14; int var18; - if (isMenuOpen) { // L: 7776 - if (var1 != 1 && (UserComparator3.mouseCam || var1 != 4)) { // L: 7777 - var2 = MouseHandler.MouseHandler_x; // L: 7778 - var3 = MouseHandler.MouseHandler_y; // L: 7779 - if (var2 < StructComposition.menuX - 10 || var2 > StructComposition.menuX + UserComparator3.menuWidth + 10 || var3 < class143.menuY - 10 || var3 > class143.menuY + PendingSpawn.menuHeight + 10) { // L: 7780 - isMenuOpen = false; // L: 7781 - AccessFile.method6437(StructComposition.menuX, class143.menuY, UserComparator3.menuWidth, PendingSpawn.menuHeight); // L: 7782 - } - } + label278: { + int var1 = MouseHandler.MouseHandler_lastButton; + int var3; + int var14; + if (isMenuOpen) { + if (var1 != 1 && (class310.mouseCam || var1 != 4)) { + var2 = MouseHandler.MouseHandler_x; + var3 = MouseHandler.MouseHandler_y; + if (var2 < SpotAnimationDefinition.menuX - 10 || var2 > SpotAnimationDefinition.menuX + DevicePcmPlayerProvider.menuWidth + 10 || var3 < DefaultsGroup.menuY - 10 || var3 > GraphicsObject.menuHeight + DefaultsGroup.menuY + 10) { + isMenuOpen = false; + var4 = SpotAnimationDefinition.menuX; + var5 = DefaultsGroup.menuY; + var14 = DevicePcmPlayerProvider.menuWidth; + var18 = GraphicsObject.menuHeight; - if (var1 == 1 || !UserComparator3.mouseCam && var1 == 4) { // L: 7785 - var2 = StructComposition.menuX; // L: 7786 - var3 = class143.menuY; // L: 7787 - var4 = UserComparator3.menuWidth; // L: 7788 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7789 - var14 = MouseHandler.MouseHandler_lastPressedY; // L: 7790 - int var17 = -1; // L: 7791 - - for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7792 - var18 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 7793 - if (var5 > var2 && var5 < var2 + var4 && var14 > var18 - 13 && var14 < var18 + 3) { // L: 7794 - var17 = var8; - } - } - - if (var17 != -1 && var17 >= 0) { // L: 7796 7797 - var8 = menuArguments1[var17]; // L: 7798 - var18 = menuArguments2[var17]; // L: 7799 - var10 = menuOpcodes[var17]; // L: 7800 - int var11 = menuIdentifiers[var17]; // L: 7801 - String var12 = menuActions[var17]; // L: 7802 - String var13 = menuTargets[var17]; // L: 7803 - GameObject.menuAction(var8, var18, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7804 - } - - isMenuOpen = false; // L: 7806 - AccessFile.method6437(StructComposition.menuX, class143.menuY, UserComparator3.menuWidth, PendingSpawn.menuHeight); // L: 7807 - } - } else { - var2 = HealthBarUpdate.method2283(); // L: 7811 - if ((var1 == 1 || !UserComparator3.mouseCam && var1 == 4) && var2 >= 0) { // L: 7812 - var3 = menuOpcodes[var2]; // L: 7813 - 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: 7814 - label246: { - var4 = menuArguments1[var2]; // L: 7815 - var5 = menuArguments2[var2]; // L: 7816 - Widget var6 = WorldMapData_1.getWidget(var5); // L: 7817 - var8 = class22.getWidgetFlags(var6); // L: 7819 - boolean var7 = (var8 >> 28 & 1) != 0; // L: 7821 - if (!var7) { // L: 7824 - var10 = class22.getWidgetFlags(var6); // L: 7826 - boolean var9 = (var10 >> 29 & 1) != 0; // L: 7828 - if (!var9) { // L: 7830 - break label246; + for (var8 = 0; var8 < rootWidgetCount; ++var8) { + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var14 + var4 && rootWidgetYs[var8] + rootWidgetHeights[var8] > var5 && rootWidgetYs[var8] < var18 + var5) { + field616[var8] = true; } } - - if (VerticalAlignment.dragInventoryWidget != null && !field734 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7832 7833 - var18 = draggedWidgetX; // L: 7834 - var10 = draggedWidgetY; // L: 7835 - TaskHandler.method2625(class29.tempMenuAction, var18, var10); // L: 7837 - class29.tempMenuAction = null; // L: 7838 - } - - field734 = false; // L: 7842 - itemDragDuration = 0; // L: 7843 - if (VerticalAlignment.dragInventoryWidget != null) { // L: 7844 - Script.invalidateWidget(VerticalAlignment.dragInventoryWidget); - } - - VerticalAlignment.dragInventoryWidget = WorldMapData_1.getWidget(var5); // L: 7845 - dragItemSlotSource = var4; // L: 7846 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7847 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7848 - if (var2 >= 0) { // L: 7849 - WorldMapIcon_1.method3305(var2); - } - - Script.invalidateWidget(VerticalAlignment.dragInventoryWidget); // L: 7850 - return; // L: 7851 } } + + if (var1 == 1 || !class310.mouseCam && var1 == 4) { + var2 = SpotAnimationDefinition.menuX; + var3 = DefaultsGroup.menuY; + var4 = DevicePcmPlayerProvider.menuWidth; + var5 = MouseHandler.MouseHandler_lastPressedX; + var14 = MouseHandler.MouseHandler_lastPressedY; + var18 = -1; + + int var9; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; + if (var5 > var2 && var5 < var4 + var2 && var14 > var9 - 13 && var14 < var9 + 3) { + var18 = var8; + } + } + + int var10; + int var11; + if (var18 != -1 && var18 >= 0) { + var8 = menuArguments1[var18]; + var9 = menuArguments2[var18]; + var10 = menuOpcodes[var18]; + var11 = menuIdentifiers[var18]; + String var12 = menuActions[var18]; + String var13 = menuTargets[var18]; + class121.menuAction(var8, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + isMenuOpen = false; + var8 = SpotAnimationDefinition.menuX; + var9 = DefaultsGroup.menuY; + var10 = DevicePcmPlayerProvider.menuWidth; + var11 = GraphicsObject.menuHeight; + + for (int var17 = 0; var17 < rootWidgetCount; ++var17) { + if (rootWidgetWidths[var17] + rootWidgetXs[var17] > var8 && rootWidgetXs[var17] < var8 + var10 && rootWidgetHeights[var17] + rootWidgetYs[var17] > var9 && rootWidgetYs[var17] < var9 + var11) { + field616[var17] = true; + } + } + } + } else { + var2 = CollisionMap.method3204(); + if ((var1 == 1 || !class310.mouseCam && var1 == 4) && var2 >= 0) { + var3 = menuOpcodes[var2]; + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { + var4 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + Widget var6 = UrlRequester.getWidget(var5); + if (HorizontalAlignment.method2816(MusicPatchNode.getWidgetFlags(var6))) { + break label278; + } + + var8 = MusicPatchNode.getWidgetFlags(var6); + boolean var7 = (var8 >> 29 & 1) != 0; + if (var7) { + break label278; + } + } + } + + if ((var1 == 1 || !class310.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { + var1 = 2; + } + + if ((var1 == 1 || !class310.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { + var3 = menuArguments1[var2]; + var4 = menuArguments2[var2]; + var5 = menuOpcodes[var2]; + var14 = menuIdentifiers[var2]; + String var15 = menuActions[var2]; + String var16 = menuTargets[var2]; + class121.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + if (var1 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } } - if ((var1 == 1 || !UserComparator3.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7855 7856 - var1 = 2; // L: 7857 - } - - if ((var1 == 1 || !UserComparator3.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 7860 7862 - var3 = menuArguments1[var2]; // L: 7863 - var4 = menuArguments2[var2]; // L: 7864 - var5 = menuOpcodes[var2]; // L: 7865 - var14 = menuIdentifiers[var2]; // L: 7866 - String var15 = menuActions[var2]; // L: 7867 - String var16 = menuTargets[var2]; // L: 7868 - GameObject.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7869 - } - - if (var1 == 2 && menuOptionsCount > 0) { // L: 7872 - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } + return; } + if (dragInventoryWidget != null && !field519 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var18 = draggedWidgetX; + var8 = draggedWidgetY; + SoundCache.method542(ClanChannelMember.tempMenuAction, var18, var8); + ClanChannelMember.tempMenuAction = null; + } + + field519 = false; + itemDragDuration = 0; + if (dragInventoryWidget != null) { + AttackOption.invalidateWidget(dragInventoryWidget); + } + + dragInventoryWidget = UrlRequester.getWidget(var5); + dragItemSlotSource = var4; + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + ClanChannelMember.tempMenuAction = new MenuAction(); + ClanChannelMember.tempMenuAction.param0 = menuArguments1[var2]; + ClanChannelMember.tempMenuAction.param1 = menuArguments2[var2]; + ClanChannelMember.tempMenuAction.opcode = menuOpcodes[var2]; + ClanChannelMember.tempMenuAction.identifier = menuIdentifiers[var2]; + ClanChannelMember.tempMenuAction.action = menuActions[var2]; + } + + AttackOption.invalidateWidget(dragInventoryWidget); } } - } // L: 7874 + } - @ObfuscatedName("it") + @ObfuscatedName("hr") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "87" + descriptor = "(I)Z", + garbageValue = "1660409590" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = HealthBarUpdate.method2283(); // L: 7877 - boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 7878 - if (!var2) { // L: 7879 - boolean var3; - if (var1 < 0) { // L: 7882 - var3 = false; // L: 7883 - } else { - int var4 = menuOpcodes[var1]; // L: 7886 - if (var4 >= 2000) { // L: 7887 - var4 -= 2000; - } - - if (var4 == 1007) { // L: 7888 - var3 = true; // L: 7889 - } else { - var3 = false; // L: 7892 - } - } - - var2 = var3; // L: 7894 - } - - return var2 && !menuShiftClick[var1]; // L: 7896 + int var1 = CollisionMap.method3204(); + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class74.method1931(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("io") + @ObfuscatedName("hq") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1519538256" + garbageValue = "1160972007" ) @Export("openMenu") final void openMenu(int var1, int var2) { - GrandExchangeEvent.method5222(var1, var2); // L: 7900 - DevicePcmPlayerProvider.scene.menuOpen(SoundSystem.Client_plane, var1, var2, false); // L: 7901 - isMenuOpen = true; // L: 7902 - } // L: 7903 + FloorUnderlayDefinition.method2884(var1, var2); + WorldMapIcon_1.scene.menuOpen(GrandExchangeEvent.Client_plane, var1, var2, false); + isMenuOpen = true; + } - @ObfuscatedName("js") + @ObfuscatedName("iz") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "574875607" + garbageValue = "-1213171411" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - JagexCache.method2637(rootInterface, AttackOption.canvasWidth, class0.canvasHeight, var1); // L: 9916 - } // L: 9917 + int var2 = rootInterface; + int var3 = MouseRecorder.canvasWidth; + int var4 = canvasHeight; + if (Huffman.loadInterface(var2)) { + FaceNormal.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); + } - @ObfuscatedName("jl") + } + + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "(Liv;I)V", - garbageValue = "1629073496" + descriptor = "(Lio;I)V", + garbageValue = "-616450131" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : WorldMapData_1.getWidget(var1.parentId); // L: 9920 + Widget var2 = var1.parentId == -1 ? null : UrlRequester.getWidget(var1.parentId); int var3; int var4; - if (var2 == null) { // L: 9923 - var3 = AttackOption.canvasWidth; // L: 9924 - var4 = class0.canvasHeight; // L: 9925 + if (var2 == null) { + var3 = MouseRecorder.canvasWidth; + var4 = canvasHeight; } else { - var3 = var2.width; // L: 9928 - var4 = var2.height; // L: 9929 + var3 = var2.width; + var4 = var2.height; } - FontName.alignWidgetSize(var1, var3, var4, false); // L: 9931 - class43.alignWidgetPosition(var1, var3, var4); // L: 9932 - } // L: 9933 + GrandExchangeOfferUnitPriceComparator.alignWidgetSize(var1, var3, var4, false); + SoundCache.alignWidgetPosition(var1, var3, var4); + } - @ObfuscatedName("ju") + @ObfuscatedName("jf") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1390072147" + descriptor = "(B)V", + garbageValue = "97" ) - final void method1298() { - Script.invalidateWidget(clickedWidget); // L: 10929 - ++UserComparator7.widgetDragDuration; // L: 10930 - if (field731 && field821) { // L: 10931 - int var1 = MouseHandler.MouseHandler_x; // L: 10937 - int var2 = MouseHandler.MouseHandler_y; // L: 10938 - var1 -= widgetClickX; // L: 10939 - var2 -= widgetClickY; // L: 10940 - if (var1 < field801) { // L: 10941 - var1 = field801; + final void method920() { + AttackOption.invalidateWidget(clickedWidget); + ++class106.widgetDragDuration; + if (field588 && field585) { + int var1 = MouseHandler.MouseHandler_x; + int var2 = MouseHandler.MouseHandler_y; + var1 -= widgetClickX; + var2 -= widgetClickY; + if (var1 < field586) { + var1 = field586; } - if (var1 + clickedWidget.width > field801 + clickedWidgetParent.width) { // L: 10942 - var1 = field801 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field586 + clickedWidgetParent.width) { + var1 = field586 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field802) { // L: 10943 - var2 = field802; + if (var2 < field587) { + var2 = field587; } - if (var2 + clickedWidget.height > field802 + clickedWidgetParent.height) { // L: 10944 - var2 = field802 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field587 + clickedWidgetParent.height) { + var2 = field587 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field804; // L: 10945 - int var4 = var2 - field805; // L: 10946 - int var5 = clickedWidget.dragZoneSize; // L: 10947 - if (UserComparator7.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10948 10949 - isDraggingWidget = true; // L: 10950 + int var3 = var1 - field678; + int var4 = var2 - field676; + int var5 = clickedWidget.dragZoneSize; + if (class106.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + isDraggingWidget = true; } - int var6 = var1 - field801 + clickedWidgetParent.scrollX; // L: 10953 - int var7 = var2 - field802 + clickedWidgetParent.scrollY; // L: 10954 + int var6 = var1 - field586 + clickedWidgetParent.scrollX; + int var7 = var2 - field587 + clickedWidgetParent.scrollY; ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10955 - var8 = new ScriptEvent(); // L: 10956 - var8.widget = clickedWidget; // L: 10957 - var8.mouseX = var6; // L: 10958 - var8.mouseY = var7; // L: 10959 - var8.args = clickedWidget.onDrag; // L: 10960 - WorldMapSection1.runScriptEvent(var8); // L: 10961 + if (clickedWidget.onDrag != null && isDraggingWidget) { + var8 = new ScriptEvent(); + var8.widget = clickedWidget; + var8.mouseX = var6; + var8.mouseY = var7; + var8.args = clickedWidget.onDrag; + UserComparator10.runScriptEvent(var8); } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10963 - if (isDraggingWidget) { // L: 10964 - if (clickedWidget.onDragComplete != null) { // L: 10965 - var8 = new ScriptEvent(); // L: 10966 - var8.widget = clickedWidget; // L: 10967 - var8.mouseX = var6; // L: 10968 - var8.mouseY = var7; // L: 10969 - var8.dragTarget = draggedOnWidget; // L: 10970 - var8.args = clickedWidget.onDragComplete; // L: 10971 - WorldMapSection1.runScriptEvent(var8); // L: 10972 + if (MouseHandler.MouseHandler_currentButton == 0) { + if (isDraggingWidget) { + if (clickedWidget.onDragComplete != null) { + var8 = new ScriptEvent(); + var8.widget = clickedWidget; + var8.mouseX = var6; + var8.mouseY = var7; + var8.dragTarget = draggedOnWidget; + var8.args = clickedWidget.onDragComplete; + UserComparator10.runScriptEvent(var8); } - if (draggedOnWidget != null && PlayerComposition.method4851(clickedWidget) != null) { // L: 10974 - PacketBufferNode var11 = InterfaceParent.getPacketBufferNode(ClientPacket.field2621, packetWriter.isaacCipher); // L: 10976 - var11.packetBuffer.method6659(draggedOnWidget.id); // L: 10977 - var11.packetBuffer.method6648(draggedOnWidget.childIndex); // L: 10978 - var11.packetBuffer.method6705(draggedOnWidget.itemId); // L: 10979 - var11.packetBuffer.method6658(clickedWidget.id); // L: 10980 - var11.packetBuffer.method6649(clickedWidget.itemId); // L: 10981 - var11.packetBuffer.method6705(clickedWidget.childIndex); // L: 10982 - packetWriter.addNode(var11); // L: 10983 + if (draggedOnWidget != null && class122.method2505(clickedWidget) != null) { + PacketBufferNode var11 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2661, packetWriter.isaacCipher); + var11.packetBuffer.method6703(clickedWidget.id); + var11.packetBuffer.method6693(draggedOnWidget.childIndex); + var11.packetBuffer.method6786(clickedWidget.itemId); + var11.packetBuffer.method6786(draggedOnWidget.itemId); + var11.packetBuffer.method6693(clickedWidget.childIndex); + var11.packetBuffer.writeInt(draggedOnWidget.id); + packetWriter.addNode(var11); } - } else if (this.shouldLeftClickOpenMenu()) { // L: 10987 - this.openMenu(field804 + widgetClickX, field805 + widgetClickY); // L: 10988 - } else if (menuOptionsCount > 0) { // L: 10990 - int var10 = field804 + widgetClickX; // L: 10991 - int var9 = widgetClickY + field805; // L: 10992 - TaskHandler.method2625(class29.tempMenuAction, var10, var9); // L: 10994 - class29.tempMenuAction = null; // L: 10995 + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(field678 + widgetClickX, widgetClickY + field676); + } else if (menuOptionsCount > 0) { + int var10 = widgetClickX + field678; + int var9 = field676 + widgetClickY; + SoundCache.method542(ClanChannelMember.tempMenuAction, var10, var9); + ClanChannelMember.tempMenuAction = null; } - clickedWidget = null; // L: 10999 + clickedWidget = null; } } else { - if (UserComparator7.widgetDragDuration > 1) { // L: 10932 - clickedWidget = null; // L: 10933 + if (class106.widgetDragDuration > 1) { + clickedWidget = null; } } - } // L: 10935 11001 + } - @ObfuscatedName("ly") + @ObfuscatedName("lb") @ObfuscatedSignature( - descriptor = "(I)Llc;", - garbageValue = "-1312829614" + descriptor = "(B)Loh;", + garbageValue = "-6" ) @Export("username") public Username username() { - return class262.localPlayer != null ? class262.localPlayer.username : null; // L: 11665 + return MouseHandler.localPlayer != null ? MouseHandler.localPlayer.username : null; } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1708314526" + descriptor = "(JLjava/lang/String;B)I", + garbageValue = "8" ) - public static final boolean method1746(char var0) { - if (Character.isISOControl(var0)) { // L: 28 - return false; - } else if (DynamicObject.isAlphaNumeric(var0)) { // L: 29 - return true; - } else { - char[] var1 = class366.field4093; // L: 31 + static final int method1381(long var0, String var2) { + Random var3 = new Random(); + Buffer var4 = new Buffer(128); + Buffer var5 = new Buffer(128); + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; + var4.writeByte(10); + + int var7; + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.writeInt(var6[0]); + var4.writeInt(var6[1]); + var4.writeLong(var0); + var4.writeLong(0L); + + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.encryptRsa(class52.field775, class52.field772); + var5.writeByte(10); + + for (var7 = 0; var7 < 3; ++var7) { + var5.writeInt(var3.nextInt()); + } + + var5.writeLong(var3.nextLong()); + var5.writeLongMedium(var3.nextLong()); + class144.method2803(var5); + var5.writeLong(var3.nextLong()); + var5.encryptRsa(class52.field775, class52.field772); + var7 = GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var2); + if (var7 % 8 != 0) { + var7 += 8 - var7 % 8; + } + + Buffer var8 = new Buffer(var7); + var8.writeStringCp1252NullTerminated(var2); + var8.offset = var7; + var8.xteaEncryptAll(var6); + Buffer var9 = new Buffer(var8.offset + var5.offset + var4.offset + 5); + var9.writeByte(2); + var9.writeByte(var4.offset); + var9.writeBytes(var4.array, 0, var4.offset); + var9.writeByte(var5.offset); + var9.writeBytes(var5.array, 0, var5.offset); + var9.writeShort(var8.offset); + var9.writeBytes(var8.array, 0, var8.offset); + byte[] var11 = var9.array; + int var13 = var11.length; + StringBuilder var14 = new StringBuilder(); + + int var17; + for (int var15 = 0; var15 < var13 + 0; var15 += 3) { + int var16 = var11[var15] & 255; + var14.append(class304.field3755[var16 >>> 2]); + if (var15 < var13 - 1) { + var17 = var11[var15 + 1] & 255; + var14.append(class304.field3755[(var16 & 3) << 4 | var17 >>> 4]); + if (var15 < var13 - 2) { + int var18 = var11[var15 + 2] & 255; + var14.append(class304.field3755[(var17 & 15) << 2 | var18 >>> 6]).append(class304.field3755[var18 & 63]); + } else { + var14.append(class304.field3755[(var17 & 15) << 2]).append("="); + } + } else { + var14.append(class304.field3755[(var16 & 3) << 4]).append("=="); + } + } + + String var12 = var14.toString(); + var12 = var12; + + try { + URL var20 = new URL(UserComparator5.method2167("services", false) + "m=accountappeal/login.ws"); + URLConnection var26 = var20.openConnection(); + var26.setDoInput(true); + var26.setDoOutput(true); + var26.setConnectTimeout(5000); + OutputStreamWriter var21 = new OutputStreamWriter(var26.getOutputStream()); + var21.write("data2=" + Clock.method2680(var12) + "&dest=" + Clock.method2680("passwordchoice.ws")); + var21.flush(); + InputStream var22 = var26.getInputStream(); + var9 = new Buffer(new byte[1000]); + + do { + var17 = var22.read(var9.array, var9.offset, 1000 - var9.offset); + if (var17 == -1) { + var21.close(); + var22.close(); + String var23 = new String(var9.array); + if (var23.startsWith("OFFLINE")) { + return 4; + } else if (var23.startsWith("WRONG")) { + return 7; + } else if (var23.startsWith("RELOAD")) { + return 3; + } else if (var23.startsWith("Not permitted for social network accounts.")) { + return 6; + } else { + var9.xteaDecryptAll(var6); + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { + --var9.offset; + } + + var23 = new String(var9.array, 0, var9.offset); + boolean var27; + if (var23 == null) { + var27 = false; + } else { + label99: { + try { + new URL(var23); + } catch (MalformedURLException var24) { + var27 = false; + break label99; + } + + var27 = true; + } + } + + if (var27) { + InvDefinition.openURL(var23, true, false); + return 2; + } else { + return 5; + } + } + } + + var9.offset += var17; + } while(var9.offset < 1000); + + return 5; + } catch (Throwable var25) { + var25.printStackTrace(); + return 5; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIIIIILgw;Lfy;I)V", + garbageValue = "-394441258" + ) + static final void method1382(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = ClanChannel.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var12][var14] + var15[var11][var14] + var15[var11][var13] + var15[var12][var13] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = class171.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + if (var8.hasSound()) { + WorldMapArea.method3358(var0, var1, var2, var8, var4); + } + + Object var29; + if (var5 == 22) { + if (!isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var28; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.method3984(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = class163.field1914[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field907[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + Huffman.field3113[var0][var1][var2] = 50; + Huffman.field3113[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class163.field1914[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + Huffman.field3113[var0][var1][var2 + 1] = 50; + Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class163.field1914[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + Huffman.field3113[var0][var1 + 1][var2] = 50; + Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class163.field1914[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + Huffman.field3113[var0][var1][var2] = 50; + Huffman.field3113[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = class163.field1914[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3171(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3990(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field908[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Huffman.field3113[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Huffman.field3113[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Huffman.field3113[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3171(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var22; + if (var5 == 2) { + var22 = var4 + 1 & 3; + Object var24; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { + var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var24 = var8.getEntity(2, var22, var15, var17, var16, var18); + } else { + var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field907[var4], Tiles.field907[var22], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = class163.field1914[var0][var1]; + var10000[var2] |= 585; + var10000 = class163.field1914[var0][var1]; + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { + var10000 = class163.field1914[var0][var1]; + var10000[1 + var2] |= 1170; + var10000 = class163.field1914[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = class163.field1914[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = class163.field1914[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = class163.field1914[var0][var1]; + var10000[var2] |= 1170; + var10000 = class163.field1914[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3171(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3990(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field908[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Huffman.field3113[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Huffman.field3113[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Huffman.field3113[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3171(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.method3984(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3990(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field907[var4], 0, 0, 0, var19, var21); + } else { + long var23; + Object var25; + if (var5 == 5) { + var22 = 16; + var23 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var23 != 0L) { + var22 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var23)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field907[var4], 0, var22 * Tiles.field905[var4], var22 * Tiles.field912[var4], var19, var21); + } else if (var5 == 6) { + var22 = 8; + var23 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var23 != 0L) { + var22 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var23)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field903[var4], var22 * Tiles.field914[var4], var19, var21); + } else if (var5 == 7) { + var28 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); + } else if (var5 == 8) { + var22 = 8; + var23 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var23) { + var22 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var23)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field903[var4], var22 * Tiles.field914[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); + } + + if (var29 != null && var6.method3984(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var28 = 15; + if (var29 instanceof Model) { + var28 = ((Model)var29).method4212() / 4; + if (var28 > 30) { + var28 = 30; + } + } + + for (int var31 = 0; var31 <= var9; ++var31) { + for (int var32 = 0; var32 <= var10; ++var32) { + if (var28 > Huffman.field3113[var0][var31 + var1][var32 + var2]) { + Huffman.field3113[var0][var31 + var1][var32 + var2] = (byte)var28; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { // L: 32 - var3 = var1[var2]; // L: 33 - if (var0 == var3) { // L: 34 - return true; } } - - var1 = class366.field4092; // L: 38 - - for (var2 = 0; var2 < var1.length; ++var2) { // L: 39 - var3 = var1[var2]; - if (var0 == var3) { - return true; // L: 41 - } - } - - return false; // L: 44 } } - @ObfuscatedName("v") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(III)Lbl;", - garbageValue = "-1490732059" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1765853576" ) - @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("y") - @ObfuscatedSignature( - descriptor = "(II)Lbl;", - garbageValue = "-1820664660" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "920839392" - ) - static int method1745(int var0, Script var1, boolean var2) { - int var3 = -1; // L: 565 - Widget var4; - if (var0 >= 2000) { // L: 567 - var0 -= 1000; // L: 568 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 569 - var4 = WorldMapData_1.getWidget(var3); // L: 570 - } else { - var4 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 572 - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 573 - ChatChannel.Interpreter_intStackSize -= 4; // L: 574 - var4.rawX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 575 - var4.rawY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 576 - var4.xAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 577 - var4.yAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 578 - Script.invalidateWidget(var4); // L: 579 - class1.client.alignWidget(var4); // L: 580 - if (var3 != -1 && var4.type == 0) { // L: 581 - WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 582 - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 584 - ChatChannel.Interpreter_intStackSize -= 4; // L: 585 - var4.rawWidth = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 586 - var4.rawHeight = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 587 - var4.widthAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 588 - var4.heightAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 589 - Script.invalidateWidget(var4); // L: 590 - class1.client.alignWidget(var4); // L: 591 - if (var3 != -1 && var4.type == 0) { // L: 592 - WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 593 - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 595 - boolean var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 596 - if (var5 != var4.isHidden) { // L: 597 - var4.isHidden = var5; // L: 598 - Script.invalidateWidget(var4); // L: 599 - } - - return 1; // L: 601 - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 603 - var4.noClickThrough = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 604 - return 1; // L: 605 - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 607 - var4.noScrollThrough = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 608 - return 1; // L: 609 - } else { - return 2; // L: 611 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)Lbk;", - garbageValue = "9" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 0b053d8a47..2949ebbf76 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,697 +4,711 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("hx") @Implements("ClientPacket") -public class ClientPacket implements class224 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2647; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2575; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2576; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - static final ClientPacket field2577; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2578; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2588; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2580; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2581; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2582; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2583; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2639; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2585; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2586; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2587; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2643; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2589; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2648; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2625; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2592; +public class ClientPacket implements class225 { @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2593; + public static final ClientPacket field2657; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2563; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2564; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2598; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2566; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + static final ClientPacket field2567; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + static final ClientPacket field2568; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2569; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2641; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2571; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2572; @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" + ) + public static final ClientPacket field2646; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2590; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2575; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2576; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2611; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2604; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lhx;" ) public static final ClientPacket field2579; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2595; - @ObfuscatedName("n") + static final ClientPacket field2580; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2676; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2574; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2598; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - static final ClientPacket field2600; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2678; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2681; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2602; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - static final ClientPacket field2603; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2604; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2601; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2606; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - static final ClientPacket field2607; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2608; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2609; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2614; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2605; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) public static final ClientPacket field2612; - @ObfuscatedName("al") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2613; - @ObfuscatedName("aj") + public static final ClientPacket field2582; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2617; - @ObfuscatedName("ac") + static final ClientPacket field2583; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2615; - @ObfuscatedName("as") + public static final ClientPacket field2573; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2616; - @ObfuscatedName("au") + public static final ClientPacket field2585; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2597; - @ObfuscatedName("ay") + public static final ClientPacket field2586; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2618; + public static final ClientPacket field2587; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2588; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2589; @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2619; + public static final ClientPacket field2615; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2591; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2592; @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2610; - @ObfuscatedName("ai") + public static final ClientPacket field2593; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2621; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2622; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2623; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2673; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2641; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2668; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2627; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2634; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2629; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2590; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2631; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2632; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2633; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2646; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2635; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2636; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2655; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2638; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2611; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2640; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2663; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2642; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2654; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2644; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2645; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2596; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2599; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2667; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) public static final ClientPacket field2594; - @ObfuscatedName("bh") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" + ) + public static final ClientPacket field2574; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2596; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2597; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2638; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2599; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2600; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + static final ClientPacket field2662; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2618; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2603; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lhx;" ) public static final ClientPacket field2650; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2595; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2606; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2607; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2608; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2609; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2610; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2581; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2622; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2613; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2614; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2562; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2616; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2617; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2619; @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" + ) + public static final ClientPacket field2649; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lhx;" ) public static final ClientPacket field2620; - @ObfuscatedName("cm") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2652; - @ObfuscatedName("cx") + public static final ClientPacket field2621; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2653; - @ObfuscatedName("cq") + public static final ClientPacket field2633; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2660; - @ObfuscatedName("cz") + public static final ClientPacket field2623; + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2659; - @ObfuscatedName("cc") + public static final ClientPacket field2624; + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2656; - @ObfuscatedName("cu") + public static final ClientPacket field2625; + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2657; - @ObfuscatedName("cp") + public static final ClientPacket field2626; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2658; - @ObfuscatedName("cv") + public static final ClientPacket field2627; + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" + ) + public static final ClientPacket field2605; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2629; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2663; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2631; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2577; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2666; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2634; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2635; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2636; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2642; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2628; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2639; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2640; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2602; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lhx;" ) public static final ClientPacket field2630; @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2637; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2649; - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2662; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2628; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2664; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2661; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2666; - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2665; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2651; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2669; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2670; - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2671; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - public static final ClientPacket field2672; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - static final ClientPacket field2591; + public static final ClientPacket field2643; @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2674; - @ObfuscatedName("ck") + public static final ClientPacket field2644; + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2675; + public static final ClientPacket field2645; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2656; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2647; @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2584; + public static final ClientPacket field2648; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2578; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2671; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2651; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2652; @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2677; - @ObfuscatedName("du") + public static final ClientPacket field2653; + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2626; - @ObfuscatedName("db") + public static final ClientPacket field2654; + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) - public static final ClientPacket field2679; - @ObfuscatedName("dm") + public static final ClientPacket field2655; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2570; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2632; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2658; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2659; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2660; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2661; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2637; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2664; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2565; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2665; + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2584; + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + public static final ClientPacket field2667; + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "Lmt;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("gp") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = -1324596651 + intValue = 1314033613 ) @Export("id") final int id; - @ObfuscatedName("dh") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = -1674448375 + intValue = -210418627 ) @Export("length") final int length; static { - field2647 = new ClientPacket(0, 0); // L: 5 - field2575 = new ClientPacket(1, 4); // L: 6 - field2576 = new ClientPacket(2, 10); // L: 7 - field2577 = new ClientPacket(3, 7); // L: 8 - field2578 = new ClientPacket(4, 7); // L: 9 - field2588 = new ClientPacket(5, 8); // L: 10 - field2580 = new ClientPacket(6, 8); // L: 11 - field2581 = new ClientPacket(7, 1); // L: 12 - field2582 = new ClientPacket(8, -1); // L: 13 - field2583 = new ClientPacket(9, -1); - field2639 = new ClientPacket(10, 15); - field2585 = new ClientPacket(11, 0); - field2586 = new ClientPacket(12, 6); // L: 17 - field2587 = new ClientPacket(13, -1); - field2643 = new ClientPacket(14, -1); - field2589 = new ClientPacket(15, 7); // L: 20 - field2648 = new ClientPacket(16, 13); // L: 21 - field2625 = new ClientPacket(17, 3); // L: 22 - field2592 = new ClientPacket(18, 8); // L: 23 - field2593 = new ClientPacket(19, 0); // L: 24 - field2579 = new ClientPacket(20, 8); // L: 25 - field2595 = new ClientPacket(21, 3); // L: 26 - field2676 = new ClientPacket(22, 16); // L: 27 - field2574 = new ClientPacket(23, 4); // L: 28 - field2598 = new ClientPacket(24, 8); // L: 29 - field2600 = new ClientPacket(25, -1); // L: 30 - field2678 = new ClientPacket(26, 7); // L: 31 - field2681 = new ClientPacket(27, 3); // L: 32 - field2602 = new ClientPacket(28, 7); // L: 33 - field2603 = new ClientPacket(29, -1); // L: 34 - field2604 = new ClientPacket(30, 7); // L: 35 - field2601 = new ClientPacket(31, -1); // L: 36 - field2606 = new ClientPacket(32, -1); // L: 37 - field2607 = new ClientPacket(33, 2); // L: 38 - field2608 = new ClientPacket(34, 3); // L: 39 - field2609 = new ClientPacket(35, 4); // L: 40 - field2614 = new ClientPacket(36, 7); // L: 41 - field2605 = new ClientPacket(37, 3); // L: 42 - field2612 = new ClientPacket(38, -1); // L: 43 - field2613 = new ClientPacket(39, 7); // L: 44 - field2617 = new ClientPacket(40, 11); // L: 45 - field2615 = new ClientPacket(41, -1); // L: 46 - field2616 = new ClientPacket(42, 7); // L: 47 - field2597 = new ClientPacket(43, 3); // L: 48 - field2618 = new ClientPacket(44, 3); // L: 49 - field2619 = new ClientPacket(45, -1); // L: 50 - field2610 = new ClientPacket(46, -1); // L: 51 - field2621 = new ClientPacket(47, 16); // L: 52 - field2622 = new ClientPacket(48, 2); // L: 53 - field2623 = new ClientPacket(49, 7); // L: 54 - field2673 = new ClientPacket(50, 3); // L: 55 - field2641 = new ClientPacket(51, 8); // L: 56 - field2668 = new ClientPacket(52, -2); // L: 57 - field2627 = new ClientPacket(53, 3); // L: 58 - field2634 = new ClientPacket(54, 2); // L: 59 - field2629 = new ClientPacket(55, 2); // L: 60 - field2590 = new ClientPacket(56, 8); // L: 61 - field2631 = new ClientPacket(57, 8); // L: 62 - field2632 = new ClientPacket(58, 14); // L: 63 - field2633 = new ClientPacket(59, 8); // L: 64 - field2646 = new ClientPacket(60, 15); // L: 65 - field2635 = new ClientPacket(61, 9); // L: 66 - field2636 = new ClientPacket(62, -1); // L: 67 - field2655 = new ClientPacket(63, -1); // L: 68 - field2638 = new ClientPacket(64, 8); // L: 69 - field2611 = new ClientPacket(65, 11); // L: 70 - field2640 = new ClientPacket(66, 8); // L: 71 - field2663 = new ClientPacket(67, 8); // L: 72 - field2642 = new ClientPacket(68, 15); // L: 73 - field2654 = new ClientPacket(69, 15); // L: 74 - field2644 = new ClientPacket(70, 0); // L: 75 - field2645 = new ClientPacket(71, 8); // L: 76 - field2596 = new ClientPacket(72, 9); // L: 77 - field2599 = new ClientPacket(73, 0); // L: 78 - field2667 = new ClientPacket(74, -1); // L: 79 - field2594 = new ClientPacket(75, -2); // L: 80 - field2650 = new ClientPacket(76, 11); // L: 81 - field2620 = new ClientPacket(77, 16); // L: 82 - field2652 = new ClientPacket(78, 3); // L: 83 - field2653 = new ClientPacket(79, -1); // L: 84 - field2660 = new ClientPacket(80, 8); // L: 85 - field2659 = new ClientPacket(81, 8); // L: 86 - field2656 = new ClientPacket(82, 5); // L: 87 - field2657 = new ClientPacket(83, 7); // L: 88 - field2658 = new ClientPacket(84, 8); // L: 89 - field2630 = new ClientPacket(85, 8); // L: 90 - field2637 = new ClientPacket(86, 8); // L: 91 - field2649 = new ClientPacket(87, 3); // L: 92 - field2662 = new ClientPacket(88, 6); // L: 93 - field2628 = new ClientPacket(89, 8); // L: 94 - field2664 = new ClientPacket(90, 4); // L: 95 - field2661 = new ClientPacket(91, -1); // L: 96 - field2666 = new ClientPacket(92, 11); - field2665 = new ClientPacket(93, -1); - field2651 = new ClientPacket(94, -2); - field2669 = new ClientPacket(95, -1); // L: 100 - field2670 = new ClientPacket(96, -1); // L: 101 - field2671 = new ClientPacket(97, 3); - field2672 = new ClientPacket(98, 8); - field2591 = new ClientPacket(99, -1); // L: 104 - field2674 = new ClientPacket(100, 3); - field2675 = new ClientPacket(101, -1); - field2584 = new ClientPacket(102, -1); // L: 107 - field2677 = new ClientPacket(103, 4); // L: 108 - field2626 = new ClientPacket(104, 2); // L: 109 - field2679 = new ClientPacket(105, 3); // L: 110 + field2657 = new ClientPacket(0, 13); + field2563 = new ClientPacket(1, -2); + field2564 = new ClientPacket(2, -1); + field2598 = new ClientPacket(3, 1); + field2566 = new ClientPacket(4, 8); + field2567 = new ClientPacket(5, 7); + field2568 = new ClientPacket(6, -1); + field2569 = new ClientPacket(7, 3); + field2641 = new ClientPacket(8, 4); + field2571 = new ClientPacket(9, 5); + field2572 = new ClientPacket(10, 8); + field2646 = new ClientPacket(11, 2); + field2590 = new ClientPacket(12, -1); + field2575 = new ClientPacket(13, -1); + field2576 = new ClientPacket(14, 0); + field2611 = new ClientPacket(15, 7); + field2604 = new ClientPacket(16, 3); + field2579 = new ClientPacket(17, 6); + field2580 = new ClientPacket(18, -1); + field2612 = new ClientPacket(19, -1); + field2582 = new ClientPacket(20, 8); + field2583 = new ClientPacket(21, -1); + field2573 = new ClientPacket(22, 0); + field2585 = new ClientPacket(23, -1); + field2586 = new ClientPacket(24, 2); + field2587 = new ClientPacket(25, -1); + field2588 = new ClientPacket(26, 3); + field2589 = new ClientPacket(27, 7); + field2615 = new ClientPacket(28, 11); + field2591 = new ClientPacket(29, 7); + field2592 = new ClientPacket(30, 11); + field2593 = new ClientPacket(31, 15); + field2594 = new ClientPacket(32, 7); + field2574 = new ClientPacket(33, 3); + field2596 = new ClientPacket(34, 7); + field2597 = new ClientPacket(35, 15); + field2638 = new ClientPacket(36, 7); + field2599 = new ClientPacket(37, 7); + field2600 = new ClientPacket(38, -1); + field2662 = new ClientPacket(39, 2); + field2618 = new ClientPacket(40, 7); + field2603 = new ClientPacket(41, -1); + field2650 = new ClientPacket(42, 3); + field2595 = new ClientPacket(43, 10); + field2606 = new ClientPacket(44, 3); + field2607 = new ClientPacket(45, 8); + field2608 = new ClientPacket(46, -1); + field2609 = new ClientPacket(47, 3); + field2610 = new ClientPacket(48, 3); + field2581 = new ClientPacket(49, 8); + field2622 = new ClientPacket(50, 7); + field2613 = new ClientPacket(51, 6); + field2614 = new ClientPacket(52, 8); + field2562 = new ClientPacket(53, 8); + field2616 = new ClientPacket(54, 8); + field2617 = new ClientPacket(55, 15); + field2619 = new ClientPacket(56, 8); + field2649 = new ClientPacket(57, 4); + field2620 = new ClientPacket(58, 2); + field2621 = new ClientPacket(59, 4); + field2633 = new ClientPacket(60, 0); + field2623 = new ClientPacket(61, -2); + field2624 = new ClientPacket(62, 3); + field2625 = new ClientPacket(63, -1); + field2626 = new ClientPacket(64, 3); + field2627 = new ClientPacket(65, 3); + field2605 = new ClientPacket(66, 16); + field2629 = new ClientPacket(67, 8); + field2663 = new ClientPacket(68, 0); + field2631 = new ClientPacket(69, 3); + field2577 = new ClientPacket(70, 9); + field2666 = new ClientPacket(71, 4); + field2634 = new ClientPacket(72, 9); + field2635 = new ClientPacket(73, 8); + field2636 = new ClientPacket(74, -1); + field2642 = new ClientPacket(75, 8); + field2628 = new ClientPacket(76, 16); + field2639 = new ClientPacket(77, 8); + field2640 = new ClientPacket(78, -2); + field2602 = new ClientPacket(79, 11); + field2630 = new ClientPacket(80, 14); + field2643 = new ClientPacket(81, -1); + field2644 = new ClientPacket(82, 8); + field2645 = new ClientPacket(83, -1); + field2656 = new ClientPacket(84, 0); + field2647 = new ClientPacket(85, 2); + field2648 = new ClientPacket(86, 8); + field2578 = new ClientPacket(87, -1); + field2671 = new ClientPacket(88, -1); + field2651 = new ClientPacket(89, 4); + field2652 = new ClientPacket(90, 3); + field2653 = new ClientPacket(91, 8); + field2654 = new ClientPacket(92, -1); + field2655 = new ClientPacket(93, 11); + field2570 = new ClientPacket(94, 8); + field2632 = new ClientPacket(95, -1); + field2658 = new ClientPacket(96, 8); + field2659 = new ClientPacket(97, 8); + field2660 = new ClientPacket(98, 3); + field2661 = new ClientPacket(99, 16); + field2637 = new ClientPacket(100, -1); + field2664 = new ClientPacket(101, -1); + field2565 = new ClientPacket(102, 15); + field2665 = new ClientPacket(103, -1); + field2584 = new ClientPacket(104, 7); + field2667 = new ClientPacket(105, 8); } ClientPacket(int var1, int var2) { - this.id = var1; // L: 115 - this.length = var2; // L: 116 - } // L: 117 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-87" - ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class380.field4151) { // L: 15 - class182.field2113 += class380.field4151 - var0; // L: 16 - } - - class380.field4151 = var0; // L: 18 - return class182.field2113 + var0; // L: 19 + this.id = var1; + this.length = var2; } - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lof;", - garbageValue = "873034758" + descriptor = "(I)V", + garbageValue = "1123180702" ) - public static IndexedSprite method4492(AbstractArchive var0, int var1) { - byte[] var3 = var0.takeFileFlat(var1); // L: 97 - boolean var2; - if (var3 == null) { // L: 98 - var2 = false; // L: 99 - } else { - class29.SpriteBuffer_decode(var3); // L: 102 - var2 = true; // L: 103 + public static void method4407() { + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; + } } - return !var2 ? null : class302.method5571(); // L: 105 106 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "-9734" + ) + public static boolean method4406(int var0) { + return (var0 >> 30 & 1) != 0; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "([BIIB)I", + garbageValue = "-72" + ) + static int method4408(byte[] var0, int var1, int var2) { + int var3 = -1; + + for (int var4 = var1; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; + } + + var3 = ~var3; + return var3; } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 4186636b63..d8efab8359 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,200 +1,227 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("bp") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -454250637 + intValue = 1092227393 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("KitDefinition_modelsArchive") + public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("b") + @Export("operatingSystemName") + static String operatingSystemName; @ObfuscatedName("v") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1571023127 + intValue = 1426015777 ) @Export("windowMode") int windowMode; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("r") - double field1312; - @ObfuscatedName("h") + @ObfuscatedName("f") + double field1117; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1112571497 + intValue = 1197443065 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1870852049 + intValue = -1564342051 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 348107745 + intValue = -1303154967 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("parameters") LinkedHashMap parameters; static { - ClientPreferences_optionCount = 7; // L: 11 + ClientPreferences_optionCount = 7; } ClientPreferences() { this.windowMode = 1; this.rememberedUsername = null; this.hideUsername = false; - this.field1312 = 0.8D; + this.field1117 = 0.8D; this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; this.parameters = new LinkedHashMap(); - this.method2315(true); // L: 25 - } // L: 26 + this.method1937(true); + } @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) ClientPreferences(Buffer var1) { - this.windowMode = 1; // L: 15 - this.rememberedUsername = null; // L: 16 - this.hideUsername = false; // L: 17 - this.field1312 = 0.8D; // L: 18 - this.musicVolume = 127; // L: 19 - this.soundEffectsVolume = 127; // L: 20 - this.areaSoundEffectsVolume = 127; // L: 21 - this.parameters = new LinkedHashMap(); // L: 22 - if (var1 != null && var1.array != null) { // L: 29 + this.windowMode = 1; + this.rememberedUsername = null; + this.hideUsername = false; + this.field1117 = 0.8D; + this.musicVolume = 127; + this.soundEffectsVolume = 127; + this.areaSoundEffectsVolume = 127; + this.parameters = new LinkedHashMap(); + if (var1 != null && var1.array != null) { int var2 = var1.readUnsignedByte(); if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { if (var1.readUnsignedByte() == 1) { this.roofsHidden = true; } - if (var2 > 1) { // L: 39 - this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 40 + if (var2 > 1) { + this.titleMusicDisabled = var1.readUnsignedByte() == 1; } - if (var2 > 3) { // L: 42 - this.windowMode = var1.readUnsignedByte(); // L: 43 + if (var2 > 3) { + this.windowMode = var1.readUnsignedByte(); } - if (var2 > 2) { // L: 45 - int var3 = var1.readUnsignedByte(); // L: 46 + if (var2 > 2) { + int var3 = var1.readUnsignedByte(); - for (int var4 = 0; var4 < var3; ++var4) { // L: 47 - int var5 = var1.readInt(); // L: 48 - int var6 = var1.readInt(); // L: 49 - this.parameters.put(var5, var6); // L: 50 + for (int var4 = 0; var4 < var3; ++var4) { + int var5 = var1.readInt(); + int var6 = var1.readInt(); + this.parameters.put(var5, var6); } } - if (var2 > 4) { // L: 53 - this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 54 + if (var2 > 4) { + this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); } - if (var2 > 5) { // L: 56 - this.hideUsername = var1.readBoolean(); // L: 57 + if (var2 > 5) { + this.hideUsername = var1.readBoolean(); } - if (var2 > 6) { // L: 59 - this.field1312 = (double)var1.readUnsignedByte() / 100.0D; // L: 60 - this.musicVolume = var1.readUnsignedByte(); // L: 61 - this.soundEffectsVolume = var1.readUnsignedByte(); // L: 62 - this.areaSoundEffectsVolume = var1.readUnsignedByte(); // L: 63 + if (var2 > 6) { + this.field1117 = (double)var1.readUnsignedByte() / 100.0D; + this.musicVolume = var1.readUnsignedByte(); + this.soundEffectsVolume = var1.readUnsignedByte(); + this.areaSoundEffectsVolume = var1.readUnsignedByte(); } } else { - this.method2315(true); + this.method1937(true); } } else { - this.method2315(true); // L: 30 + this.method1937(true); } - } // L: 67 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-49" + descriptor = "(ZI)V", + garbageValue = "909536447" ) - void method2315(boolean var1) { - } // L: 69 + void method1937(boolean var1) { + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lnt;", - garbageValue = "1929327586" + descriptor = "(I)Lnv;", + garbageValue = "2036795437" ) @Export("toBuffer") Buffer toBuffer() { - Buffer var1 = new Buffer(100); // L: 72 - var1.writeByte(ClientPreferences_optionCount); // L: 73 - var1.writeByte(this.roofsHidden ? 1 : 0); // L: 74 - var1.writeByte(this.titleMusicDisabled ? 1 : 0); // L: 75 - var1.writeByte(this.windowMode); // L: 76 - var1.writeByte(this.parameters.size()); // L: 77 - Iterator var2 = this.parameters.entrySet().iterator(); // L: 78 + Buffer var1 = new Buffer(100); + var1.writeByte(ClientPreferences_optionCount); + var1.writeByte(this.roofsHidden ? 1 : 0); + var1.writeByte(this.titleMusicDisabled ? 1 : 0); + var1.writeByte(this.windowMode); + var1.writeByte(this.parameters.size()); + Iterator var2 = this.parameters.entrySet().iterator(); while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); // L: 79 - var1.writeInt((Integer)var3.getKey()); // L: 81 - var1.writeInt((Integer)var3.getValue()); // L: 82 + Entry var3 = (Entry)var2.next(); + var1.writeInt((Integer)var3.getKey()); + var1.writeInt((Integer)var3.getValue()); } - var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 85 - var1.writeBoolean(this.hideUsername); // L: 86 - var1.writeByte((int)(100.0D * this.field1312)); // L: 87 - var1.writeByte(this.musicVolume); // L: 88 - var1.writeByte(this.soundEffectsVolume); // L: 89 - var1.writeByte(this.areaSoundEffectsVolume); // L: 90 - return var1; // L: 91 + var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); + var1.writeBoolean(this.hideUsername); + var1.writeByte((int)(this.field1117 * 100.0D)); + var1.writeByte(this.musicVolume); + var1.writeByte(this.soundEffectsVolume); + var1.writeByte(this.areaSoundEffectsVolume); + return var1; } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-648393673" + descriptor = "([BB)Lom;", + garbageValue = "12" ) - static int method2330(int var0, int var1, int var2) { - if (var2 > 179) { // L: 33 - var1 /= 2; + @Export("convertJpgToSprite") + public static final SpritePixels convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; + + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + int var2 = var1.getWidth(); + int var3 = var1.getHeight(); + int[] var4 = new int[var2 * var3]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); + var5.grabPixels(); + return new SpritePixels(var4, var2, var3); + } catch (IOException var7) { + } catch (InterruptedException var8) { } - if (var2 > 192) { // L: 34 - var1 /= 2; + return new SpritePixels(0, 0); + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "578056164" + ) + public static int[] method1942() { + int[] var0 = new int[KeyHandler.field64]; + + for (int var1 = 0; var1 < KeyHandler.field64; ++var1) { + var0[var1] = KeyHandler.field55[var1]; } - if (var2 > 217) { // L: 35 - var1 /= 2; - } - - if (var2 > 243) { // L: 36 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 37 - return var3; // L: 38 + return var0; } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index f9b09cdfca..7d6ea9d835 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,56 +1,103 @@ 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("en") +@ObfuscatedName("ee") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("m") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("nx") - @ObfuscatedGetter( - intValue = 629539371 - ) - static int field1538; - Clock() { - } // L: 4 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-111" + descriptor = "(I)V", + garbageValue = "-296506208" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-104" + descriptor = "(III)I", + garbageValue = "2079435375" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Lkm;IB)Lkm;", - garbageValue = "0" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "2118281841" ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; // L: 17 + public static String method2680(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - Enumerated var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { + var2.append('+'); + } else { + byte var5 = ArchiveDiskActionHandler.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } + } else { + var2.append(var4); } } - return null; // L: 25 + return var2.toString(); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "96" + ) + static void method2673(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); + if (var4 != null) { + NetCache.NetCache_pendingWritesQueue.addLast(var4); + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(CB)C", + garbageValue = "45" + ) + static char method2679(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "1562582699" + ) + public static int[] method2682() { + int[] var0 = new int[KeyHandler.field35]; + + for (int var1 = 0; var1 < KeyHandler.field35; ++var1) { + var0[var1] = KeyHandler.field53[var1]; + } + + return var0; } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 1a6bbc7ab2..46c44b6dd0 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("fy") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("u") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1967137555 - ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 1252151781 + intValue = -97625897 ) @Export("xInset") - public int xInset; - @ObfuscatedName("ab") + int xInset; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 193981903 + intValue = 1592986103 ) @Export("yInset") - public int yInset; - @ObfuscatedName("aq") + int yInset; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -2099973471 + intValue = 1072743371 ) @Export("xSize") int xSize; - @ObfuscatedName("ae") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 3583519 + intValue = -1185927055 ) @Export("ySize") int ySize; @@ -42,496 +36,472 @@ public class CollisionMap { public int[][] flags; public CollisionMap(int var1, int var2) { - this.xInset = 0; // L: 44 - this.yInset = 0; // L: 45 - this.xSize = var1; // L: 46 - this.ySize = var2; // L: 47 - this.flags = new int[this.xSize][this.ySize]; // L: 48 - this.clear(); // L: 49 - } // L: 50 + this.xInset = 0; + this.yInset = 0; + this.xSize = var1; + this.ySize = var2; + this.flags = new int[this.xSize][this.ySize]; + this.clear(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-950310873" + garbageValue = "269494942" ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.xSize; ++var1) { // L: 53 - for (int var2 = 0; var2 < this.ySize; ++var2) { // L: 54 - if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { // L: 55 - this.flags[var1][var2] = 16777216; // L: 56 + for (int var1 = 0; var1 < this.xSize; ++var1) { + for (int var2 = 0; var2 < this.ySize; ++var2) { + if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { + this.flags[var1][var2] = 16777216; } else { this.flags[var1][var2] = 16777215; } } } - } // L: 59 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "87" + descriptor = "(IIIIZI)V", + garbageValue = "-1299948758" ) - public void method3216(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; // L: 62 - var2 -= this.yInset; // L: 63 - if (var3 == 0) { // L: 64 - if (var4 == 0) { // L: 65 - this.setFlag(var1, var2, 128); // L: 66 - this.setFlag(var1 - 1, var2, 8); // L: 67 + public void method3171(int var1, int var2, int var3, int var4, boolean var5) { + var1 -= this.xInset; + var2 -= this.yInset; + if (var3 == 0) { + if (var4 == 0) { + this.setFlag(var1, var2, 128); + this.setFlag(var1 - 1, var2, 8); } - if (var4 == 1) { // L: 69 - this.setFlag(var1, var2, 2); // L: 70 - this.setFlag(var1, var2 + 1, 32); // L: 71 + if (var4 == 1) { + this.setFlag(var1, var2, 2); + this.setFlag(var1, var2 + 1, 32); } - if (var4 == 2) { // L: 73 - this.setFlag(var1, var2, 8); // L: 74 - this.setFlag(var1 + 1, var2, 128); // L: 75 + if (var4 == 2) { + this.setFlag(var1, var2, 8); + this.setFlag(var1 + 1, var2, 128); } - if (var4 == 3) { // L: 77 - this.setFlag(var1, var2, 32); // L: 78 - this.setFlag(var1, var2 - 1, 2); // L: 79 + if (var4 == 3) { + this.setFlag(var1, var2, 32); + this.setFlag(var1, var2 - 1, 2); } } - if (var3 == 1 || var3 == 3) { // L: 82 - if (var4 == 0) { // L: 83 - this.setFlag(var1, var2, 1); // L: 84 - this.setFlag(var1 - 1, var2 + 1, 16); // L: 85 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlag(var1, var2, 1); + this.setFlag(var1 - 1, var2 + 1, 16); } - if (var4 == 1) { // L: 87 - this.setFlag(var1, var2, 4); // L: 88 - this.setFlag(var1 + 1, var2 + 1, 64); // L: 89 + if (var4 == 1) { + this.setFlag(var1, var2, 4); + this.setFlag(var1 + 1, var2 + 1, 64); } - if (var4 == 2) { // L: 91 - this.setFlag(var1, var2, 16); // L: 92 - this.setFlag(var1 + 1, var2 - 1, 1); // L: 93 + if (var4 == 2) { + this.setFlag(var1, var2, 16); + this.setFlag(var1 + 1, var2 - 1, 1); } - if (var4 == 3) { // L: 95 - this.setFlag(var1, var2, 64); // L: 96 - this.setFlag(var1 - 1, var2 - 1, 4); // L: 97 + if (var4 == 3) { + this.setFlag(var1, var2, 64); + this.setFlag(var1 - 1, var2 - 1, 4); } } - if (var3 == 2) { // L: 100 - if (var4 == 0) { // L: 101 - this.setFlag(var1, var2, 130); // L: 102 - this.setFlag(var1 - 1, var2, 8); // L: 103 - this.setFlag(var1, var2 + 1, 32); // L: 104 + if (var3 == 2) { + if (var4 == 0) { + this.setFlag(var1, var2, 130); + this.setFlag(var1 - 1, var2, 8); + this.setFlag(var1, var2 + 1, 32); } - if (var4 == 1) { // L: 106 - this.setFlag(var1, var2, 10); // L: 107 - this.setFlag(var1, var2 + 1, 32); // L: 108 - this.setFlag(var1 + 1, var2, 128); // L: 109 + if (var4 == 1) { + this.setFlag(var1, var2, 10); + this.setFlag(var1, var2 + 1, 32); + this.setFlag(var1 + 1, var2, 128); } - if (var4 == 2) { // L: 111 - this.setFlag(var1, var2, 40); // L: 112 - this.setFlag(var1 + 1, var2, 128); // L: 113 - this.setFlag(var1, var2 - 1, 2); // L: 114 + if (var4 == 2) { + this.setFlag(var1, var2, 40); + this.setFlag(var1 + 1, var2, 128); + this.setFlag(var1, var2 - 1, 2); } - if (var4 == 3) { // L: 116 - this.setFlag(var1, var2, 160); // L: 117 - this.setFlag(var1, var2 - 1, 2); // L: 118 - this.setFlag(var1 - 1, var2, 8); // L: 119 + if (var4 == 3) { + this.setFlag(var1, var2, 160); + this.setFlag(var1, var2 - 1, 2); + this.setFlag(var1 - 1, var2, 8); } } - 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 (var5) { + if (var3 == 0) { + if (var4 == 0) { + this.setFlag(var1, var2, 65536); + this.setFlag(var1 - 1, var2, 4096); } - if (var4 == 1) { // L: 128 - this.setFlag(var1, var2, 1024); // L: 129 - this.setFlag(var1, var2 + 1, 16384); // L: 130 + if (var4 == 1) { + this.setFlag(var1, var2, 1024); + this.setFlag(var1, var2 + 1, 16384); } - if (var4 == 2) { // L: 132 - this.setFlag(var1, var2, 4096); // L: 133 - this.setFlag(var1 + 1, var2, 65536); // L: 134 + if (var4 == 2) { + this.setFlag(var1, var2, 4096); + this.setFlag(var1 + 1, var2, 65536); } - if (var4 == 3) { // L: 136 - this.setFlag(var1, var2, 16384); // L: 137 - this.setFlag(var1, var2 - 1, 1024); // L: 138 + if (var4 == 3) { + this.setFlag(var1, var2, 16384); + this.setFlag(var1, var2 - 1, 1024); } } - if (var3 == 1 || var3 == 3) { // L: 141 - if (var4 == 0) { // L: 142 - this.setFlag(var1, var2, 512); // L: 143 - this.setFlag(var1 - 1, var2 + 1, 8192); // L: 144 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlag(var1, var2, 512); + this.setFlag(var1 - 1, var2 + 1, 8192); } - if (var4 == 1) { // L: 146 - this.setFlag(var1, var2, 2048); // L: 147 - this.setFlag(var1 + 1, var2 + 1, 32768); // L: 148 + if (var4 == 1) { + this.setFlag(var1, var2, 2048); + this.setFlag(var1 + 1, var2 + 1, 32768); } - if (var4 == 2) { // L: 150 - this.setFlag(var1, var2, 8192); // L: 151 - this.setFlag(var1 + 1, var2 - 1, 512); // L: 152 + if (var4 == 2) { + this.setFlag(var1, var2, 8192); + this.setFlag(var1 + 1, var2 - 1, 512); } - if (var4 == 3) { // L: 154 - this.setFlag(var1, var2, 32768); // L: 155 - this.setFlag(var1 - 1, var2 - 1, 2048); // L: 156 + if (var4 == 3) { + this.setFlag(var1, var2, 32768); + this.setFlag(var1 - 1, var2 - 1, 2048); } } - if (var3 == 2) { // L: 159 - if (var4 == 0) { // L: 160 - this.setFlag(var1, var2, 66560); // L: 161 - this.setFlag(var1 - 1, var2, 4096); // L: 162 - this.setFlag(var1, var2 + 1, 16384); // L: 163 + if (var3 == 2) { + if (var4 == 0) { + this.setFlag(var1, var2, 66560); + this.setFlag(var1 - 1, var2, 4096); + this.setFlag(var1, var2 + 1, 16384); } - if (var4 == 1) { // L: 165 - this.setFlag(var1, var2, 5120); // L: 166 - this.setFlag(var1, var2 + 1, 16384); // L: 167 - this.setFlag(var1 + 1, var2, 65536); // L: 168 + if (var4 == 1) { + this.setFlag(var1, var2, 5120); + this.setFlag(var1, var2 + 1, 16384); + this.setFlag(var1 + 1, var2, 65536); } - if (var4 == 2) { // L: 170 - this.setFlag(var1, var2, 20480); // L: 171 - this.setFlag(var1 + 1, var2, 65536); // L: 172 - this.setFlag(var1, var2 - 1, 1024); // L: 173 + if (var4 == 2) { + this.setFlag(var1, var2, 20480); + this.setFlag(var1 + 1, var2, 65536); + this.setFlag(var1, var2 - 1, 1024); } - if (var4 == 3) { // L: 175 - this.setFlag(var1, var2, 81920); // L: 176 - this.setFlag(var1, var2 - 1, 1024); // L: 177 - this.setFlag(var1 - 1, var2, 4096); // L: 178 + if (var4 == 3) { + this.setFlag(var1, var2, 81920); + this.setFlag(var1, var2 - 1, 1024); + this.setFlag(var1 - 1, var2, 4096); } } } - } // L: 182 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "-42" + descriptor = "(IIIIZI)V", + garbageValue = "-1986797422" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { - int var6 = 256; // L: 185 - if (var5) { // L: 186 + int var6 = 256; + if (var5) { var6 += 131072; } - var1 -= this.xInset; // L: 187 - var2 -= this.yInset; // L: 188 + var1 -= this.xInset; + var2 -= this.yInset; - for (int var7 = var1; var7 < var3 + var1; ++var7) { // L: 189 - if (var7 >= 0 && var7 < this.xSize) { // L: 190 - for (int var8 = var2; var8 < var2 + var4; ++var8) { // L: 191 - if (var8 >= 0 && var8 < this.ySize) { // L: 192 + for (int var7 = var1; var7 < var3 + var1; ++var7) { + if (var7 >= 0 && var7 < this.xSize) { + for (int var8 = var2; var8 < var2 + var4; ++var8) { + if (var8 >= 0 && var8 < this.ySize) { this.setFlag(var7, var8, var6); } } } } - } // L: 196 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1224404826" - ) - @Export("setBlockedByFloor") - public void setBlockedByFloor(int var1, int var2) { - var1 -= this.xInset; // L: 199 - var2 -= this.yInset; // L: 200 - int[] var10000 = this.flags[var1]; // L: 201 - var10000[var2] |= 2097152; - } // L: 202 + } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-67" + ) + @Export("setBlockedByFloor") + public void setBlockedByFloor(int var1, int var2) { + var1 -= this.xInset; + var2 -= this.yInset; + int[] var10000 = this.flags[var1]; + var10000[var2] |= 2097152; + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1296944605" + garbageValue = "-694805867" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { - var1 -= this.xInset; // L: 205 - var2 -= this.yInset; // L: 206 - int[] var10000 = this.flags[var1]; // L: 207 + var1 -= this.xInset; + var2 -= this.yInset; + int[] var10000 = this.flags[var1]; var10000[var2] |= 262144; - } // L: 208 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIIB)V", - garbageValue = "34" + garbageValue = "0" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; // L: 211 + int[] var10000 = this.flags[var1]; var10000[var2] |= var3; - } // L: 212 + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "175119648" + garbageValue = "74052797" ) - public void method3217(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; // L: 215 - var2 -= this.yInset; // L: 216 - if (var3 == 0) { // L: 217 - if (var4 == 0) { // L: 218 - this.setFlagOff(var1, var2, 128); // L: 219 - this.setFlagOff(var1 - 1, var2, 8); // L: 220 + public void method3176(int var1, int var2, int var3, int var4, boolean var5) { + var1 -= this.xInset; + var2 -= this.yInset; + if (var3 == 0) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 128); + this.setFlagOff(var1 - 1, var2, 8); } - if (var4 == 1) { // L: 222 - this.setFlagOff(var1, var2, 2); // L: 223 - this.setFlagOff(var1, var2 + 1, 32); // L: 224 + if (var4 == 1) { + this.setFlagOff(var1, var2, 2); + this.setFlagOff(var1, var2 + 1, 32); } - if (var4 == 2) { // L: 226 - this.setFlagOff(var1, var2, 8); // L: 227 - this.setFlagOff(var1 + 1, var2, 128); // L: 228 + if (var4 == 2) { + this.setFlagOff(var1, var2, 8); + this.setFlagOff(var1 + 1, var2, 128); } - if (var4 == 3) { // L: 230 - this.setFlagOff(var1, var2, 32); // L: 231 - this.setFlagOff(var1, var2 - 1, 2); // L: 232 + if (var4 == 3) { + this.setFlagOff(var1, var2, 32); + this.setFlagOff(var1, var2 - 1, 2); } } - if (var3 == 1 || var3 == 3) { // L: 235 - if (var4 == 0) { // L: 236 - this.setFlagOff(var1, var2, 1); // L: 237 - this.setFlagOff(var1 - 1, var2 + 1, 16); // L: 238 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 1); + this.setFlagOff(var1 - 1, var2 + 1, 16); } - if (var4 == 1) { // L: 240 - this.setFlagOff(var1, var2, 4); // L: 241 - this.setFlagOff(var1 + 1, var2 + 1, 64); // L: 242 + if (var4 == 1) { + this.setFlagOff(var1, var2, 4); + this.setFlagOff(var1 + 1, var2 + 1, 64); } - if (var4 == 2) { // L: 244 - this.setFlagOff(var1, var2, 16); // L: 245 - this.setFlagOff(var1 + 1, var2 - 1, 1); // L: 246 + if (var4 == 2) { + this.setFlagOff(var1, var2, 16); + this.setFlagOff(var1 + 1, var2 - 1, 1); } - if (var4 == 3) { // L: 248 - this.setFlagOff(var1, var2, 64); // L: 249 - this.setFlagOff(var1 - 1, var2 - 1, 4); // L: 250 + if (var4 == 3) { + this.setFlagOff(var1, var2, 64); + this.setFlagOff(var1 - 1, var2 - 1, 4); } } - if (var3 == 2) { // L: 253 - if (var4 == 0) { // L: 254 - this.setFlagOff(var1, var2, 130); // L: 255 - this.setFlagOff(var1 - 1, var2, 8); // L: 256 - this.setFlagOff(var1, var2 + 1, 32); // L: 257 + if (var3 == 2) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 130); + this.setFlagOff(var1 - 1, var2, 8); + this.setFlagOff(var1, var2 + 1, 32); } - if (var4 == 1) { // L: 259 - this.setFlagOff(var1, var2, 10); // L: 260 - this.setFlagOff(var1, var2 + 1, 32); // L: 261 - this.setFlagOff(var1 + 1, var2, 128); // L: 262 + if (var4 == 1) { + this.setFlagOff(var1, var2, 10); + this.setFlagOff(var1, var2 + 1, 32); + this.setFlagOff(var1 + 1, var2, 128); } - if (var4 == 2) { // L: 264 - this.setFlagOff(var1, var2, 40); // L: 265 - this.setFlagOff(var1 + 1, var2, 128); // L: 266 - this.setFlagOff(var1, var2 - 1, 2); // L: 267 + if (var4 == 2) { + this.setFlagOff(var1, var2, 40); + this.setFlagOff(var1 + 1, var2, 128); + this.setFlagOff(var1, var2 - 1, 2); } - if (var4 == 3) { // L: 269 - this.setFlagOff(var1, var2, 160); // L: 270 - this.setFlagOff(var1, var2 - 1, 2); // L: 271 - this.setFlagOff(var1 - 1, var2, 8); // L: 272 + if (var4 == 3) { + this.setFlagOff(var1, var2, 160); + this.setFlagOff(var1, var2 - 1, 2); + this.setFlagOff(var1 - 1, var2, 8); } } - if (var5) { // L: 275 - if (var3 == 0) { // L: 276 - if (var4 == 0) { // L: 277 - this.setFlagOff(var1, var2, 65536); // L: 278 - this.setFlagOff(var1 - 1, var2, 4096); // L: 279 + if (var5) { + if (var3 == 0) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 65536); + this.setFlagOff(var1 - 1, var2, 4096); } - if (var4 == 1) { // L: 281 - this.setFlagOff(var1, var2, 1024); // L: 282 - this.setFlagOff(var1, var2 + 1, 16384); // L: 283 + if (var4 == 1) { + this.setFlagOff(var1, var2, 1024); + this.setFlagOff(var1, var2 + 1, 16384); } - if (var4 == 2) { // L: 285 - this.setFlagOff(var1, var2, 4096); // L: 286 - this.setFlagOff(var1 + 1, var2, 65536); // L: 287 + if (var4 == 2) { + this.setFlagOff(var1, var2, 4096); + this.setFlagOff(var1 + 1, var2, 65536); } - if (var4 == 3) { // L: 289 - this.setFlagOff(var1, var2, 16384); // L: 290 - this.setFlagOff(var1, var2 - 1, 1024); // L: 291 + if (var4 == 3) { + this.setFlagOff(var1, var2, 16384); + this.setFlagOff(var1, var2 - 1, 1024); } } - if (var3 == 1 || var3 == 3) { // L: 294 - if (var4 == 0) { // L: 295 - this.setFlagOff(var1, var2, 512); // L: 296 - this.setFlagOff(var1 - 1, var2 + 1, 8192); // L: 297 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 512); + this.setFlagOff(var1 - 1, var2 + 1, 8192); } - if (var4 == 1) { // L: 299 - this.setFlagOff(var1, var2, 2048); // L: 300 - this.setFlagOff(var1 + 1, var2 + 1, 32768); // L: 301 + if (var4 == 1) { + this.setFlagOff(var1, var2, 2048); + this.setFlagOff(var1 + 1, var2 + 1, 32768); } - if (var4 == 2) { // L: 303 - this.setFlagOff(var1, var2, 8192); // L: 304 - this.setFlagOff(var1 + 1, var2 - 1, 512); // L: 305 + if (var4 == 2) { + this.setFlagOff(var1, var2, 8192); + this.setFlagOff(var1 + 1, var2 - 1, 512); } - if (var4 == 3) { // L: 307 - this.setFlagOff(var1, var2, 32768); // L: 308 - this.setFlagOff(var1 - 1, var2 - 1, 2048); // L: 309 + if (var4 == 3) { + this.setFlagOff(var1, var2, 32768); + this.setFlagOff(var1 - 1, var2 - 1, 2048); } } - if (var3 == 2) { // L: 312 - if (var4 == 0) { // L: 313 - this.setFlagOff(var1, var2, 66560); // L: 314 - this.setFlagOff(var1 - 1, var2, 4096); // L: 315 - this.setFlagOff(var1, var2 + 1, 16384); // L: 316 + if (var3 == 2) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 66560); + this.setFlagOff(var1 - 1, var2, 4096); + this.setFlagOff(var1, var2 + 1, 16384); } - if (var4 == 1) { // L: 318 - this.setFlagOff(var1, var2, 5120); // L: 319 - this.setFlagOff(var1, var2 + 1, 16384); // L: 320 - this.setFlagOff(var1 + 1, var2, 65536); // L: 321 + if (var4 == 1) { + this.setFlagOff(var1, var2, 5120); + this.setFlagOff(var1, var2 + 1, 16384); + this.setFlagOff(var1 + 1, var2, 65536); } - if (var4 == 2) { // L: 323 - this.setFlagOff(var1, var2, 20480); // L: 324 - this.setFlagOff(var1 + 1, var2, 65536); // L: 325 - this.setFlagOff(var1, var2 - 1, 1024); // L: 326 + if (var4 == 2) { + this.setFlagOff(var1, var2, 20480); + this.setFlagOff(var1 + 1, var2, 65536); + this.setFlagOff(var1, var2 - 1, 1024); } - if (var4 == 3) { // L: 328 - this.setFlagOff(var1, var2, 81920); // L: 329 - this.setFlagOff(var1, var2 - 1, 1024); // L: 330 - this.setFlagOff(var1 - 1, var2, 4096); // L: 331 + if (var4 == 3) { + this.setFlagOff(var1, var2, 81920); + this.setFlagOff(var1, var2 - 1, 1024); + this.setFlagOff(var1 - 1, var2, 4096); } } } - } // L: 335 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "63758690" + garbageValue = "1271706136" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { - int var7 = 256; // L: 338 - if (var6) { // L: 339 + int var7 = 256; + if (var6) { var7 += 131072; } - var1 -= this.xInset; // L: 340 - var2 -= this.yInset; // L: 341 + var1 -= this.xInset; + var2 -= this.yInset; int var8; - if (var5 == 1 || var5 == 3) { // L: 342 - var8 = var3; // L: 343 - var3 = var4; // L: 344 - var4 = var8; // L: 345 + if (var5 == 1 || var5 == 3) { + var8 = var3; + var3 = var4; + var4 = var8; } - for (var8 = var1; var8 < var3 + var1; ++var8) { // L: 347 - if (var8 >= 0 && var8 < this.xSize) { // L: 348 - for (int var9 = var2; var9 < var2 + var4; ++var9) { // L: 349 + for (var8 = var1; var8 < var3 + var1; ++var8) { + if (var8 >= 0 && var8 < this.xSize) { + for (int var9 = var2; var9 < var2 + var4; ++var9) { if (var9 >= 0 && var9 < this.ySize) { - this.setFlagOff(var8, var9, var7); // L: 350 + this.setFlagOff(var8, var9, var7); } } } } - } // L: 354 + } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1773345241" + garbageValue = "-1119202774" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; // L: 357 + int[] var10000 = this.flags[var1]; var10000[var2] &= ~var3; - } // L: 358 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1650677027" - ) - public void method3206(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("e") - static double method3213(double var0, double var2, double var4) { - return WallDecoration.method4429((var0 - var2) / var4) / var4; // L: 13 } - @ObfuscatedName("z") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1850795522" + descriptor = "(III)V", + garbageValue = "-2137873590" ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1218 - Login.Login_response2 = var1; // L: 1219 - Login.Login_response3 = var2; // L: 1220 - } // L: 1221 + public void method3200(int var1, int var2) { + var1 -= this.xInset; + var2 -= this.yInset; + int[] var10000 = this.flags[var1]; + var10000[var2] &= -262145; + } - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-719935819" + descriptor = "(B)Lhg;", + garbageValue = "0" ) - public static void method3245() { - ObjectComposition.ObjectDefinition_cached.clear(); // L: 427 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 428 - ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 429 - ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 430 - } // L: 431 + public static PacketBufferNode method3205() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } - @ObfuscatedName("kh") + @ObfuscatedName("ih") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1470187850" + descriptor = "(I)I", + garbageValue = "-1173272603" ) - static final void method3244() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11450 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11451 - var1.method2213(); // L: 11452 - } - - } // L: 11454 + static final int method3204() { + return Client.menuOptionsCount - 1; + } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index a2508c83a2..37821c1f09 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,249 +4,109 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("ij") @Implements("Coord") public class Coord { - @ObfuscatedName("j") + @ObfuscatedName("lo") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Lio;" ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("f") + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1361865131 + intValue = 1536626137 ) @Export("plane") public int plane; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1864154747 + intValue = -2010801875 ) @Export("x") public int x; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 807727247 + intValue = 724560647 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Liw;)V" + descriptor = "(Lij;)V" ) public Coord(Coord var1) { - this.plane = var1.plane; // L: 15 - this.x = var1.x; // L: 16 - this.y = var1.y; // L: 17 - } // L: 18 + this.plane = var1.plane; + this.x = var1.x; + this.y = var1.y; + } public Coord(int var1, int var2, int var3) { - this.plane = var1; // L: 9 - this.x = var2; // L: 10 - this.y = var3; // L: 11 - } // L: 12 + this.plane = var1; + this.x = var2; + this.y = var3; + } public Coord(int var1) { - if (var1 == -1) { // L: 21 + if (var1 == -1) { this.plane = -1; } else { - this.plane = var1 >> 28 & 3; // L: 23 - this.x = var1 >> 14 & 16383; // L: 24 - this.y = var1 & 16383; // L: 25 + this.plane = var1 >> 28 & 3; + this.x = var1 >> 14 & 16383; + this.y = var1 & 16383; } - } // L: 27 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-688819696" + descriptor = "(B)I", + garbageValue = "1" ) @Export("packed") public int packed() { - return this.plane << 28 | this.x << 14 | this.y; // L: 30 + return this.plane << 28 | this.x << 14 | this.y; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Liw;I)Z", - garbageValue = "-1923777206" + descriptor = "(Lij;I)Z", + garbageValue = "1077845363" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { // L: 40 + if (this.plane != var1.plane) { return false; - } else if (this.x != var1.x) { // L: 41 + } else if (this.x != var1.x) { return false; } else { - return this.y == var1.y; // L: 42 + return this.y == var1.y; } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-23" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1959395085" ) @Export("toString") String toString(String var1) { - return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 55 - } - - public int hashCode() { - return this.packed(); // L: 47 - } - - public String toString() { - return this.toString(","); // L: 51 + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); } public boolean equals(Object var1) { - if (this == var1) { // L: 34 + if (this == var1) { return true; } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 35 36 + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } } - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1693981343" - ) - static final void method4790() { - int var0 = SoundCache.field448 * 128 + 64; // L: 3896 - int var1 = AttackOption.field1351 * 128 + 64; // L: 3897 - int var2 = ItemContainer.getTileHeight(var0, var1, SoundSystem.Client_plane) - Client.field659; // L: 3898 - if (ObjectSound.cameraX < var0) { // L: 3899 - ObjectSound.cameraX = (var0 - ObjectSound.cameraX) * FloorUnderlayDefinition.field1707 / 1000 + ObjectSound.cameraX + Message.field602; // L: 3900 - if (ObjectSound.cameraX > var0) { // L: 3901 - ObjectSound.cameraX = var0; - } - } + public int hashCode() { + return this.packed(); + } - if (ObjectSound.cameraX > var0) { // L: 3903 - ObjectSound.cameraX -= FloorUnderlayDefinition.field1707 * (ObjectSound.cameraX - var0) / 1000 + Message.field602; // L: 3904 - if (ObjectSound.cameraX < var0) { // L: 3905 - ObjectSound.cameraX = var0; - } - } - - if (class160.cameraY < var2) { // L: 3907 - class160.cameraY = (var2 - class160.cameraY) * FloorUnderlayDefinition.field1707 / 1000 + class160.cameraY + Message.field602; // L: 3908 - if (class160.cameraY > var2) { // L: 3909 - class160.cameraY = var2; - } - } - - if (class160.cameraY > var2) { // L: 3911 - class160.cameraY -= FloorUnderlayDefinition.field1707 * (class160.cameraY - var2) / 1000 + Message.field602; // L: 3912 - if (class160.cameraY < var2) { // L: 3913 - class160.cameraY = var2; - } - } - - if (Canvas.cameraZ < var1) { // L: 3915 - Canvas.cameraZ = (var1 - Canvas.cameraZ) * FloorUnderlayDefinition.field1707 / 1000 + Canvas.cameraZ + Message.field602; // L: 3916 - if (Canvas.cameraZ > var1) { // L: 3917 - Canvas.cameraZ = var1; - } - } - - if (Canvas.cameraZ > var1) { // L: 3919 - Canvas.cameraZ -= FloorUnderlayDefinition.field1707 * (Canvas.cameraZ - var1) / 1000 + Message.field602; // L: 3920 - if (Canvas.cameraZ < var1) { // L: 3921 - Canvas.cameraZ = var1; - } - } - - var0 = WorldMapIcon_0.field2029 * 128 + 64; // L: 3923 - var1 = class44.field315 * 128 + 64; // L: 3924 - var2 = ItemContainer.getTileHeight(var0, var1, SoundSystem.Client_plane) - FriendsChat.field3815; // L: 3925 - int var3 = var0 - ObjectSound.cameraX; // L: 3926 - int var4 = var2 - class160.cameraY; // L: 3927 - int var5 = var1 - Canvas.cameraZ; // L: 3928 - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); // L: 3929 - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; // L: 3930 - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; // L: 3931 - if (var7 < 128) { // L: 3932 - var7 = 128; - } - - if (var7 > 383) { // L: 3933 - var7 = 383; - } - - if (class69.cameraPitch < var7) { // L: 3934 - class69.cameraPitch = (var7 - class69.cameraPitch) * class20.field166 / 1000 + class69.cameraPitch + GrandExchangeOfferOwnWorldComparator.field607; // L: 3935 - if (class69.cameraPitch > var7) { // L: 3936 - class69.cameraPitch = var7; - } - } - - if (class69.cameraPitch > var7) { // L: 3938 - class69.cameraPitch -= class20.field166 * (class69.cameraPitch - var7) / 1000 + GrandExchangeOfferOwnWorldComparator.field607; // L: 3939 - if (class69.cameraPitch < var7) { // L: 3940 - class69.cameraPitch = var7; - } - } - - int var9 = var8 - class32.cameraYaw; // L: 3942 - if (var9 > 1024) { // L: 3943 - var9 -= 2048; - } - - if (var9 < -1024) { // L: 3944 - var9 += 2048; - } - - if (var9 > 0) { // L: 3945 - class32.cameraYaw = class32.cameraYaw + GrandExchangeOfferOwnWorldComparator.field607 + var9 * class20.field166 / 1000; // L: 3946 - class32.cameraYaw &= 2047; // L: 3947 - } - - if (var9 < 0) { // L: 3949 - class32.cameraYaw -= -var9 * class20.field166 / 1000 + GrandExchangeOfferOwnWorldComparator.field607; // L: 3950 - class32.cameraYaw &= 2047; // L: 3951 - } - - int var10 = var8 - class32.cameraYaw; // L: 3953 - if (var10 > 1024) { // L: 3954 - var10 -= 2048; - } - - if (var10 < -1024) { // L: 3955 - var10 += 2048; - } - - if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { // L: 3956 - class32.cameraYaw = var8; - } - - } // L: 3957 - - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "57209027" - ) - static final void method4801() { - Client.field817 = Client.cycleCntr; // L: 11457 - } // L: 11458 - - @ObfuscatedName("lg") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1607735940" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 11479 - PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); // L: 11481 - var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 11482 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11483 - Client.packetWriter.addNode(var1); // L: 11484 - } - } // L: 11485 + public String toString() { + return this.toString(","); + } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 4222b6917b..dc0dd02c8f 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -3,75 +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("bt") +@ObfuscatedName("ao") @Implements("Decimator") public class Decimator { - @ObfuscatedName("y") + @ObfuscatedName("si") + @ObfuscatedSignature( + descriptor = "Lbp;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("oo") + @ObfuscatedSignature( + descriptor = "Lci;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 420963985 + intValue = 615174595 ) @Export("inputRate") int inputRate; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1138629961 + intValue = -455379073 ) @Export("outputRate") int outputRate; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("table") int[][] table; public Decimator(int var1, int var2) { - if (var2 != var1) { // L: 14 - int var3 = class34.method402(var1, var2); // L: 15 - var1 /= var3; // L: 16 - var2 /= var3; // L: 17 - this.inputRate = var1; // L: 18 - this.outputRate = var2; // L: 19 - this.table = new int[var1][14]; // L: 20 + if (var2 != var1) { + int var3 = WorldMapRectangle.method3644(var1, var2); + var1 /= var3; + var2 /= var3; + this.inputRate = var1; + this.outputRate = var2; + this.table = new int[var1][14]; - for (int var4 = 0; var4 < var1; ++var4) { // L: 21 - int[] var5 = this.table[var4]; // L: 22 - double var6 = 6.0D + (double)var4 / (double)var1; // L: 23 - int var8 = (int)Math.floor(var6 - 7.0D + 1.0D); + for (int var4 = 0; var4 < var1; ++var4) { + int[] var5 = this.table[var4]; + double var6 = 6.0D + (double)var4 / (double)var1; + int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); if (var8 < 0) { var8 = 0; } - int var9 = (int)Math.ceil(7.0D + var6); // L: 26 - if (var9 > 14) { // L: 27 + int var9 = (int)Math.ceil(7.0D + var6); + if (var9 > 14) { var9 = 14; } - for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { // L: 28 29 - double var12 = ((double)var8 - var6) * 3.141592653589793D; // L: 30 - double var14 = var10; // L: 31 - if (var12 < -1.0E-4D || var12 > 1.0E-4D) { // L: 32 + for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { + double var12 = ((double)var8 - var6) * 3.141592653589793D; + double var14 = var10; + if (var12 < -1.0E-4D || var12 > 1.0E-4D) { var14 = var10 * (Math.sin(var12) / var12); } - var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); // L: 33 - var5[var8] = (int)Math.floor(0.5D + 65536.0D * var14); // L: 34 + var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); + var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); } } } - } // L: 37 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-1846224274" + descriptor = "([BB)[B", + garbageValue = "-110" ) @Export("resample") byte[] resample(byte[] var1) { - if (this.table != null) { // L: 40 - int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; // L: 41 - int[] var3 = new int[var2]; // L: 42 - int var4 = 0; // L: 43 + if (this.table != null) { + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; + int[] var3 = new int[var2]; + int var4 = 0; int var5 = 0; int var6; @@ -80,13 +103,13 @@ public class Decimator { int[] var8 = this.table[var5]; int var9; - for (var9 = 0; var9 < 14; ++var9) { // L: 48 - var3[var4 + var9] += var7 * var8[var9]; + for (var9 = 0; var9 < 14; ++var9) { + var3[var9 + var4] += var8[var9] * var7; } - var5 += this.outputRate; // L: 49 - var9 = var5 / this.inputRate; // L: 50 - var4 += var9; // L: 51 + var5 += this.outputRate; + var9 = var5 / this.inputRate; + var4 += var9; var5 -= var9 * this.inputRate; } @@ -99,343 +122,83 @@ public class Decimator { } else if (var10 > 127) { var1[var6] = 127; } else { - var1[var6] = (byte)var10; // L: 59 + var1[var6] = (byte)var10; } } } - return var1; // L: 62 + return var1; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" + descriptor = "(II)I", + garbageValue = "2124856027" ) @Export("scaleRate") int scaleRate(int var1) { - if (this.table != null) { // L: 66 + if (this.table != null) { var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); } - return var1; // L: 67 + return var1; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-946737566" + garbageValue = "-1182254133" ) @Export("scalePosition") int scalePosition(int var1) { - if (this.table != null) { // L: 71 - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; + if (this.table != null) { + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } - return var1; // L: 72 + return var1; } - @ObfuscatedName("f") + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1393447426" + descriptor = "(Lio;B)V", + garbageValue = "-2" ) - public static void method1160() { - class69.reflectionChecks = new IterableNodeDeque(); // L: 24 - } // L: 25 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)Les;", - garbageValue = "112" - ) - public static HitSplatDefinition method1171(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52 - if (var1 != null) { // L: 53 - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54 - var1 = new HitSplatDefinition(); // L: 55 - if (var2 != null) { // L: 56 - var1.decode(new Buffer(var2)); + static final void method806(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field674 == -1) { + Client.field674 = var0.spriteId2; + Client.field675 = var0.spriteId; } - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 - return var1; // L: 58 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "452122319" - ) - public static void method1169() { - class233.midiPcmStream.clear(); // L: 44 - class233.musicPlayerStatus = 1; // L: 45 - InvDefinition.musicTrackArchive = null; // L: 46 - } // L: 47 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1181477544" - ) - public static void method1168() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 94 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 95 - } // L: 96 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIIIIIILgp;Lfl;B)V", - garbageValue = "-20" - ) - static final void method1167(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { - ObjectComposition var9 = Tiles.getObjectDefinition(var4); // L: 874 - int var10; - int var11; - if (var5 != 1 && var5 != 3) { // L: 877 - var10 = var9.sizeX; // L: 882 - var11 = var9.sizeY; // L: 883 - } else { - var10 = var9.sizeY; // L: 878 - var11 = var9.sizeX; // L: 879 - } - - int var12; - int var13; - if (var10 + var2 <= 104) { // L: 889 - var12 = (var10 >> 1) + var2; // L: 890 - var13 = var2 + (var10 + 1 >> 1); // L: 891 - } else { - var12 = var2; // L: 894 - var13 = var2 + 1; // L: 895 - } - - int var14; - int var15; - if (var3 + var11 <= 104) { // L: 897 - var14 = var3 + (var11 >> 1); // L: 898 - var15 = var3 + (var11 + 1 >> 1); // L: 899 - } else { - var14 = var3; // L: 902 - var15 = var3 + 1; // L: 903 - } - - int[][] var16 = Tiles.Tiles_heights[var1]; // L: 905 - int var17 = var16[var12][var15] + var16[var12][var14] + var16[var13][var14] + var16[var13][var15] >> 2; // L: 906 - int var18 = (var2 << 7) + (var10 << 6); // L: 907 - int var19 = (var3 << 7) + (var11 << 6); // L: 908 - long var20 = UserComparator3.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 909 - int var22 = (var5 << 6) + var6; // L: 910 - if (var9.int3 == 1) { // L: 911 - var22 += 256; - } - - Object var30; - if (var6 == 22) { // L: 912 - if (var9.animationId == -1 && var9.transforms == null) { // L: 914 - var30 = var9.getModel(22, var5, var16, var18, var17, var19); + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field674; } else { - var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 915 + var0.spriteId2 = Client.field675; } - var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 916 - if (var9.interactType == 1) { // L: 917 - var8.setBlockedByFloorDec(var2, var3); + } else if (var1 == 325) { + if (Client.field674 == -1) { + Client.field674 = var0.spriteId2; + Client.field675 = var0.spriteId; } - } else if (var6 != 10 && var6 != 11) { // L: 920 - if (var6 >= 12) { // L: 928 - if (var9.animationId == -1 && var9.transforms == null) { // L: 930 - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 931 - } - - var7.method4046(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 932 - if (var9.interactType != 0) { // L: 933 - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 0) { // L: 936 - if (var9.animationId == -1 && var9.transforms == null) { // L: 938 - var30 = var9.getModel(0, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 939 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1102[var5], 0, var20, var22); // L: 940 - if (var9.interactType != 0) { // L: 941 - var8.method3216(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 1) { // L: 944 - if (var9.animationId == -1 && var9.transforms == null) { // L: 946 - var30 = var9.getModel(1, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 947 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1107[var5], 0, var20, var22); // L: 948 - if (var9.interactType != 0) { // L: 949 - var8.method3216(var2, var3, var6, var5, var9.boolean1); - } - + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field675; } else { - int var23; - if (var6 == 2) { // L: 952 - var23 = var5 + 1 & 3; // L: 953 - Object var25; - Object var31; - if (var9.animationId == -1 && var9.transforms == null) { // L: 956 - var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 957 - var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 958 - } else { - var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 961 - var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 962 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field1102[var5], Tiles.field1102[var23], var20, var22); // L: 964 - if (var9.interactType != 0) { // L: 965 - var8.method3216(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 3) { // L: 968 - if (var9.animationId == -1 && var9.transforms == null) { // L: 970 - var30 = var9.getModel(3, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 971 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1107[var5], 0, var20, var22); // L: 972 - if (var9.interactType != 0) { // L: 973 - var8.method3216(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 9) { // L: 976 - if (var9.animationId == -1 && var9.transforms == null) { // L: 978 - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 979 - } - - var7.method4046(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 980 - if (var9.interactType != 0) { // L: 981 - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 4) { // L: 984 - if (var9.animationId == -1 && var9.transforms == null) { // L: 986 - var30 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 987 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1102[var5], 0, 0, 0, var20, var22); // L: 988 - } else { - long var24; - Object var26; - if (var6 == 5) { // L: 991 - var23 = 16; // L: 992 - var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 993 - if (0L != var24) { // L: 994 - var23 = Tiles.getObjectDefinition(Message.Entity_unpackID(var24)).int2; - } - - if (var9.animationId == -1 && var9.transforms == null) { // L: 996 - var26 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 997 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field1102[var5], 0, var23 * Tiles.field1100[var5], var23 * Tiles.field1105[var5], var20, var22); // L: 998 - } else if (var6 == 6) { // L: 1001 - var23 = 8; // L: 1002 - var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1003 - if (0L != var24) { // L: 1004 - var23 = Tiles.getObjectDefinition(Message.Entity_unpackID(var24)).int2 / 2; - } - - if (var9.animationId == -1 && var9.transforms == null) { // L: 1006 - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1007 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field1106[var5], var23 * Tiles.field1097[var5], var20, var22); // L: 1008 - } else if (var6 == 7) { // L: 1011 - int var29 = var5 + 2 & 3; // L: 1013 - if (var9.animationId == -1 && var9.transforms == null) { // L: 1014 - var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1015 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1016 - } else if (var6 == 8) { // L: 1019 - var23 = 8; // L: 1020 - var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1021 - if (0L != var24) { // L: 1022 - var23 = Tiles.getObjectDefinition(Message.Entity_unpackID(var24)).int2 / 2; - } - - int var28 = var5 + 2 & 3; // L: 1025 - Object var27; - if (var9.animationId == -1 && var9.transforms == null) { // L: 1026 - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1027 - var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1028 - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1031 - var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1032 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field1106[var5], var23 * Tiles.field1097[var5], var20, var22); // L: 1034 - } - } - } - } else { - if (var9.animationId == -1 && var9.transforms == null) { // L: 922 - var30 = var9.getModel(10, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 923 + var0.spriteId2 = Client.field674; } - if (var30 != null) { // L: 924 - var7.method4046(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22); - } - - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); // L: 925 - } - - } - } // L: 918 926 934 942 950 966 974 982 989 999 1009 1017 1035 1037 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-1188638191" - ) - static int method1162(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1184 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1185 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.itemId; // L: 1186 - return 1; // L: 1187 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1189 - if (var3.itemId != -1) { // L: 1190 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1191 - } - - return 1; // L: 1192 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1194 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1195 - return 1; // L: 1196 - } else { - return 2; // L: 1198 + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; } } } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 32a3f656e8..1a647113a9 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,36 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("lk") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Llm;" - ) - static final DefaultsGroup field3890; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - static Bounds field3891; - @ObfuscatedName("fu") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Llk;" ) - static AbstractSocket field3887; - @ObfuscatedName("e") + static final DefaultsGroup field3904; + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = 1341790971 + intValue = -694914585 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1809855359 ) @Export("group") final int group; static { - field3890 = new DefaultsGroup(3); // L: 4 + field3904 = new DefaultsGroup(3); } DefaultsGroup(int var1) { - this.group = var1; // L: 8 - } // L: 9 + this.group = var1; + } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 0e7032755b..bd12b08f3a 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,163 +3,163 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("hk") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("remaining") int remaining; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkc;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhn;" ) - class218 field2565; + class219 field2553; public DemotingHashTable(int var1, int var2) { - this.queue = new IterableDualNodeQueue(); // L: 11 - this.capacity = var1; // L: 19 - this.remaining = var1; // L: 20 + this.queue = new IterableDualNodeQueue(); + this.capacity = var1; + this.remaining = var1; int var3; - for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { // L: 21 22 + for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { } - this.hashTable = new IterableNodeHashTable(var3); // L: 23 - } // L: 24 + this.hashTable = new IterableNodeHashTable(var3); + } public DemotingHashTable(int var1) { - this(var1, var1); // L: 15 - } // L: 16 + this(var1, var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("get") public Object get(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27 - if (var3 == null) { // L: 28 + Wrapper var3 = (Wrapper)this.hashTable.get(var1); + if (var3 == null) { return null; } else { - Object var4 = var3.get(); // L: 29 - if (var4 == null) { // L: 30 - var3.remove(); // L: 31 - var3.removeDual(); // L: 32 - this.remaining += var3.size; // L: 33 - return null; // L: 34 + Object var4 = var3.get(); + if (var4 == null) { + var3.remove(); + var3.removeDual(); + this.remaining += var3.size; + return null; } else { - if (var3.isSoft()) { // L: 36 - DirectWrapper var5 = new DirectWrapper(var4, var3.size); // L: 37 - this.hashTable.put(var5, var3.key); // L: 38 - this.queue.add(var5); // L: 39 - var5.keyDual = 0L; // L: 40 - var3.remove(); // L: 41 - var3.removeDual(); // L: 42 + if (var3.isSoft()) { + DirectWrapper var5 = new DirectWrapper(var4, var3.size); + this.hashTable.put(var5, var3.key); + this.queue.add(var5); + var5.keyDual = 0L; + var3.remove(); + var3.removeDual(); } else { - this.queue.add(var3); // L: 45 - var3.keyDual = 0L; // L: 46 + this.queue.add(var3); + var3.keyDual = 0L; } - return var4; // L: 48 + return var4; } } } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("remove") void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 - this.removeWrapper(var3); // L: 53 - } // L: 54 + Wrapper var3 = (Wrapper)this.hashTable.get(var1); + this.removeWrapper(var3); + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lha;)V" + descriptor = "(Lhu;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { - if (var1 != null) { // L: 57 - var1.remove(); // L: 58 - var1.removeDual(); // L: 59 - this.remaining += var1.size; // L: 60 + if (var1 != null) { + var1.remove(); + var1.removeDual(); + this.remaining += var1.size; } - } // L: 62 - - @ObfuscatedName("y") - public void method4456(Object var1, long var2) { - this.put(var1, var2, 1); // L: 65 - } // L: 66 + } @ObfuscatedName("j") + public void method4351(Object var1, long var2) { + this.put(var1, var2, 1); + } + + @ObfuscatedName("l") @Export("put") public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { // L: 69 + if (var4 > this.capacity) { throw new IllegalStateException(); } else { - this.remove(var2); // L: 70 - this.remaining -= var4; // L: 71 + this.remove(var2); + this.remaining -= var4; - while (this.remaining < 0) { // L: 72 - Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 73 - if (var5 == null) { // L: 74 - throw new RuntimeException(""); // L: 75 + while (this.remaining < 0) { + Wrapper var5 = (Wrapper)this.queue.removeLast(); + if (var5 == null) { + throw new RuntimeException(""); } - if (!var5.isSoft()) { // L: 77 + if (!var5.isSoft()) { } - this.removeWrapper(var5); // L: 78 - if (this.field2565 != null) { // L: 79 - this.field2565.method4438(var5.get()); // L: 80 + this.removeWrapper(var5); + if (this.field2553 != null) { + this.field2553.method4344(var5.get()); } } - DirectWrapper var6 = new DirectWrapper(var1, var4); // L: 83 - this.hashTable.put(var6, var2); // L: 84 - this.queue.add(var6); // L: 85 - var6.keyDual = 0L; // L: 86 + DirectWrapper var6 = new DirectWrapper(var1, var4); + this.hashTable.put(var6, var2); + this.queue.add(var6); + var6.keyDual = 0L; } - } // 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 - if (var2.isSoft()) { // L: 91 - if (var2.get() == null) { // L: 92 - var2.remove(); // L: 93 - var2.removeDual(); // L: 94 - this.remaining += var2.size; // L: 95 + for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { + if (var2.isSoft()) { + if (var2.get() == null) { + var2.remove(); + var2.removeDual(); + this.remaining += var2.size; } - } else if (++var2.keyDual > (long)var1) { // L: 100 - SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 101 - this.hashTable.put(var3, var2.key); // L: 102 - IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 103 - var2.remove(); // L: 104 - var2.removeDual(); // L: 105 + } else if (++var2.keyDual > (long)var1) { + SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); + this.hashTable.put(var3, var2.key); + IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); + var2.remove(); + var2.removeDual(); } } - } // L: 109 + } - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("clear") public void clear() { - this.queue.clear(); // L: 112 - this.hashTable.clear(); // L: 113 - this.remaining = this.capacity; // L: 114 - } // L: 115 + this.queue.clear(); + this.hashTable.clear(); + this.remaining = this.capacity; + } } diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index d3b8e67c2d..0f8fda4213 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,259 +4,201 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") +@ObfuscatedName("mj") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1922177111 - ) - int field3939; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1155417059 + intValue = 592380753 ) - int field3937; - @ObfuscatedName("o") + int field3970; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -187752831 + intValue = 497510611 ) - int field3941; + int field3971; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 2127899029 + ) + int field3972; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lms;", - garbageValue = "-1968333950" + descriptor = "(B)Lmz;", + garbageValue = "41" ) @Export("get") public PlatformInfo get() { byte var1; - if (GraphicsObject.formattedOperatingSystemName.startsWith("win")) { // L: 15 + if (WorldMapEvent.formattedOperatingSystemName.startsWith("win")) { var1 = 1; - } else if (GraphicsObject.formattedOperatingSystemName.startsWith("mac")) { // L: 16 + } else if (WorldMapEvent.formattedOperatingSystemName.startsWith("mac")) { var1 = 2; - } else if (GraphicsObject.formattedOperatingSystemName.startsWith("linux")) { // L: 17 + } else if (WorldMapEvent.formattedOperatingSystemName.startsWith("linux")) { var1 = 3; } else { - var1 = 4; // L: 18 + var1 = 4; } String var2; try { - var2 = System.getProperty("os.arch").toLowerCase(); // L: 22 - } catch (Exception var27) { // L: 24 - var2 = ""; // L: 25 + var2 = System.getProperty("os.arch").toLowerCase(); + } catch (Exception var27) { + var2 = ""; } String var3; try { - var3 = System.getProperty("os.version").toLowerCase(); // L: 28 - } catch (Exception var26) { // L: 30 - var3 = ""; // L: 31 + var3 = System.getProperty("os.version").toLowerCase(); + } catch (Exception var26) { + var3 = ""; } - String var4 = "Unknown"; // L: 33 - String var5 = "1.1"; // L: 34 + String var4 = "Unknown"; + String var5 = "1.1"; try { - var4 = System.getProperty("java.vendor"); // L: 36 - var5 = System.getProperty("java.version"); // L: 37 - } catch (Exception var25) { // L: 39 + var4 = System.getProperty("java.vendor"); + var5 = System.getProperty("java.version"); + } catch (Exception var25) { } boolean var24; - if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 41 - var24 = false; // L: 42 + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { + var24 = false; } else { var24 = true; } - byte var7 = 0; // L: 43 - if (var1 == 1) { // L: 44 - if (var3.indexOf("4.0") != -1) { // L: 45 + byte var7 = 0; + if (var1 == 1) { + if (var3.indexOf("4.0") != -1) { var7 = 1; - } else if (var3.indexOf("4.1") != -1) { // L: 46 + } else if (var3.indexOf("4.1") != -1) { var7 = 2; - } else if (var3.indexOf("4.9") != -1) { // L: 47 + } else if (var3.indexOf("4.9") != -1) { var7 = 3; - } else if (var3.indexOf("5.0") != -1) { // L: 48 + } else if (var3.indexOf("5.0") != -1) { var7 = 4; - } else if (var3.indexOf("5.1") != -1) { // L: 49 + } else if (var3.indexOf("5.1") != -1) { var7 = 5; - } else if (var3.indexOf("5.2") != -1) { // L: 50 + } else if (var3.indexOf("5.2") != -1) { var7 = 8; - } else if (var3.indexOf("6.0") != -1) { // L: 51 + } else if (var3.indexOf("6.0") != -1) { var7 = 6; - } else if (var3.indexOf("6.1") != -1) { // L: 52 + } else if (var3.indexOf("6.1") != -1) { var7 = 7; - } else if (var3.indexOf("6.2") != -1) { // L: 53 + } else if (var3.indexOf("6.2") != -1) { var7 = 9; - } else if (var3.indexOf("6.3") != -1) { // L: 54 + } else if (var3.indexOf("6.3") != -1) { var7 = 10; - } else if (var3.indexOf("10.0") != -1) { // L: 55 + } else if (var3.indexOf("10.0") != -1) { var7 = 11; } - } else if (var1 == 2) { // L: 57 - if (var3.indexOf("10.4") != -1) { // L: 58 + } else if (var1 == 2) { + if (var3.indexOf("10.4") != -1) { var7 = 20; - } else if (var3.indexOf("10.5") != -1) { // L: 59 + } else if (var3.indexOf("10.5") != -1) { var7 = 21; - } else if (var3.indexOf("10.6") != -1) { // L: 60 + } else if (var3.indexOf("10.6") != -1) { var7 = 22; - } else if (var3.indexOf("10.7") != -1) { // L: 61 + } else if (var3.indexOf("10.7") != -1) { var7 = 23; - } else if (var3.indexOf("10.8") != -1) { // L: 62 + } else if (var3.indexOf("10.8") != -1) { var7 = 24; - } else if (var3.indexOf("10.9") != -1) { // L: 63 + } else if (var3.indexOf("10.9") != -1) { var7 = 25; } else if (var3.indexOf("10.10") != -1) { - var7 = 26; // L: 64 - } else if (var3.indexOf("10.11") != -1) { // L: 65 + var7 = 26; + } else if (var3.indexOf("10.11") != -1) { var7 = 27; - } else if (var3.indexOf("10.12") != -1) { // L: 66 + } else if (var3.indexOf("10.12") != -1) { var7 = 28; - } else if (var3.indexOf("10.13") != -1) { // L: 67 + } else if (var3.indexOf("10.13") != -1) { var7 = 29; } } byte var8; - if (var4.toLowerCase().indexOf("sun") != -1) { // L: 70 + if (var4.toLowerCase().indexOf("sun") != -1) { var8 = 1; - } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 71 + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { var8 = 2; - } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 72 + } else if (var4.toLowerCase().indexOf("apple") != -1) { var8 = 3; - } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 73 + } else if (var4.toLowerCase().indexOf("oracle") != -1) { var8 = 5; } else { - var8 = 4; // L: 74 + var8 = 4; } - this.method6099(var5); // L: 75 - int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 + this.method6120(var5); + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3939 > 3) { // L: 80 + if (this.field3970 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { - var11 = 0; // L: 81 + var11 = 0; } - byte var12 = 0; // L: 82 - String var13 = ""; // L: 83 - String var14 = ""; // L: 84 - String var15 = ""; // L: 85 - String var16 = ""; // L: 86 - String var17 = ""; // L: 87 - String var18 = ""; // L: 88 - int[] var23 = new int[3]; // L: 93 - return new PlatformInfo(var1, var24, var7, var8, this.field3939, this.field3937, this.field3941, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 + byte var12 = 0; + String var13 = ""; + String var14 = ""; + String var15 = ""; + String var16 = ""; + String var17 = ""; + String var18 = ""; + int[] var23 = new int[3]; + return new PlatformInfo(var1, var24, var7, var8, this.field3970, this.field3971, this.field3972, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1264148958" + garbageValue = "-180347683" ) - void method6099(String var1) { - if (var1.startsWith("1.")) { // L: 101 - this.method6107(var1); // L: 102 + void method6120(String var1) { + if (var1.startsWith("1.")) { + this.method6118(var1); } else { - this.method6101(var1); // L: 105 + this.method6119(var1); } - } // L: 107 + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "497638496" + garbageValue = "-850545251" ) - void method6107(String var1) { - String[] var2 = var1.split("\\."); // L: 110 + void method6118(String var1) { + String[] var2 = var1.split("\\."); try { - this.field3939 = Integer.parseInt(var2[1]); // L: 112 - var2 = var2[2].split("_"); // L: 113 - this.field3937 = Integer.parseInt(var2[0]); // L: 114 - this.field3941 = Integer.parseInt(var2[1]); // L: 115 - } catch (Exception var4) { // L: 117 - } - - } // L: 118 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2055431648" - ) - void method6101(String var1) { - String[] var2 = var1.split("\\."); // L: 121 - - try { - this.field3939 = Integer.parseInt(var2[0]); // L: 123 - this.field3937 = Integer.parseInt(var2[1]); - this.field3941 = Integer.parseInt(var2[2]); - } catch (Exception var4) { // L: 127 + this.field3970 = Integer.parseInt(var2[1]); + var2 = var2[2].split("_"); + this.field3971 = Integer.parseInt(var2[0]); + this.field3972 = Integer.parseInt(var2[1]); + } catch (Exception var4) { } } - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;ZII)V", - garbageValue = "2098353545" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1756504457" ) - static void method6109(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (class377.clearLoginScreen) { // L: 124 - if (var3 == 4) { // L: 125 - Login.loginIndex = 4; // L: 126 - } + void method6119(String var1) { + String[] var2 = var1.split("\\."); - } else { - Login.loginIndex = var3; // L: 130 - Rasterizer2D.Rasterizer2D_clear(); // L: 131 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 132 - class339.leftTitleSprite = class125.convertJpgToSprite(var4); // L: 133 - class377.rightTitleSprite = class339.leftTitleSprite.mirrorHorizontally(); // L: 134 - class27.method364(var1, Client.worldProperties); // L: 135 - Coord.titleboxSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 136 - class289.titlebuttonSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 137 - Login.runesSprite = WorldMapLabelSize.method3268(var1, "runes", ""); // L: 138 - GrandExchangeEvents.title_muteSprite = WorldMapLabelSize.method3268(var1, "title_mute", ""); // L: 139 - Login.options_buttons_0Sprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 140 - NetFileRequest.field3577 = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 141 - WorldMapCacheName.options_buttons_2Sprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 142 - Login.field1005 = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 143 - class126.field1477 = Login.options_buttons_0Sprite.subWidth; // L: 144 - PcmPlayer.field416 = Login.options_buttons_0Sprite.subHeight; // L: 145 - PendingSpawn.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 146 - if (var2) { // L: 147 - Login.Login_username = ""; // L: 148 - Login.Login_password = ""; // L: 149 - } - - class0.field2 = 0; // L: 151 - ItemLayer.otp = ""; // L: 152 - Login.field1022 = true; // L: 153 - Login.worldSelectOpen = false; // L: 154 - if (!class4.clientPreferences.titleMusicDisabled) { // L: 155 - Archive var5 = DynamicObject.archive6; // L: 156 - int var6 = var5.getGroupId("scape main"); // L: 158 - int var7 = var5.getFileId(var6, ""); // L: 159 - WorldMapIcon_1.method3300(2, var5, var6, var7, 255, false); // L: 160 - } else { - PcmPlayer.method856(2); // L: 163 - } - - class105.method2358(false); // L: 164 - class377.clearLoginScreen = true; // L: 165 - Login.xPadding = (AttackOption.canvasWidth - 765) / 2; // L: 166 - Login.loginBoxX = Login.xPadding + 202; // L: 167 - class25.loginBoxCenter = Login.loginBoxX + 180; // L: 168 - class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 169 - class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 170 - Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 171 + try { + this.field3970 = Integer.parseInt(var2[0]); + this.field3971 = Integer.parseInt(var2[1]); + this.field3972 = Integer.parseInt(var2[2]); + } catch (Exception var4) { } - } // L: 128 172 + + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 5d1a859858..96c2fdd9e2 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,114 +9,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("k") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("format") AudioFormat format; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("line") SourceDataLine line; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2055687751 + intValue = 616506629 ) @Export("capacity2") int capacity2; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { - } // L: 18 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "86" + descriptor = "(I)V", + garbageValue = "-1805977814" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)class341.field3921, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 - } // L: 23 + this.format = new AudioFormat((float)GrandExchangeOfferAgeComparator.field3633, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-412057865" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27 - this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28 - this.line.open(); // L: 29 - this.line.start(); // L: 30 - this.capacity2 = var1; // L: 31 - } catch (LineUnavailableException var3) { // L: 33 - if (class269.method4992(var1) != 1) { // L: 34 - this.open(UrlRequester.method2504(var1)); // L: 35 + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + this.line = (SourceDataLine)AudioSystem.getLine(var2); + this.line.open(); + this.line.start(); + this.capacity2 = var1; + } catch (LineUnavailableException var3) { + if (class124.method2535(var1) != 1) { + this.open(SoundSystem.method530(var1)); } else { - this.line = null; // L: 38 - throw var3; // L: 39 + this.line = null; + throw var3; } } - } // L: 36 41 + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "19" + garbageValue = "0" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("write") protected void write() { - int var1 = 256; // L: 49 - if (PcmPlayer.PcmPlayer_stereo) { // L: 50 + int var1 = 256; + if (PcmPlayer.PcmPlayer_stereo) { var1 <<= 1; } - for (int var2 = 0; var2 < var1; ++var2) { // L: 51 - int var3 = super.samples[var2]; // L: 52 - if ((var3 + 8388608 & -16777216) != 0) { // L: 53 - var3 = 8388607 ^ var3 >> 31; // L: 54 + for (int var2 = 0; var2 < var1; ++var2) { + int var3 = super.samples[var2]; + if ((var3 + 8388608 & -16777216) != 0) { + var3 = 8388607 ^ var3 >> 31; } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 56 - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 57 + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); } - this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 - } // L: 60 + this.line.write(this.byteSamples, 0, var1 << 1); + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2004376502" + garbageValue = "168869451" ) @Export("close") protected void close() { - if (this.line != null) { // L: 63 - this.line.close(); // L: 64 - this.line = null; // L: 65 + if (this.line != null) { + this.line.close(); + this.line = null; } - } // L: 67 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1448704014" + garbageValue = "-1574083924" ) @Export("discard") protected void discard() { - this.line.flush(); // L: 70 - } // L: 71 + this.line.flush(); + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 7ca135769a..f2ae74924d 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,122 +1,156 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("p") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PlayerProvider { - @ObfuscatedName("sx") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lbh;" + descriptor = "Ljy;" ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "Lgp;" + @Export("HealthBarDefinition_archive") + static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -742550425 ) - @Export("scene") - static Scene scene; + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("la") + @ObfuscatedGetter( + intValue = -1578828459 + ) + @Export("menuWidth") + static int menuWidth; DevicePcmPlayerProvider() { - } // L: 7 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lbq;", - garbageValue = "2087332852" + descriptor = "(I)Ly;", + garbageValue = "1627596097" ) @Export("player") public PcmPlayer player() { - return new DevicePcmPlayer(); // L: 10 + return new DevicePcmPlayer(); } - @ObfuscatedName("r") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)Lbk;", - garbageValue = "-11" + descriptor = "(CB)C", + garbageValue = "57" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; // L: 237 - return Client.getNextWorldListWorld(); // L: 238 + static char method109(char var0) { + switch(var0) { + case ' ': + case '-': + case '_': + case ' ': + return '_'; + case '#': + case '[': + case ']': + return var0; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; + case 'Ç': + case 'ç': + return 'c'; + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; + case 'Ñ': + case 'ñ': + return 'n'; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; + case 'ß': + return 'b'; + case 'ÿ': + case 'Ÿ': + return 'y'; + default: + return Character.toLowerCase(var0); + } } - @ObfuscatedName("go") + @ObfuscatedName("gq") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-2111274300" + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "-120" ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4807 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4808 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4809 - int var3 = var2.x >> 7; // L: 4810 - int var4 = var2.y >> 7; // L: 4811 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4812 - if (var2.field1225 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4813 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4814 - continue; - } + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = WorldMapDecorationType.fontPlain12.lineWidth(var0, 250); + int var6 = WorldMapDecorationType.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var2 + var6, 16777215); + WorldMapDecorationType.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + int var7 = var3 - var2; + int var8 = var4 - var2; + int var9 = var5 + var2 + var2; + int var10 = var2 + var6 + var2; - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4815 - } - - long var5 = UserComparator3.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4817 - var2.playerCycle = Client.cycle; // L: 4818 - scene.drawEntity(SoundSystem.Client_plane, var2.x, var2.y, ItemContainer.getTileHeight(var2.field1225 * 64 - 64 + var2.x, var2.field1225 * 64 - 64 + var2.y, SoundSystem.Client_plane), var2.field1225 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4819 + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { + Client.field616[var11] = true; } } - } - } // L: 4823 - - @ObfuscatedName("ld") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "552902364" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 11616 - short[] var2 = new short[16]; // L: 11617 - int var3 = 0; // L: 11618 - - for (int var4 = 0; var4 < ItemComposition.ItemDefinition_fileCount; ++var4) { // L: 11619 - ItemComposition var9 = class250.ItemDefinition_get(var4); // L: 11620 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11621 11622 11623 - if (var3 >= 250) { // L: 11624 - ApproximateRouteStrategy.foundItemIdCount = -1; // L: 11625 - ClanChannel.foundItemIds = null; // L: 11626 - return; // L: 11627 - } - - if (var3 >= var2.length) { // L: 11629 - short[] var6 = new short[var2.length * 2]; // L: 11630 - - for (int var7 = 0; var7 < var3; ++var7) { // L: 11631 - var6[var7] = var2[var7]; - } - - var2 = var6; // L: 11632 - } - - var2[var3++] = (short)var4; // L: 11634 + if (var1) { + class263.rasterProvider.drawFull(0, 0); + } else { + NPCComposition.method2830(var3, var4, var5, var6); } + } - - ClanChannel.foundItemIds = var2; // L: 11636 - PcmPlayer.foundItemIndex = 0; // L: 11637 - ApproximateRouteStrategy.foundItemIdCount = var3; // L: 11638 - String[] var8 = new String[ApproximateRouteStrategy.foundItemIdCount]; // L: 11639 - - for (int var5 = 0; var5 < ApproximateRouteStrategy.foundItemIdCount; ++var5) { // L: 11640 - var8[var5] = class250.ItemDefinition_get(var2[var5]).name; - } - - short[] var10 = ClanChannel.foundItemIds; // L: 11641 - class281.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11643 - } // L: 11645 + } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index cbae170152..35ebc8cbff 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,54 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("is") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lb;" - ) - static ClanSettings field3128; - @ObfuscatedName("f") + @ObfuscatedName("e") + @Export("cacheSubPaths") + static String[] cacheSubPaths; + @ObfuscatedName("s") @Export("directBuffer") ByteBuffer directBuffer; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "895258324" + descriptor = "(B)[B", + garbageValue = "124" ) @Export("get") byte[] get() { - byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 - this.directBuffer.position(0); // L: 14 - this.directBuffer.get(var1); // L: 15 - return var1; // L: 16 + byte[] var1 = new byte[this.directBuffer.capacity()]; + this.directBuffer.position(0); + this.directBuffer.get(var1); + return var1; } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "894306984" + garbageValue = "138258898" ) @Export("set") public void set(byte[] var1) { - this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20 - this.directBuffer.position(0); // L: 21 - this.directBuffer.put(var1); // L: 22 - } // L: 23 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-1" - ) - static final void method4955(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; // L: 121 - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your ignore list first").toString(); - UserComparator10.addGameMessage(30, "", var1); // L: 123 - } // L: 125 + this.directBuffer = ByteBuffer.allocateDirect(var1.length); + this.directBuffer.position(0); + this.directBuffer.put(var1); + } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index cec721d9f0..6015f1d829 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,27 +2,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hv") +@ObfuscatedName("hz") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("obj") Object obj; DirectWrapper(Object var1, int var2) { - super(var2); // L: 7 - this.obj = var1; // L: 8 - } // L: 9 + super(var2); + this.obj = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("get") Object get() { - return this.obj; // L: 12 + return this.obj; } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("isSoft") boolean isSoft() { - return false; // L: 16 + return false; } } diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 40e2e9fdff..f65d4f8a85 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,33 +3,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") +@ObfuscatedName("mw") @Implements("DualNode") public class DualNode extends Node { @ObfuscatedName("cy") @Export("keyDual") public long keyDual; - @ObfuscatedName("ci") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cs") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("ce") + @ObfuscatedName("cr") @Export("removeDual") public void removeDual() { - if (this.nextDual != null) { // L: 9 - this.nextDual.previousDual = this.previousDual; // L: 10 - this.previousDual.nextDual = this.nextDual; // L: 11 - this.previousDual = null; // L: 12 - this.nextDual = null; // L: 13 + if (this.nextDual != null) { + this.nextDual.previousDual = this.previousDual; + this.previousDual.nextDual = this.nextDual; + this.previousDual = null; + this.nextDual = null; } - } // L: 14 + } } diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index e7c7e246bd..8877199f55 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,61 +3,61 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("ks") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("sentinel") DualNode sentinel; public DualNodeDeque() { - this.sentinel = new DualNode(); // L: 6 - this.sentinel.previousDual = this.sentinel; // L: 9 - this.sentinel.nextDual = this.sentinel; // L: 10 - } // L: 11 + this.sentinel = new DualNode(); + this.sentinel.previousDual = this.sentinel; + this.sentinel.nextDual = this.sentinel; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lmm;)V" + descriptor = "(Lmw;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { - if (var1.nextDual != null) { // L: 14 + if (var1.nextDual != null) { var1.removeDual(); } - var1.nextDual = this.sentinel.nextDual; // L: 15 - var1.previousDual = this.sentinel; // L: 16 - var1.nextDual.previousDual = var1; // L: 17 - var1.previousDual.nextDual = var1; // L: 18 - } // L: 19 + var1.nextDual = this.sentinel.nextDual; + var1.previousDual = this.sentinel; + var1.nextDual.previousDual = var1; + var1.previousDual.nextDual = var1; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lmm;)V" + descriptor = "(Lmw;)V" ) @Export("addLast") public void addLast(DualNode var1) { - if (var1.nextDual != null) { // L: 22 + if (var1.nextDual != null) { var1.removeDual(); } - var1.nextDual = this.sentinel; // L: 23 - var1.previousDual = this.sentinel.previousDual; // L: 24 - var1.nextDual.previousDual = var1; // L: 25 - var1.previousDual.nextDual = var1; // L: 26 - } // L: 27 + var1.nextDual = this.sentinel; + var1.previousDual = this.sentinel.previousDual; + var1.nextDual.previousDual = var1; + var1.previousDual.nextDual = var1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Lmm;" + descriptor = "()Lmw;" ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; // L: 30 - return var1 == this.sentinel ? null : var1; // L: 31 32 + DualNode var1 = this.sentinel.previousDual; + return var1 == this.sentinel ? null : var1; } } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index e98ca8db31..5b759a8f57 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -1,245 +1,169 @@ -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("cb") +@ObfuscatedName("bg") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("dk") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -560532763 + intValue = 1118110485 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1091706599 + intValue = 1905429005 ) @Export("type") int type; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 973044997 + intValue = -1513156089 ) @Export("orientation") int orientation; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 950758231 + intValue = -548694859 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1091816693 + intValue = -2044490333 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1250349999 + intValue = -220951267 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfz;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 238064293 + intValue = -116239835 ) @Export("frame") int frame; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1153448059 + intValue = -763316459 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLgr;)V" + descriptor = "(IIIIIIIZLgy;)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 - this.type = var2; // L: 21 - this.orientation = var3; // L: 22 - this.plane = var4; // L: 23 - this.x = var5; // L: 24 - this.y = var6; // L: 25 - if (var7 != -1) { // L: 26 - this.sequenceDefinition = WorldMapScaleHandler.SequenceDefinition_get(var7); // L: 27 + this.id = var1; + this.type = var2; + this.orientation = var3; + this.plane = var4; + this.x = var5; + this.y = var6; + if (var7 != -1) { + this.sequenceDefinition = World.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field1894 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 - DynamicObject var10 = (DynamicObject)var9; // L: 31 - if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 - this.frame = var10.frame; // L: 33 - this.cycleStart = var10.cycleStart; // L: 34 - return; // L: 35 + if (this.sequenceDefinition.field1875 == 0 && var9 != null && var9 instanceof DynamicObject) { + DynamicObject var10 = (DynamicObject)var9; + if (var10.sequenceDefinition == this.sequenceDefinition) { + this.frame = var10.frame; + this.cycleStart = var10.cycleStart; + return; } } - if (var8 && this.sequenceDefinition.frameCount != -1) { // L: 38 - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 39 - this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 40 + if (var8 && this.sequenceDefinition.frameCount != -1) { + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); + this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); } } - } // L: 43 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lgd;", - garbageValue = "326918784" + descriptor = "(I)Lgl;", + garbageValue = "1291603774" ) @Export("getModel") protected final Model getModel() { - if (this.sequenceDefinition != null) { // L: 46 - int var1 = Client.cycle - this.cycleStart; // L: 47 - if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { // L: 48 + if (this.sequenceDefinition != null) { + int var1 = Client.cycle - this.cycleStart; + if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { var1 = 100; } - label56: { + label55: { do { do { - if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 49 - break label56; + if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { + break label55; } - var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50 - ++this.frame; // L: 51 - } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 52 + var1 -= this.sequenceDefinition.frameLengths[this.frame]; + ++this.frame; + } while(this.frame < this.sequenceDefinition.frameIds.length); - this.frame -= this.sequenceDefinition.frameCount; // L: 53 - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 54 + this.frame -= this.sequenceDefinition.frameCount; + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); - this.sequenceDefinition = null; // L: 55 + this.sequenceDefinition = null; } - this.cycleStart = Client.cycle - var1; // L: 60 + this.cycleStart = Client.cycle - var1; } - ObjectComposition var12 = Tiles.getObjectDefinition(this.id); // L: 62 - if (var12.transforms != null) { // L: 63 + ObjectComposition var12 = ClanChannel.getObjectDefinition(this.id); + if (var12.transforms != null) { var12 = var12.transform(); } - if (var12 == null) { // L: 64 + if (var12 == null) { return null; } else { int var2; int var3; - if (this.orientation != 1 && this.orientation != 3) { // L: 67 - var2 = var12.sizeX; // L: 72 - var3 = var12.sizeY; // L: 73 + if (this.orientation != 1 && this.orientation != 3) { + var2 = var12.sizeX; + var3 = var12.sizeY; } else { - var2 = var12.sizeY; // L: 68 - var3 = var12.sizeX; // L: 69 + var2 = var12.sizeY; + var3 = var12.sizeX; } - int var4 = (var2 >> 1) + this.x; // L: 75 - int var5 = (var2 + 1 >> 1) + this.x; // L: 76 - int var6 = (var3 >> 1) + this.y; // L: 77 - int var7 = (var3 + 1 >> 1) + this.y; // L: 78 - int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 79 - int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; // L: 80 - int var10 = (this.x << 7) + (var2 << 6); // L: 81 - int var11 = (this.y << 7) + (var3 << 6); // L: 82 - return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83 + int var4 = (var2 >> 1) + this.x; + int var5 = (var2 + 1 >> 1) + this.x; + int var6 = (var3 >> 1) + this.y; + int var7 = (var3 + 1 >> 1) + this.y; + int[][] var8 = Tiles.Tiles_heights[this.plane]; + int var9 = var8[var5][var6] + var8[var4][var6] + var8[var4][var7] + var8[var5][var7] >> 2; + int var10 = (this.x << 7) + (var2 << 6); + int var11 = (this.y << 7) + (var3 << 6); + return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-593608457" + descriptor = "(I)V", + garbageValue = "-1405315336" ) - public static boolean method2103() { - ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 28 - return var0 != null; // L: 29 + public static void method1727() { + class234.midiPcmStream.clear(); + class234.musicPlayerStatus = 1; + class234.musicTrackArchive = null; } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(CS)Z", - garbageValue = "17436" - ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 166 - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1180457180" - ) - static final void method2099(boolean var0) { - class233.playPcmPlayers(); // L: 5702 - ++Client.packetWriter.pendingWrites; // L: 5703 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5704 - Client.packetWriter.pendingWrites = 0; // L: 5705 - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5706 - PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); // L: 5708 - Client.packetWriter.addNode(var1); // L: 5709 - - try { - Client.packetWriter.flush(); // L: 5711 - } catch (IOException var3) { // L: 5713 - Client.hadNetworkError = true; // L: 5714 - } - } - - } - } // L: 5717 - - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "([Liv;IIIZI)V", - garbageValue = "466452320" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9951 - Widget var6 = var0[var5]; // L: 9952 - if (var6 != null && var6.parentId == var1) { // L: 9953 9954 - FontName.alignWidgetSize(var6, var2, var3, var4); // L: 9955 - class43.alignWidgetPosition(var6, var2, var3); // L: 9956 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9957 - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { // L: 9958 - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9959 - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { // L: 9960 - var6.scrollY = 0; - } - - if (var6.type == 0) { // L: 9961 - WorldMapLabelSize.revalidateWidgetScroll(var0, var6, var4); - } - } - } - - } // L: 9963 } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 2806bda344..c5871f0ce0 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -1,122 +1,118 @@ -import java.net.MalformedURLException; -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("ep") +@ObfuscatedName("eq") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("e") + public static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 422415445 - ) - static int field1629; + @ObfuscatedName("r") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; @ObfuscatedName("v") @Export("inputType") public char inputType; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("outputType") public char outputType; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -883966701 + intValue = -2085329693 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 691082953 + intValue = 1996066199 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("keys") public int[] keys; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("intVals") public int[] intVals; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("strVals") public String[] strVals; static { - EnumDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 + EnumDefinition_cached = new EvictingDualNodeHashTable(64); } EnumComposition() { - this.defaultStr = "null"; // L: 15 - this.outputCount = 0; // L: 17 - } // L: 22 + this.defaultStr = "null"; + this.outputCount = 0; + } - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1541381103" + descriptor = "(Lnv;B)V", + garbageValue = "96" ) @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(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 42 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "1108617782" + descriptor = "(Lnv;II)V", + garbageValue = "-681077341" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 47 + if (var2 == 1) { this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { // L: 48 + } else if (var2 == 2) { this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 49 + } else if (var2 == 3) { this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 50 + } else if (var2 == 4) { 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) { + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.strVals = new String[this.outputCount]; - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55 - this.keys[var3] = var1.readInt(); // L: 56 - this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57 - } - } else if (var2 == 6) { // L: 60 - this.outputCount = var1.readUnsignedShort(); // L: 61 - this.keys = new int[this.outputCount]; // L: 62 - this.intVals = new int[this.outputCount]; // L: 63 - - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64 + for (var3 = 0; var3 < this.outputCount; ++var3) { this.keys[var3] = var1.readInt(); - this.intVals[var3] = var1.readInt(); // L: 66 + this.strVals[var3] = var1.readStringCp1252NullTerminated(); + } + } else if (var2 == 6) { + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.intVals = new int[this.outputCount]; + + for (var3 = 0; var3 < this.outputCount; ++var3) { + this.keys[var3] = var1.readInt(); + this.intVals[var3] = var1.readInt(); } } } @@ -126,47 +122,10 @@ public class EnumComposition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1940899899" + garbageValue = "2004820017" ) @Export("size") public int size() { - return this.outputCount; // L: 73 + return this.outputCount; } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-1376417697" - ) - static boolean method2831(String var0) { - if (var0 == null) { // L: 65 - return false; - } else { - try { - new URL(var0); - return true; // L: 72 - } catch (MalformedURLException var2) { // L: 69 - return false; // L: 70 - } - } - } - - @ObfuscatedName("lx") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "49" - ) - static void method2827() { - if (LoginPacket.field2800 != null) { // L: 11702 - Client.field798 = Client.cycle; // L: 11703 - LoginPacket.field2800.method5246(); // L: 11704 - - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11705 - if (Client.players[var0] != null) { // L: 11706 - LoginPacket.field2800.method5245((Client.players[var0].x >> 7) + class15.baseX, (Client.players[var0].y >> 7) + WorldMapSprite.baseY); // L: 11707 - } - } - } - - } // L: 11711 } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index cb7e099154..eccc6a39a4 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kf") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index d7d14860ee..3d626331d2 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,101 +3,101 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hw") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) - DualNode field2567; - @ObfuscatedName("e") + DualNode field2559; + @ObfuscatedName("t") @Export("capacity") int capacity; @ObfuscatedName("v") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkc;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field2567 = new DualNode(); // L: 8 - this.deque = new IterableDualNodeQueue(); // L: 12 - this.capacity = var1; // L: 15 - this.remainingCapacity = var1; // L: 16 + this.field2559 = new DualNode(); + this.deque = new IterableDualNodeQueue(); + this.capacity = var1; + this.remainingCapacity = var1; int var2; - for (var2 = 1; var2 + var2 < var1; var2 += var2) { // L: 17 18 + for (var2 = 1; var2 + var2 < var1; var2 += var2) { } - this.hashTable = new IterableNodeHashTable(var2); // L: 19 - } // L: 20 + this.hashTable = new IterableNodeHashTable(var2); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(J)Lmm;" + descriptor = "(J)Lmw;" ) @Export("get") public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23 - if (var3 != null) { // L: 24 - this.deque.add(var3); // L: 25 + DualNode var3 = (DualNode)this.hashTable.get(var1); + if (var3 != null) { + this.deque.add(var3); } - return var3; // L: 28 + return var3; } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("remove") public void remove(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 - if (var3 != null) { // L: 33 - var3.remove(); // L: 34 - var3.removeDual(); // L: 35 - ++this.remainingCapacity; // L: 36 + DualNode var3 = (DualNode)this.hashTable.get(var1); + if (var3 != null) { + var3.remove(); + var3.removeDual(); + ++this.remainingCapacity; } - } // L: 38 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmm;J)V" + descriptor = "(Lmw;J)V" ) @Export("put") public void put(DualNode var1, long var2) { - if (this.remainingCapacity == 0) { // L: 41 - DualNode var4 = this.deque.removeLast(); // L: 42 - var4.remove(); // L: 43 - var4.removeDual(); // L: 44 - if (var4 == this.field2567) { // L: 45 - var4 = this.deque.removeLast(); // L: 46 - var4.remove(); // L: 47 - var4.removeDual(); // L: 48 + if (this.remainingCapacity == 0) { + DualNode var4 = this.deque.removeLast(); + var4.remove(); + var4.removeDual(); + if (var4 == this.field2559) { + var4 = this.deque.removeLast(); + var4.remove(); + var4.removeDual(); } } else { - --this.remainingCapacity; // L: 51 + --this.remainingCapacity; } - this.hashTable.put(var1, var2); // L: 52 - this.deque.add(var1); // L: 53 - } // L: 54 + this.hashTable.put(var1, var2); + this.deque.add(var1); + } - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("clear") public void clear() { - this.deque.clear(); // L: 57 - this.hashTable.clear(); // L: 58 - this.field2567 = new DualNode(); // L: 59 - this.remainingCapacity = this.capacity; // L: 60 - } // L: 61 + this.deque.clear(); + this.hashTable.clear(); + this.field2559 = new DualNode(); + this.remainingCapacity = this.capacity; + } } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index e01245d437..d1aec04eaa 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -1,109 +1,72 @@ -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("gy") +@ObfuscatedName("gf") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1056687123 + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lja;" ) - @Export("pcmSampleLength") - static int pcmSampleLength; - @ObfuscatedName("f") + static GameBuild field2349; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1204882397 + intValue = -1621904451 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 126335521 + intValue = 1108401493 ) @Export("y") int y; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -301502337 + intValue = -78767847 ) @Export("z") int z; FaceNormal() { - } // L: 8 + } - @ObfuscatedName("f") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "-1897650462" + descriptor = "([Lio;IIIZI)V", + garbageValue = "-1098219782" ) - public static void method4252(AbstractArchive var0) { - GrandExchangeOfferUnitPriceComparator.FloorOverlayDefinition_archive = var0; // L: 26 - } // L: 27 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "67" - ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (World.World_request == null) { // L: 31 - World.World_request = ArchiveDiskActionHandler.urlRequester.request(new URL(class162.field1936)); - } else if (World.World_request.isDone()) { // L: 33 - byte[] var0 = World.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]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 47 - var3 = World.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); // L: 42 - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + GrandExchangeOfferUnitPriceComparator.alignWidgetSize(var6, var2, var3, var4); + SoundCache.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; } - FileSystem.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - World.World_request = null; // L: 50 - return true; // L: 51 + if (var6.scrollX < 0) { + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { + var6.scrollY = 0; + } + + if (var6.type == 0) { + AttackOption.revalidateWidgetScroll(var0, var6, var4); + } } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - World.World_request = null; // L: 57 } - return false; // L: 59 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "1748496485" - ) - public static int method4253(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 38 - int var6 = var3; // L: 39 - var3 = var4; // L: 40 - var4 = var6; // L: 41 - } - - var2 &= 3; // L: 43 - if (var2 == 0) { // L: 44 - return var1; - } else if (var2 == 1) { // L: 45 - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 46 - } } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 60bafdd842..acfdb3f0c7 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -1,174 +1,126 @@ import java.io.File; import java.util.Hashtable; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("ef") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; @ObfuscatedName("v") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "[Lof;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -321551563 + ) + static int field1484; static { - FileSystem_hasPermissions = false; // L: 7 + FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); - } // L: 9 - - @ObfuscatedName("f") - static boolean method2644(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); // L: 46 - return var2 == 2; // L: 48 } - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Lbk;II[I[IB)V", - garbageValue = "-67" + descriptor = "(Ljy;III)[Lof;", + garbageValue = "-2007880048" ) - @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 + public static IndexedSprite[] method2628(AbstractArchive var0, int var1, int var2) { + if (!class290.method5208(var0, var1, var2)) { + return null; + } else { + IndexedSprite[] var4 = new IndexedSprite[class398.SpriteBuffer_spriteCount]; - while (var5 < var6) { // L: 88 - boolean var9 = true; // L: 89 - - int var10; - int var11; - int var12; - do { - --var6; // L: 91 - - for (var10 = 0; var10 < 4; ++var10) { // L: 92 - if (var3[var10] == 2) { // L: 95 - var11 = var0[var6].index; // L: 96 - var12 = var8.index; // L: 97 - } else if (var3[var10] == 1) { // L: 99 - var11 = var0[var6].population; // L: 100 - var12 = var8.population; // L: 101 - if (var11 == -1 && var4[var10] == 1) { // L: 102 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 103 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 105 - var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 - } else { - var11 = var0[var6].id; // L: 110 - var12 = var8.id; // L: 111 - } - - if (var11 != var12) { // L: 113 - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 - var9 = false; // L: 119 - } - break; - } - - if (var10 == 3) { // L: 114 - var9 = false; - } - } - } while(var9); - - var9 = true; // L: 124 - - do { - ++var5; // L: 126 - - for (var10 = 0; var10 < 4; ++var10) { // L: 127 - if (var3[var10] == 2) { // L: 130 - var11 = var0[var5].index; // L: 131 - var12 = var8.index; // L: 132 - } else if (var3[var10] == 1) { // L: 134 - var11 = var0[var5].population; // L: 135 - var12 = var8.population; // L: 136 - if (var11 == -1 && var4[var10] == 1) { // L: 137 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 138 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 140 - var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 - } else { - var11 = var0[var5].id; // L: 145 - var12 = var8.id; // L: 146 - } - - if (var12 != var11) { // L: 148 - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 - var9 = false; // L: 154 - } - break; - } - - if (var10 == 3) { // L: 149 - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { // L: 159 - World var13 = var0[var5]; // L: 160 - var0[var5] = var0[var6]; // L: 161 - var0[var6] = var13; // L: 162 - } + for (int var5 = 0; var5 < class398.SpriteBuffer_spriteCount; ++var5) { + IndexedSprite var6 = var4[var5] = new IndexedSprite(); + var6.width = class398.SpriteBuffer_spriteWidth; + var6.height = class398.SpriteBuffer_spriteHeight; + var6.xOffset = class398.SpriteBuffer_xOffsets[var5]; + var6.yOffset = class398.SpriteBuffer_yOffsets[var5]; + var6.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[var5]; + var6.subHeight = class374.SpriteBuffer_spriteHeights[var5]; + var6.palette = class118.SpriteBuffer_spritePalette; + var6.pixels = class398.SpriteBuffer_pixels[var5]; } - sortWorlds(var0, var1, var6, var3, var4); // L: 165 - sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + class398.SpriteBuffer_xOffsets = null; + class398.SpriteBuffer_yOffsets = null; + ClanChannelMember.SpriteBuffer_spriteWidths = null; + class374.SpriteBuffer_spriteHeights = null; + class118.SpriteBuffer_spritePalette = null; + class398.SpriteBuffer_pixels = null; + return var4; } + } - } // L: 168 - - @ObfuscatedName("m") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1418977900" + descriptor = "(ILbd;ZI)I", + garbageValue = "954710146" ) - static void method2647() { - 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("d") - @ObfuscatedSignature( - descriptor = "(Liv;IIIB)V", - garbageValue = "75" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3037 == null) { // L: 998 - throw new RuntimeException(); // L: 999 + static int method2621(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { + if (var0 != 7031 && var0 != 7032) { + if (var0 == 7033) { + --class1.Interpreter_stringStackSize; + return 1; + } else if (var0 != 7036 && var0 != 7037) { + if (var0 == 7038) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { + return 2; + } else { + --Interpreter.Interpreter_intStackSize; + return 1; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } + } else { + --class1.Interpreter_stringStackSize; + --Interpreter.Interpreter_intStackSize; + return 1; + } + } else { + --Interpreter.Interpreter_intStackSize; + return 1; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } + } else { + Interpreter.Interpreter_intStackSize -= 3; + return 1; + } } else { - var0.field3037[var1] = var2; // L: 1001 - var0.field3038[var1] = var3; // L: 1002 + Interpreter.Interpreter_intStackSize -= 5; + return 1; } - } // L: 1003 + } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index fd1ef5c1b8..af3f0e2ca1 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -1,58 +1,53 @@ -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.mapping.*; -@ObfuscatedName("oj") +@ObfuscatedName("ou") @Implements("FillMode") -public enum FillMode implements Enumerated -{ - @ObfuscatedName("f") +public enum FillMode implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lou;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lou;" ) - field4241(1, 1), + field4255(1, 1), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lou;" ) - field4239(2, 2); + field4256(2, 2); - @ObfuscatedName("m") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2014293349 + intValue = -839032429 ) - static int field4244; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1583860177 - ) - public final int field4242; + static int field4259; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -76883829 + intValue = 698833695 ) - final int field4243; + public final int field4257; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1768437689 + ) + final int field4258; FillMode(int var3, int var4) { - this.field4242 = var3; // L: 19 - this.field4243 = var4; // L: 20 - } // L: 21 + this.field4257 = var3; + this.field4258 = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4243; // L: 24 + return this.field4258; } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 09e82e85d6..0f3dfe9543 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,52 +4,142 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gn") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("gx") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1077391881 + intValue = -1065761401 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1797231219 + intValue = -612034411 ) @Export("x") int x; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1767125369 + intValue = -768005843 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -640480651195446405L + longValue = -8544200535771831587L ) @Export("tag") public long tag; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1116841185 + intValue = -871159579 ) @Export("flags") int flags; FloorDecoration() { - } // L: 11 + } + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1217280037" + ) + static final void method3877() { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { + int var10002 = Client.queuedSoundEffectDelays[var0]--; + if (Client.queuedSoundEffectDelays[var0] >= -10) { + SoundEffect var1 = Client.soundEffects[var0]; + if (var1 == null) { + Object var10000 = null; + var1 = SoundEffect.readSoundEffect(InvDefinition.archive4, Client.soundEffectIds[var0], 0); + if (var1 == null) { + continue; + } + + int[] var13 = Client.queuedSoundEffectDelays; + var13[var0] += var1.calculateDelay(); + Client.soundEffects[var0] = var1; + } + + if (Client.queuedSoundEffectDelays[var0] < 0) { + int var2; + if (Client.soundLocations[var0] != 0) { + int var3 = (Client.soundLocations[var0] & 255) * 128; + int var4 = Client.soundLocations[var0] >> 16 & 255; + int var5 = var4 * 128 + 64 - MouseHandler.localPlayer.x; + if (var5 < 0) { + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; + int var7 = var6 * 128 + 64 - MouseHandler.localPlayer.y; + if (var7 < 0) { + var7 = -var7; + } + + int var8 = var7 + var5 - 128; + if (var8 > var3) { + Client.queuedSoundEffectDelays[var0] = -100; + continue; + } + + if (var8 < 0) { + var8 = 0; + } + + var2 = (var3 - var8) * Decimator.clientPreferences.areaSoundEffectsVolume / var3; + } else { + var2 = Decimator.clientPreferences.soundEffectsVolume; + } + + if (var2 > 0) { + RawSound var9 = var1.toRawSound().resample(FloorOverlayDefinition.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); + var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + TileItem.pcmStreamMixer.addSubStream(var10); + } + + Client.queuedSoundEffectDelays[var0] = -100; + } + } else { + --Client.soundEffectCount; + + for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { + Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; + Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; + Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; + Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; + Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; + } + + --var0; + } + } + + if (Client.field647) { + boolean var12; + if (class234.musicPlayerStatus != 0) { + var12 = true; + } else { + var12 = class234.midiPcmStream.isReady(); + } + + if (!var12) { + if (Decimator.clientPreferences.musicVolume != 0 && Client.currentTrackGroupId != -1) { + Players.method2022(class108.archive6, Client.currentTrackGroupId, 0, Decimator.clientPreferences.musicVolume, false); + } + + Client.field647 = false; + } + } + + } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index b7fff80a56..1ba8d191aa 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,333 +4,233 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fw") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("e") + @ObfuscatedName("rb") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lao;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("FloorOverlayDefinition_archive") + public static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhw;" ) @Export("FloorOverlayDefinition_cached") - static EvictingDualNodeHashTable FloorOverlayDefinition_cached; + public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -296019843 + intValue = 667316801 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1822468251 + intValue = 1063696887 ) @Export("texture") public int texture; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1818252281 + intValue = -2020856341 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 237098067 + intValue = -707439719 ) @Export("hue") public int hue; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1367639577 + intValue = -605382025 ) @Export("saturation") public int saturation; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1127074157 + intValue = 1441861703 ) @Export("lightness") public int lightness; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1492871957 + intValue = 450257925 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 422172471 + intValue = 377708913 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 724805775 + intValue = 1102913933 ) @Export("secondaryLightness") public int secondaryLightness; static { - FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); } - FloorOverlayDefinition() { - this.primaryRgb = 0; // L: 12 - this.texture = -1; // L: 13 - this.hideUnderlay = true; // L: 14 - this.secondaryRgb = -1; // L: 15 - } // L: 23 + public FloorOverlayDefinition() { + this.primaryRgb = 0; + this.texture = -1; + this.hideUnderlay = true; + this.secondaryRgb = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1241018196" + ) + @Export("postDecode") + public void postDecode() { + if (this.secondaryRgb != -1) { + this.setHsl(this.secondaryRgb); + this.secondaryHue = this.hue; + this.secondarySaturation = this.saturation; + this.secondaryLightness = this.lightness; + } + + this.setHsl(this.primaryRgb); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lnv;IB)V", + garbageValue = "81" + ) + @Export("decode") + public void decode(Buffer var1, int var2) { + while (true) { + int var3 = var1.readUnsignedByte(); + if (var3 == 0) { + return; + } + + this.decodeNext(var1, var3, var2); + } + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1526666702" + descriptor = "(Lnv;III)V", + garbageValue = "1340333905" ) - @Export("postDecode") - void postDecode() { - if (this.secondaryRgb != -1) { // L: 41 - this.setHsl(this.secondaryRgb); // L: 42 - this.secondaryHue = this.hue; // L: 43 - this.secondarySaturation = this.saturation; // L: 44 - this.secondaryLightness = this.lightness; // L: 45 + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { + if (var2 == 1) { + this.primaryRgb = var1.readMedium(); + } else if (var2 == 2) { + this.texture = var1.readUnsignedByte(); + } else if (var2 == 5) { + this.hideUnderlay = false; + } else if (var2 == 7) { + this.secondaryRgb = var1.readMedium(); + } else if (var2 == 8) { } - this.setHsl(this.primaryRgb); // L: 47 - } // L: 48 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "6" - ) - @Export("decode") - void decode(Buffer var1, int var2) { - while (true) { - int var3 = var1.readUnsignedByte(); // L: 52 - if (var3 == 0) { // L: 53 - return; // L: 56 - } - - this.decodeNext(var1, var3, var2); // L: 54 - } } @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lnt;III)V", - garbageValue = "-608043176" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 59 - this.primaryRgb = var1.readMedium(); - } else if (var2 == 2) { // L: 60 - this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { // L: 61 - this.hideUnderlay = false; - } else if (var2 == 7) { // L: 62 - this.secondaryRgb = var1.readMedium(); - } else if (var2 == 8) { // L: 63 - } - - } // L: 65 - - @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2117241812" + garbageValue = "-1484541968" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 68 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 69 - double var6 = (double)(var1 & 255) / 256.0D; // L: 70 - double var8 = var2; // L: 71 - if (var4 < var2) { // L: 72 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; + double var4 = (double)(var1 >> 8 & 255) / 256.0D; + double var6 = (double)(var1 & 255) / 256.0D; + double var8 = var2; + if (var4 < var2) { var8 = var4; } - if (var6 < var8) { // L: 73 + if (var6 < var8) { var8 = var6; } - double var10 = var2; // L: 74 - if (var4 > var2) { // L: 75 + double var10 = var2; + if (var4 > var2) { var10 = var4; } - if (var6 > var10) { // L: 76 + if (var6 > var10) { var10 = var6; } - double var12 = 0.0D; // L: 77 - double var14 = 0.0D; // L: 78 - double var16 = (var10 + var8) / 2.0D; // L: 79 - if (var10 != var8) { // L: 80 - if (var16 < 0.5D) { // L: 81 + double var12 = 0.0D; + double var14 = 0.0D; + double var16 = (var8 + var10) / 2.0D; + if (var8 != var10) { + if (var16 < 0.5D) { var14 = (var10 - var8) / (var10 + var8); } - if (var16 >= 0.5D) { // L: 82 + if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 83 + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { // L: 84 - var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var4 == var10) { + var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 85 + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } - var12 /= 6.0D; // L: 87 - this.hue = (int)(var12 * 256.0D); // L: 88 - this.saturation = (int)(var14 * 256.0D); // L: 89 - this.lightness = (int)(256.0D * var16); // L: 90 - if (this.saturation < 0) { // L: 91 + var12 /= 6.0D; + this.hue = (int)(256.0D * var12); + this.saturation = (int)(256.0D * var14); + this.lightness = (int)(256.0D * var16); + if (this.saturation < 0) { this.saturation = 0; - } else if (this.saturation > 255) { // L: 92 + } else if (this.saturation > 255) { this.saturation = 255; } - if (this.lightness < 0) { // L: 93 + if (this.lightness < 0) { this.lightness = 0; - } else if (this.lightness > 255) { // L: 94 + } else if (this.lightness > 255) { this.lightness = 255; } - } // L: 95 + } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1165486698" + descriptor = "(II)Loo;", + garbageValue = "-1435537454" ) - static final void method3168() { - Object var10000 = null; // L: 128 - String var0 = "You can't add yourself to your own friend list"; - UserComparator10.addGameMessage(30, "", var0); // L: 130 - } // L: 132 + public static PrivateChatMode method3134(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4297, PrivateChatMode.field4299, PrivateChatMode.field4298}; + PrivateChatMode[] var2 = var1; - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "(Liv;IIIB)V", - garbageValue = "-1" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class233.playPcmPlayers(); // L: 11313 - SpriteMask var4 = var0.getSpriteMask(false); // L: 11314 - if (var4 != null) { // L: 11315 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11316 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11317 - int var5 = Client.camAngleY & 2047; // L: 11318 - int var6 = class262.localPlayer.x / 32 + 48; // L: 11319 - int var7 = 464 - class262.localPlayer.y / 32; // L: 11320 - class69.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11321 - - int var8; - int var10; - int var16; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11322 - var16 = Client.mapIconXs[var8] * 4 + 2 - class262.localPlayer.x / 32; // L: 11323 - var10 = Client.mapIconYs[var8] * 4 + 2 - class262.localPlayer.y / 32; // L: 11324 - class32.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11325 - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 11327 - for (var16 = 0; var16 < 104; ++var16) { // L: 11328 - NodeDeque var14 = Client.groundItems[SoundSystem.Client_plane][var8][var16]; // L: 11329 - if (var14 != null) { // L: 11330 - var11 = var8 * 4 + 2 - class262.localPlayer.x / 32; // L: 11331 - var12 = var16 * 4 + 2 - class262.localPlayer.y / 32; // L: 11332 - class32.drawSpriteOnMinimap(var1, var2, var11, var12, class171.mapDotSprites[0], var4); // L: 11333 - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11337 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11338 - if (var9 != null && var9.isVisible()) { // L: 11339 - NPCComposition var18 = var9.definition; // L: 11340 - if (var18 != null && var18.transforms != null) { // L: 11341 - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11342 - var11 = var9.x / 32 - class262.localPlayer.x / 32; // L: 11343 - var12 = var9.y / 32 - class262.localPlayer.y / 32; // L: 11344 - class32.drawSpriteOnMinimap(var1, var2, var11, var12, class171.mapDotSprites[1], var4); // L: 11345 - } - } - } - - var8 = Players.Players_count; // L: 11349 - int[] var17 = Players.Players_indices; // L: 11350 - - for (var10 = 0; var10 < var8; ++var10) { // L: 11351 - Player var15 = Client.players[var17[var10]]; // L: 11352 - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class262.localPlayer) { // L: 11353 - var12 = var15.x / 32 - class262.localPlayer.x / 32; // L: 11354 - int var13 = var15.y / 32 - class262.localPlayer.y / 32; // L: 11355 - if (var15.isFriend()) { // L: 11356 - class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[3], var4); - } else if (class262.localPlayer.team != 0 && var15.team != 0 && var15.team == class262.localPlayer.team) { // L: 11357 - class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[4], var4); - } else if (var15.isFriendsChatMember()) { // L: 11358 - class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[5], var4); - } else if (var15.isClanMember()) { // L: 11359 - class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[6], var4); - } else { - class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[2], var4); // L: 11360 - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11363 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11364 - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11365 - if (var19 != null) { // L: 11366 - var11 = var19.x / 32 - class262.localPlayer.x / 32; // L: 11367 - var12 = var19.y / 32 - class262.localPlayer.y / 32; // L: 11368 - SoundSystem.worldToMinimap(var1, var2, var11, var12, BuddyRankComparator.mapMarkerSprites[1], var4); // L: 11369 - } - } - - if (Client.hintArrowType == 2) { // L: 11372 - var10 = Client.hintArrowX * 4 - class15.baseX * 4 + 2 - class262.localPlayer.x / 32; // L: 11373 - var11 = Client.hintArrowY * 4 - WorldMapSprite.baseY * 4 + 2 - class262.localPlayer.y / 32; // L: 11374 - SoundSystem.worldToMinimap(var1, var2, var10, var11, BuddyRankComparator.mapMarkerSprites[1], var4); // L: 11375 - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11377 - Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11378 - if (var20 != null) { // L: 11379 - var11 = var20.x / 32 - class262.localPlayer.x / 32; // L: 11380 - var12 = var20.y / 32 - class262.localPlayer.y / 32; // L: 11381 - SoundSystem.worldToMinimap(var1, var2, var11, var12, BuddyRankComparator.mapMarkerSprites[1], var4); // L: 11382 - } - } - } - - if (Client.destinationX != 0) { // L: 11386 - var10 = Client.destinationX * 4 + 2 - class262.localPlayer.x / 32; // L: 11387 - var11 = Client.destinationY * 4 + 2 - class262.localPlayer.y / 32; // L: 11388 - class32.drawSpriteOnMinimap(var1, var2, var10, var11, BuddyRankComparator.mapMarkerSprites[0], var4); // L: 11389 - } - - if (!class262.localPlayer.isHidden) { // L: 11391 - 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: 11393 + for (int var3 = 0; var3 < var2.length; ++var3) { + PrivateChatMode var4 = var2[var3]; + if (var0 == var4.field4300) { + return var4; } - - Client.field712[var3] = true; // L: 11394 } - } // L: 11395 + + return null; + } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index c40d087612..2fc7a865a9 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -1,84 +1,89 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("en") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("rn") - @ObfuscatedGetter( - intValue = 595568273 - ) - static int field1707; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -129692825 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "[Lom;" + ) + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -686096887 + intValue = -1396764945 ) @Export("rgb") int rgb; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1212090999 + intValue = 295094139 ) @Export("hue") public int hue; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1608121883 + intValue = -1733330249 ) @Export("saturation") public int saturation; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 23970979 + intValue = 190827683 ) @Export("lightness") public int lightness; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1605807937 + intValue = -370135901 ) @Export("hueMultiplier") public int hueMultiplier; static { - FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } public FloorUnderlayDefinition() { - this.rgb = 0; // L: 12 + this.rgb = 0; } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-921241910" + descriptor = "(S)V", + garbageValue = "16761" ) @Export("postDecode") public void postDecode() { - this.setHsl(this.rgb); // L: 19 - } // L: 20 + this.setHsl(this.rgb); + } - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-259716746" + descriptor = "(Lnv;II)V", + garbageValue = "187801207" ) @Export("decode") public void decode(Buffer var1, int var2) { @@ -92,10 +97,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnt;III)V", - garbageValue = "-1239829905" + descriptor = "(Lnv;III)V", + garbageValue = "645232357" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -105,18 +110,18 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1158343935" + garbageValue = "-1318527639" ) @Export("setHsl") void setHsl(int var1) { double var2 = (double)(var1 >> 16 & 255) / 256.0D; double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; // L: 38 - double var8 = var2; // L: 39 - if (var4 < var2) { // L: 40 + double var6 = (double)(var1 & 255) / 256.0D; + double var8 = var2; + if (var4 < var2) { var8 = var4; } @@ -129,111 +134,131 @@ public class FloorUnderlayDefinition extends DualNode { var10 = var4; } - if (var6 > var10) { // L: 44 + if (var6 > var10) { var10 = var6; } - double var12 = 0.0D; // L: 45 + double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; // L: 47 - if (var10 != var8) { - if (var16 < 0.5D) { // L: 49 + double var16 = (var8 + var10) / 2.0D; + if (var8 != var10) { + if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 50 + if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { // L: 51 + if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { // L: 52 + } else if (var4 == var10) { var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 53 + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } - 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; + 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: 59 + } else if (this.saturation > 255) { this.saturation = 255; } - if (this.lightness < 0) { // L: 60 + if (this.lightness < 0) { this.lightness = 0; - } else if (this.lightness > 255) { // L: 61 + } else if (this.lightness > 255) { this.lightness = 255; } - if (var16 > 0.5D) { // L: 62 - this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16)); + if (var16 > 0.5D) { + this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63 + this.hueMultiplier = (int)(var14 * var16 * 512.0D); } - if (this.hueMultiplier < 1) { // L: 64 + if (this.hueMultiplier < 1) { this.hueMultiplier = 1; } - this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 65 - } // L: 66 + this.hue = (int)(var12 * (double)this.hueMultiplier); + } - @ObfuscatedName("e") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "355010733" + descriptor = "(ZI)V", + garbageValue = "385703346" ) - @Export("getFile") - public 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; + public static void method2892(boolean var0) { + if (var0 != class144.ItemDefinition_inMembersWorld) { + VarbitComposition.method2898(); + class144.ItemDefinition_inMembersWorld = var0; + } + + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "544475904" + ) + static void method2884(int var0, int var1) { + int var2 = TaskHandler.fontBold12.stringWidth("Choose Option"); + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + Font var7 = TaskHandler.fontBold12; + String var8; + if (var3 < 0) { + var8 = ""; + } else if (Client.menuTargets[var3].length() > 0) { + var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25 - RandomAccessFile var3 = null; // L: 26 + var8 = Client.menuActions[var3]; + } - 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 - } + int var6 = var7.stringWidth(var8); + if (var6 > var2) { + var2 = var6; } } + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + int var4 = var0 - var2 / 2; + if (var2 + var4 > MouseRecorder.canvasWidth) { + var4 = MouseRecorder.canvasWidth - var2; + } + + if (var4 < 0) { + var4 = 0; + } + + int var5 = var1; + if (var3 + var1 > Client.canvasHeight) { + var5 = Client.canvasHeight - var3; + } + + if (var5 < 0) { + var5 = 0; + } + + SpotAnimationDefinition.menuX = var4; + DefaultsGroup.menuY = var5; + DevicePcmPlayerProvider.menuWidth = var2; + GraphicsObject.menuHeight = Client.menuOptionsCount * 15 + 22; } - @ObfuscatedName("h") + @ObfuscatedName("lz") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-19" + descriptor = "(Lio;B)Z", + garbageValue = "-40" ) - static final int method2924() { - return ViewportMouse.ViewportMouse_x; // L: 86 + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 09670e81d3..f9872cd835 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,98 +2,98 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kj") +@ObfuscatedName("kt") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { - super(var1, var2, var3, var4, var5, var6, var7); // L: 7 - } // L: 8 + super(var1, var2, var3, var4, var5, var6, var7); + } public Font(byte[] var1) { - super(var1); // L: 11 - } // L: 12 + super(var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @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 - int var8 = Rasterizer2D.Rasterizer2D_width - var4; // L: 16 - int var9 = 0; // L: 17 - int var10 = 0; // L: 18 + int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; + int var8 = Rasterizer2D.Rasterizer2D_width - var4; + int var9 = 0; + int var10 = 0; int var11; - if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 19 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3; // L: 20 - var5 -= var11; // L: 21 - var3 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 22 - var10 += var11 * var4; // L: 23 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 24 + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3; + var5 -= var11; + var3 = Rasterizer2D.Rasterizer2D_yClipStart; + var10 += var11 * var4; + var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 26 + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 27 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2; // L: 28 - var4 -= var11; // L: 29 - var2 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 30 - var10 += var11; // L: 31 - var7 += var11; // L: 32 - var9 += var11; // L: 33 - var8 += var11; // L: 34 + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2; + var4 -= var11; + var2 = Rasterizer2D.Rasterizer2D_xClipStart; + var10 += var11; + var7 += var11; + var9 += var11; + var8 += var11; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 36 - var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 37 - var4 -= var11; // L: 38 - var9 += var11; // L: 39 - var8 += var11; // L: 40 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; + var4 -= var11; + var9 += var11; + var8 += var11; } - if (var4 > 0 && var5 > 0) { // L: 42 - AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); // L: 43 + if (var4 > 0 && var5 > 0) { + AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); } - } // L: 44 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @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 - int var9 = Rasterizer2D.Rasterizer2D_width - var4; // L: 48 - int var10 = 0; // L: 49 - int var11 = 0; // L: 50 + int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; + int var9 = Rasterizer2D.Rasterizer2D_width - var4; + int var10 = 0; + int var11 = 0; int var12; - if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 51 - var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3; // L: 52 - var5 -= var12; // L: 53 - var3 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 54 - var11 += var12 * var4; // L: 55 - var8 += var12 * Rasterizer2D.Rasterizer2D_width; // L: 56 + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { + var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3; + var5 -= var12; + var3 = Rasterizer2D.Rasterizer2D_yClipStart; + var11 += var12 * var4; + var8 += var12 * Rasterizer2D.Rasterizer2D_width; } - if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 58 + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 59 - var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2; // L: 60 - var4 -= var12; // L: 61 - var2 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 62 - var11 += var12; // L: 63 - var8 += var12; // L: 64 - var10 += var12; // L: 65 - var9 += var12; // L: 66 + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { + var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2; + var4 -= var12; + var2 = Rasterizer2D.Rasterizer2D_xClipStart; + var11 += var12; + var8 += var12; + var10 += var12; + var9 += var12; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 68 - var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 69 - var4 -= var12; // L: 70 - var10 += var12; // L: 71 - var9 += var12; // L: 72 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; + var4 -= var12; + var10 += var12; + var9 += var12; } - if (var4 > 0 && var5 > 0) { // L: 74 - AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); // L: 75 + if (var4 > 0 && var5 > 0) { + AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); } - } // L: 76 + } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 6c293ac989..9ba44ea8f3 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -2,355 +2,249 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("mb") +@ObfuscatedName("mk") @Implements("FontName") public class FontName { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lba;" - ) - @Export("pcmPlayerProvider") - static PlayerProvider pcmPlayerProvider; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("name") String name; static { - FontName_plain11 = new FontName("p11_full"); // L: 7 - FontName_plain12 = new FontName("p12_full"); // L: 8 - FontName_bold12 = new FontName("b12_full"); // L: 9 - FontName_verdana11 = new FontName("verdana_11pt_regular"); // L: 10 - FontName_verdana13 = new FontName("verdana_13pt_regular"); // L: 11 - FontName_verdana15 = new FontName("verdana_15pt_regular"); // L: 12 + FontName_plain11 = new FontName("p11_full"); + FontName_plain12 = new FontName("p12_full"); + FontName_bold12 = new FontName("b12_full"); + FontName_verdana11 = new FontName("verdana_11pt_regular"); + FontName_verdana13 = new FontName("verdana_13pt_regular"); + FontName_verdana15 = new FontName("verdana_15pt_regular"); } FontName(String var1) { - this.name = var1; // L: 20 - } // L: 21 + this.name = var1; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "13" + ) + public static void method6374(int var0) { + if (class234.musicPlayerStatus != 0) { + HorizontalAlignment.musicTrackVolume = var0; + } else { + class234.midiPcmStream.setPcmStreamVolume(var0); + } + + } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)[Lmb;", - garbageValue = "-107" + descriptor = "(ILbd;ZS)I", + garbageValue = "3144" ) - public static FontName[] method6334() { - return new FontName[]{FontName_verdana15, FontName_verdana11, FontName_verdana13, FontName_bold12, FontName_plain11, FontName_plain12}; // L: 16 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-562774219" - ) - public static int method6335(CharSequence var0) { - return class8.method105(var0, 10, true); // L: 76 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;", - garbageValue = "2" - ) - @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; + static int method6376(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = false; } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 + var4 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); + return 1; + } else { + --class1.Interpreter_stringStackSize; + return 1; + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + Interpreter.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.parent = ObjectSound.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + Interpreter.Interpreter_intStackSize -= 2; + var5 = 10; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; + ItemComposition.Widget_setKey(var4, var5, var8, var9); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + Interpreter.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + WorldMapSectionType.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + WorldMapSectionType.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --Interpreter.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + StructComposition.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + StructComposition.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var10 = null; + var8 = null; + if (var3) { + Interpreter.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { + } + + if (var7 > 0) { + var10 = new byte[var7 / 2]; + var8 = new byte[var7 / 2]; + + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; + } + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + ItemComposition.Widget_setKey(var4, var7, var10, var8); + return 1; + } else { + throw new RuntimeException(); + } + } + } } } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "57" + descriptor = "(ILbd;ZI)I", + garbageValue = "1821361801" ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 144 - int var2 = 0; // L: 145 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 146 - var2 = (var2 << 5) - var2 + class125.charToByteCp1252(var0.charAt(var3)); - } - - return var2; // L: 147 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)Z", - garbageValue = "840735253" - ) - static final boolean method6331(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 94 - if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 95 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_y - var6; // L: 96 - if (var7 > var0 && var7 > var1 && var7 > var2) { - return false; // L: 97 - } else { - var7 = ViewportMouse.ViewportMouse_x + var6; // L: 98 - if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 99 - return false; + static int method6375(int var0, Script var1, boolean var2) { + Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var3)); + return 1; + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; } else { - var7 = ViewportMouse.ViewportMouse_x - var6; // L: 100 - return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 101 + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.dataText; } + + return 1; + } else { + return 2; } - } - } - - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1913570357" - ) - static int method6329() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1714 - int var0 = 0; // L: 1715 - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1716 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1717 - } - - return var0 * 10000 / Client.field898; // L: 1719 } else { - return 10000; + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } } - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(Lev;IIII)V", - garbageValue = "-281003514" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { // L: 9175 - if (var0.transforms != null) { // L: 9176 - var0 = var0.transform(); - } - - if (var0 != null) { // L: 9177 - if (var0.isInteractable) { // L: 9178 - if (!var0.isFollower || Client.followerIndex == var1) { // L: 9179 - String var4 = var0.name; // L: 9180 - int var7; - int var8; - if (var0.combatLevel != 0) { // L: 9181 - var7 = var0.combatLevel; // L: 9184 - var8 = class262.localPlayer.combatLevel; // L: 9185 - int var9 = var8 - var7; // L: 9187 - String var6; - if (var9 < -9) { // L: 9188 - var6 = SecureRandomFuture.colorStartTag(16711680); // L: 9189 - } else if (var9 < -6) { // L: 9192 - var6 = SecureRandomFuture.colorStartTag(16723968); // L: 9193 - } else if (var9 < -3) { // L: 9196 - var6 = SecureRandomFuture.colorStartTag(16740352); // L: 9197 - } else if (var9 < 0) { // L: 9200 - var6 = SecureRandomFuture.colorStartTag(16756736); // L: 9201 - } else if (var9 > 9) { // L: 9204 - var6 = SecureRandomFuture.colorStartTag(65280); // L: 9205 - } else if (var9 > 6) { // L: 9208 - var6 = SecureRandomFuture.colorStartTag(4259584); // L: 9209 - } else if (var9 > 3) { // L: 9212 - var6 = SecureRandomFuture.colorStartTag(8453888); // L: 9213 - } else if (var9 > 0) { // L: 9216 - var6 = SecureRandomFuture.colorStartTag(12648192); // L: 9217 - } else { - var6 = SecureRandomFuture.colorStartTag(16776960); // L: 9220 - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9222 - } - - if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9224 - class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9225 - } - - if (Client.isItemSelected == 1) { // L: 9228 - class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9229 - } else if (Client.isSpellSelected) { // L: 9232 - if ((LoginPacket.selectedSpellFlags & 2) == 2) { // L: 9233 - class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9234 - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9239 - String[] var11 = var0.actions; // L: 9240 - if (var11 != null) { // L: 9241 - for (var7 = 4; var7 >= 0; --var7) { // L: 9242 - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9243 - var8 = 0; // L: 9244 - if (var7 == 0) { // L: 9245 - var8 = var10 + 9; - } - - if (var7 == 1) { // L: 9246 - var8 = var10 + 10; - } - - if (var7 == 2) { // L: 9247 - var8 = var10 + 11; - } - - if (var7 == 3) { // L: 9248 - var8 = var10 + 12; - } - - if (var7 == 4) { // L: 9249 - var8 = var10 + 13; - } - - class22.insertMenuItemNoShift(var11[var7], SecureRandomFuture.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9250 - } - } - } - - if (var11 != null) { // L: 9255 - for (var7 = 4; var7 >= 0; --var7) { // L: 9256 - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9257 - short var12 = 0; // L: 9258 - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 9259 - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class262.localPlayer.combatLevel) { // L: 9260 - var12 = 2000; // L: 9261 - } - - var8 = 0; // L: 9263 - if (var7 == 0) { // L: 9264 - var8 = var12 + 9; - } - - if (var7 == 1) { // L: 9265 - var8 = var12 + 10; - } - - if (var7 == 2) { // L: 9266 - var8 = var12 + 11; - } - - if (var7 == 3) { // L: 9267 - var8 = var12 + 12; - } - - if (var7 == 4) { // L: 9268 - var8 = var12 + 13; - } - - class22.insertMenuItemNoShift(var11[var7], SecureRandomFuture.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9269 - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9274 - class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9275 - } - } - - } - } - } - } - } // L: 9279 - - @ObfuscatedName("jh") - @ObfuscatedSignature( - descriptor = "(Liv;IIZS)V", - garbageValue = "-1497" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 9966 - int var5 = var0.height; // L: 9967 - if (var0.widthAlignment == 0) { // L: 9968 - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 9969 - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 9970 - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { // L: 9971 - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 9972 - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; // L: 9973 - } - - if (var0.widthAlignment == 4) { // L: 9974 - var0.width = var0.height * var0.field2977 / var0.field2957; - } - - if (var0.heightAlignment == 4) { // L: 9975 - var0.height = var0.field2957 * var0.width / var0.field2977; - } - - if (var0.contentType == 1337) { // L: 9976 - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9977 - ScriptEvent var6 = new ScriptEvent(); // L: 9978 - var6.widget = var0; // L: 9979 - var6.args = var0.onResize; // L: 9980 - Client.scriptEvents.addFirst(var6); // L: 9981 - } - - } // L: 9983 } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 0d85864261..8cea77f6c8 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -3,19 +3,20 @@ 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("mk") +@ObfuscatedName("mt") @Implements("Fonts") public class Fonts { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("fontsArchive") AbstractArchive fontsArchive; @@ -24,47 +25,237 @@ public class Fonts { HashMap map; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;)V" + descriptor = "(Ljy;Ljy;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { - this.spritesArchive = var1; // L: 14 - this.fontsArchive = var2; // L: 15 - this.map = new HashMap(); // L: 16 - } // L: 17 + this.spritesArchive = var1; + this.fontsArchive = var2; + this.map = new HashMap(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Lmb;B)Ljava/util/HashMap;", - garbageValue = "4" + descriptor = "([Lmk;B)Ljava/util/HashMap;", + garbageValue = "43" ) @Export("createMap") public HashMap createMap(FontName[] var1) { - HashMap var2 = new HashMap(); // L: 20 - FontName[] var3 = var1; // L: 22 + HashMap var2 = new HashMap(); + FontName[] var3 = var1; - for (int var4 = 0; var4 < var3.length; ++var4) { // L: 23 - FontName var5 = var3[var4]; // L: 24 - if (this.map.containsKey(var5)) { // L: 26 - var2.put(var5, this.map.get(var5)); // L: 27 + for (int var4 = 0; var4 < var3.length; ++var4) { + FontName var5 = var3[var4]; + if (this.map.containsKey(var5)) { + var2.put(var5, this.map.get(var5)); } else { - Font var6 = AbstractWorldMapData.method3696(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 + Font var6 = ServerPacket.method4425(this.spritesArchive, this.fontsArchive, var5.name, ""); + if (var6 != null) { + this.map.put(var5, var6); + var2.put(var5, var6); } } } - return var2; // L: 39 + return var2; } - @ObfuscatedName("jb") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-20" + descriptor = "(ILbd;ZB)I", + garbageValue = "0" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 10357 - } // L: 10358 + static int method6367(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } + + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-662295851" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var14; + int var26; + if (var5 != 0L) { + var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + boolean var12 = 0L != var5; + if (var12) { + boolean var13 = (int)(var5 >>> 16 & 1L) == 1; + var12 = !var13; + } + + if (var12) { + var10 = var4; + } + + int[] var19 = class376.sceneMinimapSprite.pixels; + var26 = var1 * 4 + (103 - var2) * 2048 + 24624; + var14 = class78.Entity_unpackID(var5); + ObjectComposition var15 = ClanChannel.getObjectDefinition(var14); + if (var15.mapSceneId != -1) { + IndexedSprite var16 = NetFileRequest.mapSceneSprites[var15.mapSceneId]; + if (var16 != null) { + int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; + int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; + var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); + } + } else { + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var19[var26] = var10; + var19[var26 + 512] = var10; + var19[var26 + 1024] = var10; + var19[var26 + 1536] = var10; + } else if (var8 == 1) { + var19[var26] = var10; + var19[var26 + 1] = var10; + var19[var26 + 2] = var10; + var19[var26 + 3] = var10; + } else if (var8 == 2) { + var19[var26 + 3] = var10; + var19[var26 + 512 + 3] = var10; + var19[var26 + 1024 + 3] = var10; + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 3) { + var19[var26 + 1536] = var10; + var19[var26 + 1536 + 1] = var10; + var19[var26 + 1536 + 2] = var10; + var19[var26 + 1536 + 3] = var10; + } + } + + if (var9 == 3) { + if (var8 == 0) { + var19[var26] = var10; + } else if (var8 == 1) { + var19[var26 + 3] = var10; + } else if (var8 == 2) { + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 3) { + var19[var26 + 1536] = var10; + } + } + + if (var9 == 2) { + if (var8 == 3) { + var19[var26] = var10; + var19[var26 + 512] = var10; + var19[var26 + 1024] = var10; + var19[var26 + 1536] = var10; + } else if (var8 == 0) { + var19[var26] = var10; + var19[var26 + 1] = var10; + var19[var26 + 2] = var10; + var19[var26 + 3] = var10; + } else if (var8 == 1) { + var19[var26 + 3] = var10; + var19[var26 + 512 + 3] = var10; + var19[var26 + 1024 + 3] = var10; + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 2) { + var19[var26 + 1536] = var10; + var19[var26 + 1536 + 1] = var10; + var19[var26 + 1536 + 2] = var10; + var19[var26 + 1536 + 3] = var10; + } + } + } + } + + var5 = WorldMapIcon_1.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = class78.Entity_unpackID(var5); + ObjectComposition var20 = ClanChannel.getObjectDefinition(var10); + if (var20.mapSceneId != -1) { + IndexedSprite var28 = NetFileRequest.mapSceneSprites[var20.mapSceneId]; + if (var28 != null) { + var26 = (var20.sizeX * 4 - var28.subWidth) / 2; + var14 = (var20.sizeY * 4 - var28.subHeight) / 2; + var28.drawAt(var1 * 4 + var26 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); + } + } else if (var9 == 9) { + int var25 = 15658734; + boolean var27 = 0L != var5; + if (var27) { + boolean var21 = (int)(var5 >>> 16 & 1L) == 1; + var27 = !var21; + } + + if (var27) { + var25 = 15597568; + } + + int[] var22 = class376.sceneMinimapSprite.pixels; + int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var22[var29] = var25; + var22[var29 + 1 + 512] = var25; + var22[var29 + 1024 + 2] = var25; + var22[var29 + 1536 + 3] = var25; + } else { + var22[var29 + 1536] = var25; + var22[var29 + 1 + 1024] = var25; + var22[var29 + 512 + 2] = var25; + var22[var29 + 3] = var25; + } + } + } + + var5 = WorldMapIcon_1.scene.getFloorDecorationTag(var0, var1, var2); + if (var5 != 0L) { + var7 = class78.Entity_unpackID(var5); + ObjectComposition var23 = ClanChannel.getObjectDefinition(var7); + if (var23.mapSceneId != -1) { + IndexedSprite var24 = NetFileRequest.mapSceneSprites[var23.mapSceneId]; + if (var24 != null) { + var10 = (var23.sizeX * 4 - var24.subWidth) / 2; + int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; + var24.drawAt(var1 * 4 + var10 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48); + } + } + } + + } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 14d8f4c5e5..5f794ae2ef 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -3,102 +3,78 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("ga") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lgz;" + descriptor = "[Lgp;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;IZ)V" + descriptor = "(Ljy;Ljy;IZ)V" ) 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 + NodeDeque var5 = new NodeDeque(); + int var6 = var1.getGroupFileCount(var3); + this.frames = new Animation[var6]; + int[] var7 = var1.getGroupFileIds(var3); - for (int var8 = 0; var8 < var7.length; ++var8) { // 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 (int var8 = 0; var8 < var7.length; ++var8) { + byte[] var9 = var1.takeFile(var3, var7[var8]); + Skeleton var10 = null; + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; - for (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 + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { + if (var11 == var12.id) { + var10 = var12; break; } } - if (var10 == null) { // L: 51 + if (var10 == null) { byte[] var13; - if (var4) { // L: 53 + if (var4) { var13 = var2.getFile(0, var11); } else { - var13 = var2.getFile(var11, 0); // L: 54 + var13 = var2.getFile(var11, 0); } - var10 = new Skeleton(var11, var13); // L: 55 - var5.addFirst(var10); // L: 56 + var10 = new Skeleton(var11, var13); + var5.addFirst(var10); } - this.frames[var7[var8]] = new Animation(var9, var10); // L: 58 + this.frames[var7[var8]] = new Animation(var9, var10); } - } // L: 60 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1512659835" + descriptor = "(IB)Z", + garbageValue = "-13" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; // L: 63 + return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("m") + @ObfuscatedName("t") + static boolean method4174(long var0) { + return class266.method4916(var0) == 2; + } + + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-9614" + descriptor = "(II)V", + garbageValue = "1644626137" ) - public static void method4257() { - try { - if (class233.musicPlayerStatus == 1) { // L: 76 - int var0 = class233.midiPcmStream.method4660(); // L: 77 - if (var0 > 0 && class233.midiPcmStream.isReady()) { // L: 78 - var0 -= FaceNormal.pcmSampleLength; // L: 79 - if (var0 < 0) { // L: 80 - var0 = 0; - } - - class233.midiPcmStream.setPcmStreamVolume(var0); // L: 81 - return; // L: 82 - } - - class233.midiPcmStream.clear(); // L: 84 - class233.midiPcmStream.removeAll(); // L: 85 - if (InvDefinition.musicTrackArchive != null) { // L: 86 - class233.musicPlayerStatus = 2; - } else { - class233.musicPlayerStatus = 0; // L: 87 - } - - ArchiveLoader.musicTrack = null; // L: 88 - class215.soundCache = null; // L: 89 - } - } catch (Exception var2) { // L: 92 - var2.printStackTrace(); // L: 93 - class233.midiPcmStream.clear(); // L: 94 - class233.musicPlayerStatus = 0; // L: 95 - ArchiveLoader.musicTrack = null; // L: 96 - class215.soundCache = null; // L: 97 - InvDefinition.musicTrackArchive = null; // L: 98 + static void method4169(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); } - - } // L: 100 + } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 06501c0bf6..5727b7bd8b 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,27 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lb") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("go") - @ObfuscatedSignature( - descriptor = "Loa;" - ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("f") - boolean field3824; - @ObfuscatedName("e") - boolean field3825; + @ObfuscatedName("s") + boolean field3842; + @ObfuscatedName("t") + boolean field3841; Friend() { } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Llp;I)I", - garbageValue = "-1323328192" + descriptor = "(Llb;B)I", + garbageValue = "-121" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -35,105 +29,30 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3824 && !var1.field3824) { + } else if (this.field3842 && !var1.field3842) { return -1; - } else if (!this.field3824 && var1.field3824) { + } else if (!this.field3842 && var1.field3842) { return 1; - } else if (this.field3825 && !var1.field3825) { // L: 18 + } else if (this.field3841 && !var1.field3841) { return -1; - } else if (!this.field3825 && var1.field3825) { + } else if (!this.field3841 && var1.field3841) { return 1; } else { - return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 24 + return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llf;I)I", - garbageValue = "-1545273649" + descriptor = "(Llm;I)I", + garbageValue = "2074675333" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.compareToFriend((Friend)var1); // L: 29 + return this.compareToFriend((Friend)var1); } public int compareTo(Object var1) { - return this.compareToFriend((Friend)var1); // L: 33 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-1856875972" - ) - public static int method5774(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; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnb;I)I", - garbageValue = "-1814552496" - ) - public static final int method5773(LoginType var0) { - if (var0 == null) { // L: 16 - return 12; // L: 17 - } else { - switch(var0.field4090) { // L: 19 - case 7: - return 20; // L: 21 - default: - return 12; // L: 23 - } - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(Liv;I)Z", - garbageValue = "-304151220" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 10051 - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10052 - int var2 = class27.method355(var0, var1); // L: 10053 - int var3 = var0.cs1ComparisonValues[var1]; // L: 10054 - if (var0.cs1Comparisons[var1] == 2) { // L: 10055 - if (var2 >= var3) { // L: 10056 - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 10058 - if (var2 <= var3) { // L: 10059 - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 10061 - if (var3 == var2) { // L: 10062 - return false; - } - } else if (var3 != var2) { // L: 10064 - return false; - } - } - - return true; // L: 10066 - } + return this.compareToFriend((Friend)var1); } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 5c01a7d261..84ee6bdd4e 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,17 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("lc") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1437119291 - ) - public int field3829; - @ObfuscatedName("e") + @ObfuscatedName("qo") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Ldt;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 874951947 + ) + public int field3846; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Loh;" ) @Export("username") public Username username; @@ -23,11 +29,59 @@ public class FriendLoginUpdate extends Link { public short world; @ObfuscatedSignature( - descriptor = "(Llc;I)V" + descriptor = "(Loh;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3829 = (int)(ClientPacket.currentTimeMillis() / 1000L); // L: 106 - this.username = var1; // L: 107 - this.world = (short)var2; // L: 108 - } // L: 109 + this.field3846 = (int)(UrlRequester.method2125() / 1000L); + this.username = var1; + this.world = (short)var2; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "-1608246392" + ) + static final void method5763(String var0, int var1) { + PacketBufferNode var2 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.writeByte(var1); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-2018320104" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = class122.getTileHeight(var0, var1, GrandExchangeEvent.Client_plane) - var2; + var0 -= ItemContainer.cameraX; + var3 -= Bounds.cameraY; + var1 -= WorldMapArchiveLoader.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[class116.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[class116.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[class117.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[class117.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var3 * var5 - var4 * var1 >> 16; + var1 = var3 * var4 + var5 * var1 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index baa9fa44df..49b47c1c00 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -4,359 +4,349 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("ai") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("id") - @ObfuscatedGetter( - intValue = 1091220247 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Lld;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Llu;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1019813463 + intValue = -471255991 ) - int field928; + int field713; @ObfuscatedSignature( - descriptor = "(Lnb;)V" + descriptor = "(Lnf;)V" ) FriendSystem(LoginType var1) { - this.field928 = 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("f") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" - ) - boolean method1804() { - return this.field928 == 2; // L: 32 + this.field713 = 0; + this.loginType = var1; + this.friendsList = new FriendsList(var1); + this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-26603" + descriptor = "(I)Z", + garbageValue = "-759002684" ) - final void method1817() { - this.field928 = 1; // L: 36 - } // L: 37 + boolean method1473() { + return this.field713 == 2; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2024285394" + ) + final void method1440() { + this.field713 = 1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-1640361249" + descriptor = "(Lnv;II)V", + garbageValue = "-469570565" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { - this.friendsList.read(var1, var2); // L: 40 - this.field928 = 2; // L: 41 - - for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43 - Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44 - var4.clearIsFriend(); // L: 45 - } - - FileSystem.method2647(); // L: 47 - if (class289.friendsChat != null) { // L: 48 - class289.friendsChat.clearFriends(); // L: 49 - } - - } // L: 52 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1325813770" - ) - @Export("processFriendUpdates") - final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 55 - if ((long)var1.field3829 < ClientPacket.currentTimeMillis() / 1000L - 5L) { // L: 56 - if (var1.world > 0) { - UserComparator10.addGameMessage(5, "", var1.username + " has logged in."); // L: 57 - } - - if (var1.world == 0) { // L: 58 - UserComparator10.addGameMessage(5, "", var1.username + " has logged out."); - } - - var1.remove(); // L: 59 - } - } - - } // L: 62 + this.friendsList.read(var1, var2); + this.field713 = 2; + class107.method2293(); + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "120" + descriptor = "(I)V", + garbageValue = "-905255692" + ) + @Export("processFriendUpdates") + final void processFriendUpdates() { + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { + if ((long)var1.field3846 < UrlRequester.method2125() / 1000L - 5L) { + if (var1.world > 0) { + class120.addGameMessage(5, "", var1.username + " has logged in."); + } + + if (var1.world == 0) { + class120.addGameMessage(5, "", var1.username + " has logged out."); + } + + var1.remove(); + } + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1918010624" ) @Export("clear") final void clear() { - this.field928 = 0; // L: 65 - this.friendsList.clear(); // L: 66 - this.ignoreList.clear(); // L: 67 - } // L: 68 + this.field713 = 0; + this.friendsList.clear(); + this.ignoreList.clear(); + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llc;ZI)Z", - garbageValue = "2140108913" + descriptor = "(Loh;ZI)Z", + garbageValue = "1313209132" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { // L: 71 + if (var1 == null) { return false; - } else if (var1.equals(class262.localPlayer.username)) { // L: 72 + } else if (var1.equals(MouseHandler.localPlayer.username)) { return true; } else { - return this.friendsList.isFriended(var1, var2); // L: 73 + return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Llc;I)Z", - garbageValue = "668891946" + descriptor = "(Loh;I)Z", + garbageValue = "-622518373" ) @Export("isIgnored") final boolean isIgnored(Username var1) { - if (var1 == null) { // L: 78 + if (var1 == null) { return false; } else { - return this.ignoreList.contains(var1); // L: 79 + return this.ignoreList.contains(var1); + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1772980259" + ) + @Export("addFriend") + final void addFriend(String var1) { + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.friendsListIsFull()) { + SequenceDefinition.method3167(); + } else if (MouseHandler.localPlayer.username.equals(var2)) { + MouseHandler.method369("You can't add yourself to your own friend list"); + } else if (this.isFriended(var2, false)) { + MouseHandler.method369(var1 + " is already on your friend list"); + } else if (this.isIgnored(var2)) { + MouseHandler.method369("Please remove " + var1 + " from your ignore list first"); + } else { + PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2564, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } + } } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-935678134" - ) - @Export("addFriend") - final void addFriend(String var1) { - if (var1 != null) { // L: 84 - Username var2 = new Username(var1, this.loginType); // L: 85 - if (var2.hasCleanName()) { // L: 86 - if (this.friendsListIsFull()) { // L: 87 - GrandExchangeEvent.method5223(); // L: 88 - } else if (class262.localPlayer.username.equals(var2)) { // L: 91 - FloorOverlayDefinition.method3168(); // L: 92 - } else if (this.isFriended(var2, false)) { // L: 95 - MusicPatchNode2.method4537(var1); // L: 96 - } else if (this.isIgnored(var2)) { // L: 99 - DirectByteArrayCopier.method4955(var1); // L: 100 - } else { - class375.method6530(var1); // L: 103 - } - } - } - } // L: 89 93 97 101 104 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-69" + descriptor = "(I)Z", + garbageValue = "330747119" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field740 != 1; // L: 143 + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field525 != 1; } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1413332284" ) @Export("addIgnore") final void addIgnore(String var1) { - if (var1 != null) { // L: 150 - Username var2 = new Username(var1, this.loginType); // L: 151 - if (var2.hasCleanName()) { // L: 152 - Object var10000; - String var3; - if (this.canAddIgnore()) { // L: 153 - var10000 = null; // L: 155 - var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - UserComparator10.addGameMessage(30, "", var3); // L: 157 - } else if (class262.localPlayer.username.equals(var2)) { // L: 162 - var10000 = null; // L: 164 - var3 = "You can't add yourself to your own ignore list"; - UserComparator10.addGameMessage(30, "", var3); // L: 166 - } else if (this.isIgnored(var2)) { // L: 171 - class314.method5693(var1); // L: 172 - } else if (this.isFriended(var2, false)) { // L: 175 - ClanSettings.method201(var1); // L: 176 + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.canAddIgnore()) { + class315.method5681(); + } else if (MouseHandler.localPlayer.username.equals(var2)) { + class270.method4928(); + } else if (this.isIgnored(var2)) { + MouseHandler.method369(var1 + " is already on your ignore list"); + } else if (this.isFriended(var2, false)) { + MouseHandler.method369("Please remove " + var1 + " from your friend list first"); } else { - TextureProvider.method4291(var1); // L: 179 + class376.method6562(var1); } } } - } // L: 160 169 173 177 180 + } @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "6" + garbageValue = "79" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field740 != 1; // L: 205 + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field525 != 1; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "0" + ) + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.friendsList.removeByUsername(var2)) { + Client.field609 = Client.cycleCntr; + PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } + + class107.method2293(); + } + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1226126458" + ) + @Export("removeIgnore") + final void removeIgnore(String var1) { + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.ignoreList.removeByUsername(var2)) { + class124.method2539(); + PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2578, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } + + AbstractByteArrayCopier.FriendSystem_invalidateIgnoreds(); + } + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Loh;I)Z", + garbageValue = "-1196057065" + ) + @Export("isFriendAndHasWorld") + final boolean isFriendAndHasWorld(Username var1) { + Friend var2 = (Friend)this.friendsList.getByUsername(var1); + return var2 != null && var2.hasWorld(); } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-120" + descriptor = "(Ljy;B)V", + garbageValue = "1" ) - @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { // L: 212 - Username var2 = new Username(var1, this.loginType); // L: 213 - if (var2.hasCleanName()) { // L: 214 - if (this.friendsList.removeByUsername(var2)) { // L: 215 - Coord.method4801(); // L: 216 - PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2612, Client.packetWriter.isaacCipher); // L: 218 - var3.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var1)); // L: 219 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 220 - Client.packetWriter.addNode(var3); // L: 221 - } + public static void method1452(AbstractArchive var0) { + VarbitComposition.VarbitDefinition_archive = var0; + } - for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 224 - Player var4 = Client.players[Players.Players_indices[var5]]; // L: 225 - var4.clearIsFriend(); // L: 226 - } - - FileSystem.method2647(); // L: 228 - if (class289.friendsChat != null) { // L: 229 - class289.friendsChat.clearFriends(); // L: 230 - } - - } - } - } // L: 233 - - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "79" + descriptor = "(IB)Leg;", + garbageValue = "126" ) - @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { // L: 236 - Username var2 = new Username(var1, this.loginType); // L: 237 - if (var2.hasCleanName()) { // L: 238 - if (this.ignoreList.removeByUsername(var2)) { // L: 239 - Coord.method4801(); // L: 240 - PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); // L: 242 - var3.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var1)); // L: 243 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 244 - Client.packetWriter.addNode(var3); // L: 245 - } - - World.FriendSystem_invalidateIgnoreds(); // L: 247 + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - } - } // L: 248 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Llc;I)Z", - garbageValue = "1657999347" - ) - @Export("isFriendAndHasWorld") - final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 260 - return var2 != null && var2.hasWorld(); // L: 261 + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; + } } @ObfuscatedName("hz") @ObfuscatedSignature( - descriptor = "(Lcr;I)V", - garbageValue = "702642598" + descriptor = "(III)V", + garbageValue = "738859003" ) - static final void method1875(PendingSpawn var0) { - long var1 = 0L; // L: 7331 - int var3 = -1; // L: 7332 - int var4 = 0; // L: 7333 - int var5 = 0; // L: 7334 - if (var0.type == 0) { // L: 7335 - var1 = DevicePcmPlayerProvider.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[GrandExchangeEvent.Client_plane][var0][var1]; + if (var2 == null) { + WorldMapIcon_1.scene.removeGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1); + } else { + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemComposition var7 = KeyHandler.ItemDefinition_get(var6.id); + long var11 = (long)var7.price; + if (var7.isStackable == 1) { + var11 *= (long)(var6.quantity + 1); + } + + if (var11 > var3) { + var3 = var11; + var5 = var6; + } + } + + if (var5 == null) { + WorldMapIcon_1.scene.removeGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var13 = null; + TileItem var8 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var6.id != var5.id) { + if (var13 == null) { + var13 = var6; + } + + if (var6.id != var13.id && var8 == null) { + var8 = var6; + } + } + } + + long var9 = class171.calculateTag(var0, var1, 3, false, 0); + WorldMapIcon_1.scene.newGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1, class122.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, GrandExchangeEvent.Client_plane), var5, var9, var13, var8); + } } - - if (var0.type == 1) { // L: 7336 - var1 = DevicePcmPlayerProvider.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { // L: 7337 - var1 = DevicePcmPlayerProvider.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { // L: 7338 - var1 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { // L: 7339 - int var6 = DevicePcmPlayerProvider.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7340 - var3 = Message.Entity_unpackID(var1); // L: 7341 - var4 = var6 & 31; // L: 7342 - var5 = var6 >> 6 & 3; // L: 7343 - } - - var0.objectId = var3; // L: 7345 - var0.field1210 = var4; // L: 7346 - var0.field1209 = var5; // L: 7347 - } // L: 7348 - - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(IIIB)Lci;", - garbageValue = "-81" - ) - static final InterfaceParent method1867(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 11254 - var3.group = var1; // L: 11255 - var3.type = var2; // L: 11256 - Client.interfaceParents.put(var3, (long)var0); // L: 11257 - TextureProvider.Widget_resetModelFrames(var1); // L: 11258 - Widget var4 = WorldMapData_1.getWidget(var0); // L: 11259 - Script.invalidateWidget(var4); // L: 11260 - if (Client.meslayerContinueWidget != null) { // L: 11261 - Script.invalidateWidget(Client.meslayerContinueWidget); // L: 11262 - Client.meslayerContinueWidget = null; // L: 11263 - } - - WorldMapScaleHandler.method3856(); // L: 11265 - WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11266 - ScriptFrame.runWidgetOnLoadListener(var1); // L: 11267 - if (Client.rootInterface != -1) { // L: 11268 - class8.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; // L: 11269 } } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index 9bf0cf1da3..f55f58bbbe 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -1,347 +1,235 @@ -import java.io.DataInputStream; -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("lj") +@ObfuscatedName("lf") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("rh") - @ObfuscatedGetter( - intValue = 1112314023 - ) - static int field3815; - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "[Lnh;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lnf;" ) @Export("loginType") final LoginType loginType; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Lla;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("name") public String name; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("owner") public String owner; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("minKick") public byte minKick; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1281242043 + intValue = -1047234431 ) @Export("rank") public int rank; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2021937321 + intValue = 1364708949 ) - int field3821; + int field3837; @ObfuscatedSignature( - descriptor = "(Lnb;Llz;)V" + descriptor = "(Lnf;Lla;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { - super(100); // L: 18 - this.name = null; // L: 11 - this.owner = null; // L: 12 - this.field3821 = 1; // L: 15 - this.loginType = var1; // L: 19 - this.localUser = var2; // L: 20 - } // L: 21 + super(100); + this.name = null; + this.owner = null; + this.field3837 = 1; + this.loginType = var1; + this.localUser = var2; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Llf;", - garbageValue = "1590299985" + descriptor = "(B)Llm;", + garbageValue = "-70" ) @Export("newInstance") User newInstance() { - return new ClanMate(); // L: 24 + return new ClanMate(); } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)[Llf;", - garbageValue = "-1320557093" + descriptor = "(II)[Llm;", + garbageValue = "-2047984332" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new ClanMate[var1]; // L: 28 + return new ClanMate[var1]; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "370345592" + garbageValue = "-1395184597" ) @Export("readName") final void readName(String var1) { - long var5 = 0L; - int var7 = var1.length(); + this.name = AbstractUserComparator.method5813(var1); + } - for (int var8 = 0; var8 < var7; ++var8) { // L: 38 - var5 *= 37L; - char var9 = var1.charAt(var8); - if (var9 >= 'A' && var9 <= 'Z') { - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); - } - - if (var5 >= 177917621779460413L) { - break; - } - } - - while (0L == var5 % 37L && var5 != 0L) { - var5 /= 37L; - } - - String var10 = class80.base37DecodeLong(var5); // L: 49 - if (var10 == null) { - var10 = ""; - } - - this.name = var10; // L: 53 - } // L: 54 - - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "919584410" + garbageValue = "-1320826111" ) @Export("setOwner") final void setOwner(String var1) { - long var5 = 0L; // L: 61 - int var7 = var1.length(); // L: 62 + this.owner = AbstractUserComparator.method5813(var1); + } - for (int var8 = 0; var8 < var7; ++var8) { // L: 63 - var5 *= 37L; // L: 64 - char var9 = var1.charAt(var8); // L: 65 - if (var9 >= 'A' && var9 <= 'Z') { // L: 66 - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { // L: 67 - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); // L: 68 - } - - if (var5 >= 177917621779460413L) { // L: 69 - break; - } - } - - while (0L == var5 % 37L && 0L != var5) { // L: 71 - var5 /= 37L; - } - - String var10 = class80.base37DecodeLong(var5); // L: 74 - if (var10 == null) { // L: 75 - var10 = ""; - } - - this.owner = var10; // L: 78 - } // L: 79 - - @ObfuscatedName("z") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1598769296" + descriptor = "(Lnv;B)V", + garbageValue = "1" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82 - long var2 = var1.readLong(); // L: 83 - long var5 = var2; // L: 85 + this.setOwner(var1.readStringCp1252NullTerminated()); + long var2 = var1.readLong(); + long var5 = var2; String var4; int var7; - if (var2 > 0L && var2 < 6582952005840035281L) { // L: 87 - if (0L == var2 % 37L) { // L: 91 - var4 = null; // L: 92 + if (var2 > 0L && var2 < 6582952005840035281L) { + if (0L == var2 % 37L) { + var4 = null; } else { - var7 = 0; // L: 95 + var7 = 0; - for (long var8 = var2; 0L != var8; var8 /= 37L) { // L: 96 97 99 - ++var7; // L: 98 + for (long var8 = var2; 0L != var8; var8 /= 37L) { + ++var7; } - StringBuilder var10 = new StringBuilder(var7); // L: 101 + StringBuilder var10 = new StringBuilder(var7); - while (var5 != 0L) { // L: 102 - long var11 = var5; // L: 103 - var5 /= 37L; // L: 104 - var10.append(class306.base37Table[(int)(var11 - 37L * var5)]); // L: 105 + while (0L != var5) { + long var11 = var5; + var5 /= 37L; + var10.append(class307.base37Table[(int)(var11 - var5 * 37L)]); } - var4 = var10.reverse().toString(); // L: 107 + var4 = var10.reverse().toString(); } } else { - var4 = null; // L: 88 + var4 = null; } - this.readName(var4); // L: 109 - this.minKick = var1.readByte(); // L: 110 - var7 = var1.readUnsignedByte(); // L: 111 - if (var7 != 255) { // L: 112 - this.clear(); // L: 113 + this.readName(var4); + this.minKick = var1.readByte(); + var7 = var1.readUnsignedByte(); + if (var7 != 255) { + this.clear(); - for (int var13 = 0; var13 < var7; ++var13) { // L: 114 - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 115 - int var14 = var1.readUnsignedShort(); // L: 116 - var9.set(var14, ++this.field3821 - 1); // L: 117 - var9.rank = var1.readByte(); // L: 118 - var1.readStringCp1252NullTerminated(); // L: 119 - this.isLocalPlayer(var9); // L: 120 + for (int var13 = 0; var13 < var7; ++var13) { + ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var14 = var1.readUnsignedShort(); + var9.set(var14, ++this.field3837 - 1); + var9.rank = var1.readByte(); + var1.readStringCp1252NullTerminated(); + this.isLocalPlayer(var9); } } - } // L: 122 + } - @ObfuscatedName("b") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1315927757" + descriptor = "(Lnv;B)V", + garbageValue = "-51" ) - public final void method5751(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 125 - int var3 = var1.readUnsignedShort(); // L: 126 - byte var4 = var1.readByte(); // L: 127 - boolean var5 = false; // L: 128 - if (var4 == -128) { // L: 129 + public final void method5724(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + int var3 = var1.readUnsignedShort(); + byte var4 = var1.readByte(); + boolean var5 = false; + if (var4 == -128) { var5 = true; } ClanMate var6; - if (var5) { // L: 130 - if (this.getSize() == 0) { // L: 131 + if (var5) { + if (this.getSize() == 0) { return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 132 - if (var6 != null && var6.getWorld() == var3) { // L: 133 - this.remove(var6); // L: 134 + var6 = (ClanMate)this.getByCurrentUsername(var2); + if (var6 != null && var6.getWorld() == var3) { + this.remove(var6); } } else { - var1.readStringCp1252NullTerminated(); // L: 138 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 139 - if (var6 == null) { // L: 140 - if (this.getSize() > super.capacity) { // L: 141 + var1.readStringCp1252NullTerminated(); + var6 = (ClanMate)this.getByCurrentUsername(var2); + if (var6 == null) { + if (this.getSize() > super.capacity) { return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 142 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3821 - 1); // L: 144 - var6.rank = var4; // L: 145 - this.isLocalPlayer(var6); // L: 146 + var6.set(var3, ++this.field3837 - 1); + var6.rank = var4; + this.isLocalPlayer(var6); } - } // L: 148 + } - @ObfuscatedName("i") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-41" + descriptor = "(I)V", + garbageValue = "-1329735244" ) @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 151 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 152 + for (int var1 = 0; var1 < this.getSize(); ++var1) { + ((ClanMate)this.get(var1)).clearIsFriend(); } - } // L: 154 + } - @ObfuscatedName("k") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "24878188" + garbageValue = "-975968384" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 157 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 158 + for (int var1 = 0; var1 < this.getSize(); ++var1) { + ((ClanMate)this.get(var1)).clearIsIgnored(); } - } // L: 160 + } - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Llt;I)V", - garbageValue = "1528059933" + descriptor = "(Llg;B)V", + garbageValue = "76" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 163 + if (var1.getUsername().equals(this.localUser.username())) { this.rank = var1.rank; } - } // L: 164 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "1551905858" - ) - @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 - var2 = GrandExchangeOfferNameComparator.method5193(var1); - } - - if (var0 != null) { // L: 35 - if (var1 != null) { // L: 36 - var2 = var2 + " | "; - } - - var2 = var2 + var0; // L: 37 - } - - System.out.println("Error: " + var2); // L: 39 - var2 = var2.replace(':', '.'); // L: 40 - var2 = var2.replace('@', '_'); // L: 41 - var2 = var2.replace('&', '_'); // L: 42 - var2 = var2.replace('#', '_'); // L: 43 - if (RunException.RunException_applet == null) { // L: 44 - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + Login.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + GZipDecompressor.clientType + "&e=" + var2); // L: 45 - DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46 - var4.read(); // L: 47 - var4.close(); // L: 48 - } catch (Exception var5) { // L: 50 - } - - } - } // L: 51 - - @ObfuscatedName("lk") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" - ) - static void method5760() { - if (Client.oculusOrbState == 1) { // L: 11678 - Client.field705 = true; // L: 11679 - } - - } // L: 11681 + } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index f7d2fcb696..658befb71a 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,206 +4,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("ld") @Implements("FriendsList") public class FriendsList extends UserList { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1954413 - ) - int field3812; @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1711234231 + ) + int field3828; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lko;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lnb;)V" + descriptor = "(Lnf;)V" ) public FriendsList(LoginType var1) { - super(400); // L: 17 - this.field3812 = 1; // L: 13 - this.friendLoginUpdates = new LinkDeque(); // L: 14 - this.loginType = var1; // L: 18 - } // L: 19 + super(400); + this.field3828 = 1; + this.friendLoginUpdates = new LinkDeque(); + this.loginType = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Llf;", - garbageValue = "1590299985" + descriptor = "(B)Llm;", + garbageValue = "-70" ) @Export("newInstance") User newInstance() { - return new Friend(); // L: 22 + return new Friend(); } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)[Llf;", - garbageValue = "-1320557093" + descriptor = "(II)[Llm;", + garbageValue = "-2047984332" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Friend[var1]; // L: 26 + return new Friend[var1]; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llc;ZB)Z", - garbageValue = "0" + descriptor = "(Loh;ZI)Z", + garbageValue = "1216777375" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { - Friend var3 = (Friend)this.getByUsername(var1); // L: 30 + Friend var3 = (Friend)this.getByUsername(var1); if (var3 == null) { - return false; // L: 31 + return false; } else { - return !var2 || var3.world != 0; // L: 32 + return !var2 || var3.world != 0; } } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "730412999" + descriptor = "(Lnv;II)V", + garbageValue = "2058052808" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { // L: 37 - boolean var3 = var1.readUnsignedByte() == 1; // L: 38 - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 39 - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40 - int var6 = var1.readUnsignedShort(); // L: 41 - int var7 = var1.readUnsignedByte(); // L: 42 - int var8 = var1.readUnsignedByte(); // L: 43 - boolean var9 = (var8 & 2) != 0; // L: 44 - boolean var10 = (var8 & 1) != 0; // L: 45 - if (var6 > 0) { // L: 46 - var1.readStringCp1252NullTerminated(); // L: 47 - var1.readUnsignedByte(); // L: 48 - var1.readInt(); // L: 49 + if (var1.offset < var2) { + boolean var3 = var1.readUnsignedByte() == 1; + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + int var6 = var1.readUnsignedShort(); + int var7 = var1.readUnsignedByte(); + int var8 = var1.readUnsignedByte(); + boolean var9 = (var8 & 2) != 0; + boolean var10 = (var8 & 1) != 0; + if (var6 > 0) { + var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + var1.readInt(); } - var1.readStringCp1252NullTerminated(); // L: 51 - if (var4 != null && var4.hasCleanName()) { // L: 52 - Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 53 - if (var3) { // L: 54 - Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 55 - if (var12 != null && var12 != var11) { // L: 56 - if (var11 != null) { // L: 57 - this.remove(var12); // L: 58 + var1.readStringCp1252NullTerminated(); + if (var4 != null && var4.hasCleanName()) { + Friend var11 = (Friend)this.getByCurrentUsername(var4); + if (var3) { + Friend var12 = (Friend)this.getByCurrentUsername(var5); + if (var12 != null && var12 != var11) { + if (var11 != null) { + this.remove(var12); } else { - var11 = var12; // L: 61 + var11 = var12; } } } - if (var11 != null) { // L: 65 - this.changeName(var11, var4, var5); // L: 66 - if (var6 != var11.world) { // L: 67 - boolean var14 = true; // L: 68 + if (var11 != null) { + this.changeName(var11, var4, var5); + if (var6 != var11.world) { + boolean var14 = true; - for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 69 - if (var13.username.equals(var4)) { // L: 70 - if (var6 != 0 && var13.world == 0) { // L: 71 - var13.remove(); // L: 72 - var14 = false; // L: 73 - } else if (var6 == 0 && var13.world != 0) { // L: 75 - var13.remove(); // L: 76 - var14 = false; // L: 77 + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { + if (var13.username.equals(var4)) { + if (var6 != 0 && var13.world == 0) { + var13.remove(); + var14 = false; + } else if (var6 == 0 && var13.world != 0) { + var13.remove(); + var14 = false; } } } - if (var14) { // L: 81 + if (var14) { this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { - if (this.getSize() >= 400) { // L: 84 + if (this.getSize() >= 400) { continue; } - var11 = (Friend)this.addLast(var4, var5); // L: 85 + var11 = (Friend)this.addLast(var4, var5); } - if (var6 != var11.world) { // L: 88 - var11.int2 = ++this.field3812 - 1; // L: 89 - if (var11.world == -1 && var6 == 0) { // L: 90 - var11.int2 = -(var11.int2 * 1083271825) * -286288271; + if (var6 != var11.world) { + var11.int2 = ++this.field3828 - 1; + if (var11.world == -1 && var6 == 0) { + var11.int2 = -(var11.int2 * 723168297) * -2065584103; } - var11.world = var6; // L: 91 + var11.world = var6; } - var11.rank = var7; // L: 93 - var11.field3824 = var9; // L: 94 - var11.field3825 = var10; // L: 95 - continue; // L: 96 + var11.rank = var7; + var11.field3842 = var9; + var11.field3841 = var10; + continue; } throw new IllegalStateException(); } - this.sort(); // L: 97 - return; // L: 98 + this.sort(); + return; } } - - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)V", - garbageValue = "2200" - ) - static void method5711(int var0, String var1) { - int var2 = Players.Players_count; // L: 8737 - int[] var3 = Players.Players_indices; // L: 8738 - boolean var4 = false; // L: 8739 - Username var5 = new Username(var1, LoginScreenAnimation.loginType); // L: 8740 - - for (int var6 = 0; var6 < var2; ++var6) { // L: 8741 - Player var7 = Client.players[var3[var6]]; // L: 8742 - if (var7 != null && var7 != class262.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8743 - PacketBufferNode var8; - if (var0 == 1) { // L: 8744 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8746 - var8.packetBuffer.method6705(var3[var6]); // L: 8747 - var8.packetBuffer.method6640(0); // L: 8748 - Client.packetWriter.addNode(var8); // L: 8749 - } else if (var0 == 4) { // L: 8751 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8753 - var8.packetBuffer.method6640(0); // L: 8754 - var8.packetBuffer.method6648(var3[var6]); // L: 8755 - Client.packetWriter.addNode(var8); // L: 8756 - } else if (var0 == 6) { // L: 8758 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 8760 - var8.packetBuffer.method6649(var3[var6]); // L: 8761 - var8.packetBuffer.method6639(0); // L: 8762 - Client.packetWriter.addNode(var8); // L: 8763 - } else if (var0 == 7) { // L: 8765 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 8767 - var8.packetBuffer.writeByte(0); // L: 8768 - var8.packetBuffer.method6705(var3[var6]); // L: 8769 - Client.packetWriter.addNode(var8); // L: 8770 - } - - var4 = true; // L: 8772 - break; - } - } - - if (!var4) { // L: 8776 - UserComparator10.addGameMessage(4, "", "Unable to find " + var1); - } - - } // L: 8777 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 6f246c5e9e..f65e5daa36 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,57 +1,50 @@ import java.util.zip.Inflater; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("or") +@ObfuscatedName("oj") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 2117115219 - ) - @Export("clientType") - public static int clientType; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("inflater") Inflater inflater; + public GZipDecompressor() { + this(-1, 1000000, 1000000); + } + @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" ) GZipDecompressor(int var1, int var2, int var3) { - } // L: 13 + } - public GZipDecompressor() { - this(-1, 1000000, 1000000); // L: 10 - } // L: 11 - - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;[BI)V", - garbageValue = "1826658043" + descriptor = "(Lnv;[BI)V", + garbageValue = "2001145466" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { - if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 + if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { if (this.inflater == null) { - this.inflater = new Inflater(true); // L: 17 + this.inflater = new Inflater(true); } try { - this.inflater.setInput(var1.array, var1.offset + 10, var1.array.length - (var1.offset + 8 + 10)); // L: 19 - this.inflater.inflate(var2); // L: 20 - } catch (Exception var4) { // L: 22 - this.inflater.reset(); // L: 23 - throw new RuntimeException(""); // L: 24 + this.inflater.setInput(var1.array, var1.offset + 10, var1.array.length - (var1.offset + 8 + 10)); + this.inflater.inflate(var2); + } catch (Exception var4) { + this.inflater.reset(); + throw new RuntimeException(""); } - this.inflater.reset(); // L: 26 + this.inflater.reset(); } else { throw new RuntimeException(""); } - } // L: 27 + } } diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 02780209e3..b63f5787ae 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -4,68 +4,252 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("ja") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lja;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lja;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lja;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lja;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("name") public final String name; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -104611059 + intValue = 1793986525 ) @Export("buildId") - final int buildId; + public final int buildId; static { - LIVE = new GameBuild("LIVE", 0); // L: 5 - BUILDLIVE = new GameBuild("BUILDLIVE", 3); // L: 6 - RC = new GameBuild("RC", 1); // L: 7 - WIP = new GameBuild("WIP", 2); // L: 8 + LIVE = new GameBuild("LIVE", 0); + BUILDLIVE = new GameBuild("BUILDLIVE", 3); + RC = new GameBuild("RC", 1); + WIP = new GameBuild("WIP", 2); } GameBuild(String var1, int var2) { - this.name = var1; // L: 17 - this.buildId = var2; // L: 18 - } // L: 19 + this.name = var1; + this.buildId = var2; + } - @ObfuscatedName("k") + @ObfuscatedName("io") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-562774219" + descriptor = "(IIIII)V", + garbageValue = "824685565" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 200 - return true; - } else if (var0 >= 160 && var0 <= 255) { // L: 201 - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 202 + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + class7.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); } + + long var4 = -1L; + long var6 = -1L; + + int var8; + for (var8 = 0; var8 < NPC.method1960(); ++var8) { + long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var6 != var25) { + var6 = var25; + int var13 = Skeleton.method3973(var8); + int var14 = GrandExchangeEvent.method5152(var8); + int var15 = class266.method4916(ViewportMouse.ViewportMouse_entityTags[var8]); + int var17 = class78.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); + int var18 = var17; + if (var15 == 2 && WorldMapIcon_1.scene.getObjectFlags(GrandExchangeEvent.Client_plane, var13, var14, var25) >= 0) { + ObjectComposition var19 = ClanChannel.getObjectDefinition(var17); + if (var19.transforms != null) { + var19 = var19.transform(); + } + + if (var19 == null) { + continue; + } + + if (Client.isItemSelected == 1) { + class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(65535) + var19.name, 1, var17, var13, var14); + } else if (Client.isSpellSelected) { + if ((ViewportMouse.selectedSpellFlags & 4) == 4) { + class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(65535) + var19.name, 2, var17, var13, var14); + } + } else { + String[] var20 = var19.actions; + if (var20 != null) { + for (int var21 = 4; var21 >= 0; --var21) { + if (var20[var21] != null) { + short var22 = 0; + if (var21 == 0) { + var22 = 3; + } + + if (var21 == 1) { + var22 = 4; + } + + if (var21 == 2) { + var22 = 5; + } + + if (var21 == 3) { + var22 = 6; + } + + if (var21 == 4) { + var22 = 1001; + } + + class7.insertMenuItemNoShift(var20[var21], ScriptFrame.colorStartTag(65535) + var19.name, var22, var18, var13, var14); + } + } + } + + class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14); + } + } + + Player var23; + int var27; + NPC var28; + int var35; + int[] var36; + if (var15 == 1) { + NPC var31 = Client.npcs[var18]; + if (var31 == null) { + continue; + } + + if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var28 = Client.npcs[Client.npcIndices[var27]]; + if (var28 != null && var28 != var31 && var28.definition.size == 1 && var28.x == var31.x && var31.y == var28.y) { + class290.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var36 = Players.Players_indices; + + for (var35 = 0; var35 < var27; ++var35) { + var23 = Client.players[var36[var35]]; + if (var23 != null && var31.x == var23.x && var23.y == var31.y) { + class1.addPlayerToMenu(var23, var36[var35], var13, var14); + } + } + } + + class290.addNpcToMenu(var31.definition, var18, var13, var14); + } + + if (var15 == 0) { + Player var32 = Client.players[var18]; + if (var32 == null) { + continue; + } + + if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var28 = Client.npcs[Client.npcIndices[var27]]; + if (var28 != null && var28.definition.size == 1 && var28.x == var32.x && var32.y == var28.y) { + class290.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var36 = Players.Players_indices; + + for (var35 = 0; var35 < var27; ++var35) { + var23 = Client.players[var36[var35]]; + if (var23 != null && var23 != var32 && var32.x == var23.x && var32.y == var23.y) { + class1.addPlayerToMenu(var23, var36[var35], var13, var14); + } + } + } + + if (var18 != Client.combatTargetPlayerIndex) { + class1.addPlayerToMenu(var32, var18, var13, var14); + } else { + var4 = var25; + } + } + + if (var15 == 3) { + NodeDeque var34 = Client.groundItems[GrandExchangeEvent.Client_plane][var13][var14]; + if (var34 != null) { + for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { + ItemComposition var37 = KeyHandler.ItemDefinition_get(var33.id); + if (Client.isItemSelected == 1) { + class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14); + } else if (Client.isSpellSelected) { + if ((ViewportMouse.selectedSpellFlags & 1) == 1) { + class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14); + } + } else { + String[] var29 = var37.groundActions; + + for (int var30 = 4; var30 >= 0; --var30) { + if (var29 != null && var29[var30] != null) { + byte var24 = 0; + if (var30 == 0) { + var24 = 18; + } + + if (var30 == 1) { + var24 = 19; + } + + if (var30 == 2) { + var24 = 20; + } + + if (var30 == 3) { + var24 = 21; + } + + if (var30 == 4) { + var24 = 22; + } + + class7.insertMenuItemNoShift(var29[var30], ScriptFrame.colorStartTag(16748608) + var37.name, var24, var33.id, var13, var14); + } else if (var30 == 2) { + class7.insertMenuItemNoShift("Take", ScriptFrame.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14); + } + } + + class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14); + } + } + } + } + } + } + + if (var4 != -1L) { + var8 = ApproximateRouteStrategy.method880(var4); + int var9 = class79.method1990(var4); + Player var10 = Client.players[Client.combatTargetPlayerIndex]; + class1.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); + } + } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index 302ff95074..fba7cb8544 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -24,513 +24,556 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("c") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldz;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lc;" ) @Export("gameEngine") static GameEngine gameEngine; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1592553527 + intValue = -572700985 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; @ObfuscatedName("j") @ObfuscatedGetter( - longValue = 8033536561469626209L + longValue = -8189016587990638143L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1667530929 + intValue = 1722087711 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -897639339 + intValue = -739549633 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -71568651 + intValue = 1954220685 ) @Export("fps") protected static int fps; - @ObfuscatedName("k") + @ObfuscatedName("a") @Export("graphicsTickTimes") - static long[] graphicsTickTimes; - @ObfuscatedName("t") + protected static long[] graphicsTickTimes; + @ObfuscatedName("u") @Export("clientTickTimes") - static long[] clientTickTimes; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 403418391 + protected static long[] clientTickTimes; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Llo;" ) - static int field341; + static Bounds field127; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = -178817671 + ) + static int field117; @ObfuscatedName("ay") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedGetter( - longValue = 735532951630652423L + longValue = -5971536972929410603L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedGetter( - longValue = -2068701588192565283L + longValue = 951887522386488093L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("m") + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive17") + static Archive archive17; + @ObfuscatedName("n") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1593755803 + intValue = 335914375 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1016616117 + intValue = 1416349779 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -555916595 + intValue = -1281897111 ) @Export("canvasX") int canvasX; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1657620013 + intValue = 1606064133 ) @Export("canvasY") int canvasY; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1863798935 + intValue = 857323867 ) - int field334; - @ObfuscatedName("aw") + int field110; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 333844793 + intValue = -890185029 ) - int field328; - @ObfuscatedName("ak") + int field107; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 6136823 + intValue = 334692067 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 290386939 + intValue = 2042851179 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("frame") Frame frame; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("ae") + @ObfuscatedName("as") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; @ObfuscatedName("ao") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("an") + @ObfuscatedName("az") @ObfuscatedGetter( - longValue = -109758639681671179L + longValue = -5140593388388923075L ) - volatile long field348; - @ObfuscatedName("ac") + volatile long field120; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lao;" + descriptor = "Lx;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("as") + @ObfuscatedName("af") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("eventQueue") final EventQueue eventQueue; static { - gameEngine = null; // L: 41 - GameEngine_redundantStartThreadCount = 0; // L: 43 - stopTimeMs = 0L; // L: 44 - isKilled = false; // L: 45 - cycleDurationMillis = 20; // L: 48 - fiveOrOne = 1; // L: 49 - fps = 0; // L: 50 - graphicsTickTimes = new long[32]; // L: 53 - clientTickTimes = new long[32]; // L: 55 - field341 = 500; // L: 73 - volatileFocus = true; // L: 82 - garbageCollectorLastCollectionTime = -1L; // L: 85 - garbageCollectorLastCheckTimeMs = -1L; // L: 86 + gameEngine = null; + GameEngine_redundantStartThreadCount = 0; + stopTimeMs = 0L; + isKilled = false; + cycleDurationMillis = 20; + fiveOrOne = 1; + fps = 0; + graphicsTickTimes = new long[32]; + clientTickTimes = new long[32]; + field117 = 500; + volatileFocus = true; + garbageCollectorLastCollectionTime = -1L; + garbageCollectorLastCheckTimeMs = -1L; } protected GameEngine() { - this.hasErrored = false; // L: 46 - this.canvasX = 0; // L: 59 - this.canvasY = 0; // L: 60 - this.fullRedraw = true; // L: 71 - this.resizeCanvasNextFrame = false; // L: 74 - this.isCanvasInvalid = false; // L: 75 - this.field348 = 0L; // L: 76 - EventQueue var1 = null; // L: 89 + this.hasErrored = false; + this.canvasX = 0; + this.canvasY = 0; + this.fullRedraw = true; + this.resizeCanvasNextFrame = false; + this.isCanvasInvalid = false; + this.field120 = 0L; + EventQueue var1 = null; try { - var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 - } catch (Throwable var3) { // L: 93 + var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); + } catch (Throwable var3) { } - this.eventQueue = var1; // L: 94 - BufferedNetSocket.method5960(new DevicePcmPlayerProvider()); // L: 95 - } // L: 96 + this.eventQueue = var1; + World.method1428(new DevicePcmPlayerProvider()); + } - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2123531727" + garbageValue = "705207797" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 99 - this.method582(); + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { + this.method256(); } - this.maxCanvasWidth = var1; // L: 100 - this.maxCanvasHeight = var2; // L: 101 - } // L: 102 + this.maxCanvasWidth = var1; + this.maxCanvasHeight = var2; + } - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "-2062739769" + garbageValue = "-32325713" ) @Export("post") final void post(Object var1) { - if (this.eventQueue != null) { // L: 105 - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 106 - class18.method272(1L); + if (this.eventQueue != null) { + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { + SceneTilePaint.method4322(1L); } if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 107 + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); } } - } // L: 108 + } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lei;", - garbageValue = "6" + descriptor = "(I)Leo;", + garbageValue = "1895135430" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { - if (this.mouseWheelHandler == null) { // L: 111 - this.mouseWheelHandler = new MouseWheelHandler(); // L: 112 - this.mouseWheelHandler.addTo(this.canvas); // L: 113 + if (this.mouseWheelHandler == null) { + this.mouseWheelHandler = new MouseWheelHandler(); + this.mouseWheelHandler.addTo(this.canvas); } - return this.mouseWheelHandler; // L: 115 + return this.mouseWheelHandler; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1788933120" + ) + @Export("setUpClipboard") + protected void setUpClipboard() { + this.clipboard = this.getToolkit().getSystemClipboard(); + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "12" + ) + @Export("clipboardSetString") + protected void clipboardSetString(String var1) { + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1733808528" + ) + @Export("setUpKeyboard") + protected final void setUpKeyboard() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + KeyHandler.KeyHandler_keyCodes[186] = 57; + KeyHandler.KeyHandler_keyCodes[187] = 27; + KeyHandler.KeyHandler_keyCodes[188] = 71; + KeyHandler.KeyHandler_keyCodes[189] = 26; + KeyHandler.KeyHandler_keyCodes[190] = 72; + KeyHandler.KeyHandler_keyCodes[191] = 73; + KeyHandler.KeyHandler_keyCodes[192] = 58; + KeyHandler.KeyHandler_keyCodes[219] = 42; + KeyHandler.KeyHandler_keyCodes[220] = 74; + KeyHandler.KeyHandler_keyCodes[221] = 43; + KeyHandler.KeyHandler_keyCodes[222] = 59; + KeyHandler.KeyHandler_keyCodes[223] = 28; + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; + KeyHandler.KeyHandler_keyCodes[45] = 26; + KeyHandler.KeyHandler_keyCodes[46] = 72; + KeyHandler.KeyHandler_keyCodes[47] = 73; + KeyHandler.KeyHandler_keyCodes[59] = 57; + KeyHandler.KeyHandler_keyCodes[61] = 27; + KeyHandler.KeyHandler_keyCodes[91] = 42; + KeyHandler.KeyHandler_keyCodes[92] = 74; + KeyHandler.KeyHandler_keyCodes[93] = 43; + KeyHandler.KeyHandler_keyCodes[192] = 28; + KeyHandler.KeyHandler_keyCodes[222] = 58; + KeyHandler.KeyHandler_keyCodes[520] = 59; + } + + java.awt.Canvas var1 = this.canvas; + var1.setFocusTraversalKeysEnabled(false); + var1.addKeyListener(KeyHandler.KeyHandler_instance); + var1.addFocusListener(KeyHandler.KeyHandler_instance); } @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "272269884" - ) - @Export("setUpClipboard") - protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119 - } // L: 120 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-476290304" - ) - @Export("clipboardSetString") - protected void clipboardSetString(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123 - } // L: 124 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1189108596" - ) - @Export("setUpKeyboard") - protected final void setUpKeyboard() { - NetCache.method5177(); // L: 127 - SoundCache.method932(this.canvas); // L: 128 - } // L: 129 - - @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "72" + garbageValue = "44" ) @Export("setUpMouse") protected final void setUpMouse() { - PacketBufferNode.method4497(this.canvas); // L: 132 - } // L: 133 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "58" - ) - @Export("resizeCanvas") - final void resizeCanvas() { - Container var1 = this.container(); // L: 136 - if (var1 != null) { // L: 137 - Bounds var2 = this.getFrameContentBounds(); // L: 138 - this.contentWidth = Math.max(var2.highX, this.field334); // L: 139 - this.contentHeight = Math.max(var2.highY, this.field328); // L: 140 - if (this.contentWidth <= 0) { // L: 141 - this.contentWidth = 1; - } - - if (this.contentHeight <= 0) { // L: 142 - this.contentHeight = 1; - } - - AttackOption.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 143 - class0.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 144 - this.canvasX = (this.contentWidth - AttackOption.canvasWidth) / 2; // L: 145 - this.canvasY = 0; // L: 146 - this.canvas.setSize(AttackOption.canvasWidth, class0.canvasHeight); // L: 147 - AbstractWorldMapData.rasterProvider = new RasterProvider(AttackOption.canvasWidth, class0.canvasHeight, this.canvas); // L: 148 - if (var1 == this.frame) { // L: 149 - Insets var3 = this.frame.getInsets(); // L: 150 - this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); // L: 151 - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 153 - } - - this.fullRedraw = true; // L: 154 - this.resizeGame(); // L: 155 - } - } // L: 156 + WorldMapLabel.method3650(this.canvas); + } @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1967831367" + ) + @Export("resizeCanvas") + final void resizeCanvas() { + Container var1 = this.container(); + if (var1 != null) { + Bounds var2 = this.getFrameContentBounds(); + this.contentWidth = Math.max(var2.highX, this.field110); + this.contentHeight = Math.max(var2.highY, this.field107); + if (this.contentWidth <= 0) { + this.contentWidth = 1; + } + + if (this.contentHeight <= 0) { + this.contentHeight = 1; + } + + MouseRecorder.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + Client.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - MouseRecorder.canvasWidth) / 2; + this.canvasY = 0; + this.canvas.setSize(MouseRecorder.canvasWidth, Client.canvasHeight); + class263.rasterProvider = new RasterProvider(MouseRecorder.canvasWidth, Client.canvasHeight, this.canvas); + if (var1 == this.frame) { + Insets var3 = this.frame.getInsets(); + this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); + } + + this.fullRedraw = true; + this.resizeGame(); + } + } + + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-95" + garbageValue = "-8" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "97" + descriptor = "(I)V", + garbageValue = "160337006" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 161 - int var2 = this.canvasY; // L: 162 - int var3 = this.contentWidth - AttackOption.canvasWidth - var1; // L: 163 - int var4 = this.contentHeight - class0.canvasHeight - var2; // L: 164 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 165 + int var1 = this.canvasX; + int var2 = this.canvasY; + int var3 = this.contentWidth - MouseRecorder.canvasWidth - var1; + int var4 = this.contentHeight - Client.canvasHeight - var2; + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { - Container var5 = this.container(); // L: 167 - int var6 = 0; // L: 168 - int var7 = 0; // L: 169 - if (var5 == this.frame) { // L: 170 - Insets var8 = this.frame.getInsets(); // L: 171 - var6 = var8.left; // L: 172 - var7 = var8.top; // L: 173 + Container var5 = this.container(); + int var6 = 0; + int var7 = 0; + if (var5 == this.frame) { + Insets var8 = this.frame.getInsets(); + var6 = var8.left; + var7 = var8.top; } - Graphics var10 = var5.getGraphics(); // L: 175 - var10.setColor(Color.black); // L: 176 + Graphics var10 = var5.getGraphics(); + var10.setColor(Color.black); if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 177 + var10.fillRect(var6, var7, var1, this.contentHeight); } - if (var2 > 0) { // L: 178 + if (var2 > 0) { var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 179 + if (var3 > 0) { var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 180 + if (var4 > 0) { var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 182 + } catch (Exception var9) { } } - } // L: 184 + } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-4788971" + descriptor = "(S)V", + garbageValue = "3066" ) @Export("replaceCanvas") final void replaceCanvas() { - class18.method275(this.canvas); // L: 187 - java.awt.Canvas var1 = this.canvas; // L: 188 - var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 190 - var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 191 - var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 192 - MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 193 - if (this.mouseWheelHandler != null) { // L: 195 + java.awt.Canvas var1 = this.canvas; + var1.removeKeyListener(KeyHandler.KeyHandler_instance); + var1.removeFocusListener(KeyHandler.KeyHandler_instance); + KeyHandler.field50 = -1; + WorldMapSectionType.method3607(this.canvas); + if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 196 - SoundCache.method932(this.canvas); // L: 197 - PacketBufferNode.method4497(this.canvas); // L: 198 - if (this.mouseWheelHandler != null) { // L: 199 + this.addCanvas(); + java.awt.Canvas var2 = this.canvas; + var2.setFocusTraversalKeysEnabled(false); + var2.addKeyListener(KeyHandler.KeyHandler_instance); + var2.addFocusListener(KeyHandler.KeyHandler_instance); + WorldMapLabel.method3650(this.canvas); + if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method582(); // L: 200 - } // L: 201 + this.method256(); + } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-812079878" + garbageValue = "-52889177" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 205 - ++GameEngine_redundantStartThreadCount; // L: 206 - if (GameEngine_redundantStartThreadCount >= 3) { // L: 207 - this.error("alreadyloaded"); // L: 208 - return; // L: 209 + if (gameEngine != null) { + ++GameEngine_redundantStartThreadCount; + if (GameEngine_redundantStartThreadCount >= 3) { + this.error("alreadyloaded"); + return; } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 211 - return; // L: 212 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); + return; } - gameEngine = this; // L: 214 - AttackOption.canvasWidth = var1; // L: 215 - class0.canvasHeight = var2; // L: 216 - RunException.RunException_revision = var3; // L: 217 - RunException.RunException_applet = this; // L: 218 - if (taskHandler == null) { // L: 219 + gameEngine = this; + MouseRecorder.canvasWidth = var1; + Client.canvasHeight = var2; + RunException.RunException_revision = var3; + RunException.RunException_applet = this; + if (taskHandler == null) { taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); // L: 220 - } catch (Exception var5) { // L: 222 - FriendsChat.RunException_sendStackTrace((String)null, var5); // L: 223 - this.error("crash"); // L: 224 + taskHandler.newThreadTask(this, 1); + } catch (Exception var5) { + BufferedSink.RunException_sendStackTrace((String)null, var5); + this.error("crash"); } - } // L: 226 + } - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2087382687" + garbageValue = "685533083" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 229 - if (this.canvas != null) { // L: 230 - this.canvas.removeFocusListener(this); // L: 231 - var1.remove(this.canvas); // L: 232 + Container var1 = this.container(); + if (this.canvas != null) { + this.canvas.removeFocusListener(this); + var1.remove(this.canvas); } - AttackOption.canvasWidth = Math.max(var1.getWidth(), this.field334); // L: 234 - class0.canvasHeight = Math.max(var1.getHeight(), this.field328); // L: 235 + MouseRecorder.canvasWidth = Math.max(var1.getWidth(), this.field110); + Client.canvasHeight = Math.max(var1.getHeight(), this.field107); Insets var2; - if (this.frame != null) { // L: 236 - var2 = this.frame.getInsets(); // L: 237 - AttackOption.canvasWidth -= var2.left + var2.right; // L: 238 - class0.canvasHeight -= var2.top + var2.bottom; // L: 239 + if (this.frame != null) { + var2 = this.frame.getInsets(); + MouseRecorder.canvasWidth -= var2.right + var2.left; + Client.canvasHeight -= var2.bottom + var2.top; } - this.canvas = new Canvas(this); // L: 241 - var1.setBackground(Color.BLACK); // L: 242 - var1.setLayout((LayoutManager)null); // L: 243 - var1.add(this.canvas); // L: 244 - this.canvas.setSize(AttackOption.canvasWidth, class0.canvasHeight); // L: 245 - this.canvas.setVisible(true); // L: 246 - this.canvas.setBackground(Color.BLACK); // L: 247 - if (var1 == this.frame) { // L: 248 - var2 = this.frame.getInsets(); // L: 249 - this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 250 + this.canvas = new Canvas(this); + var1.setBackground(Color.BLACK); + var1.setLayout((LayoutManager)null); + var1.add(this.canvas); + this.canvas.setSize(MouseRecorder.canvasWidth, Client.canvasHeight); + this.canvas.setVisible(true); + this.canvas.setBackground(Color.BLACK); + if (var1 == this.frame) { + var2 = this.frame.getInsets(); + this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 252 + this.canvas.setLocation(this.canvasX, this.canvasY); } - this.canvas.addFocusListener(this); // L: 253 - this.canvas.requestFocus(); // L: 254 - this.fullRedraw = true; // L: 255 - if (AbstractWorldMapData.rasterProvider != null && AttackOption.canvasWidth == AbstractWorldMapData.rasterProvider.width && class0.canvasHeight == AbstractWorldMapData.rasterProvider.height) { // L: 256 - ((RasterProvider)AbstractWorldMapData.rasterProvider).setComponent(this.canvas); // L: 257 - AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 258 + this.canvas.addFocusListener(this); + this.canvas.requestFocus(); + this.fullRedraw = true; + if (class263.rasterProvider != null && MouseRecorder.canvasWidth == class263.rasterProvider.width && Client.canvasHeight == class263.rasterProvider.height) { + ((RasterProvider)class263.rasterProvider).setComponent(this.canvas); + class263.rasterProvider.drawFull(0, 0); } else { - AbstractWorldMapData.rasterProvider = new RasterProvider(AttackOption.canvasWidth, class0.canvasHeight, this.canvas); // L: 261 + class263.rasterProvider = new RasterProvider(MouseRecorder.canvasWidth, Client.canvasHeight, this.canvas); } - this.isCanvasInvalid = false; // L: 263 - this.field348 = ClientPacket.currentTimeMillis(); // L: 264 - } // L: 265 + this.isCanvasInvalid = false; + this.field120 = UrlRequester.method2125(); + } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1590867757" + garbageValue = "2067430375" ) @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 268 - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 269 - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 270 - if (var1.endsWith("127.0.0.1")) { // L: 271 + String var1 = this.getDocumentBase().getHost().toLowerCase(); + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { + if (var1.endsWith("127.0.0.1")) { 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: 272 + var1 = var1.substring(0, var1.length() - 1); } - if (var1.endsWith("192.168.1.")) { // L: 273 + if (var1.endsWith("192.168.1.")) { return true; } else { - this.error("invalidhost"); // L: 274 - return false; // L: 275 + this.error("invalidhost"); + return false; } } } else { @@ -541,438 +584,684 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "85" + descriptor = "(I)V", + garbageValue = "-1079433901" ) @Export("clientTick") void clientTick() { - long var1 = ClientPacket.currentTimeMillis(); // L: 328 - long var3 = clientTickTimes[CollisionMap.clientTickTimeIdx]; // L: 329 - clientTickTimes[CollisionMap.clientTickTimeIdx] = var1; // L: 330 - CollisionMap.clientTickTimeIdx = CollisionMap.clientTickTimeIdx + 1 & 31; // L: 331 - if (var3 != 0L && var1 > var3) { // L: 332 + long var1 = UrlRequester.method2125(); + long var3 = clientTickTimes[Buddy.field3863]; + clientTickTimes[Buddy.field3863] = var1; + Buddy.field3863 = Buddy.field3863 + 1 & 31; + if (var3 != 0L && var1 > var3) { } - synchronized(this) { // L: 333 - class397.hasFocus = volatileFocus; // L: 334 - } // L: 335 + synchronized(this) { + class255.hasFocus = volatileFocus; + } - this.doCycle(); // L: 336 - } // L: 337 + this.doCycle(); + } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1414104897" + garbageValue = "-1862154561" ) @Export("graphicsTick") void graphicsTick() { - Container var1 = this.container(); // L: 340 - long var2 = ClientPacket.currentTimeMillis(); // L: 341 - long var4 = graphicsTickTimes[ReflectionCheck.graphicsTickTimeIdx]; // L: 342 - graphicsTickTimes[ReflectionCheck.graphicsTickTimeIdx] = var2; // L: 343 - ReflectionCheck.graphicsTickTimeIdx = ReflectionCheck.graphicsTickTimeIdx + 1 & 31; // L: 344 - if (0L != var4 && var2 > var4) { // L: 345 - int var6 = (int)(var2 - var4); // L: 346 - fps = ((var6 >> 1) + 32000) / var6; // L: 347 + Container var1 = this.container(); + long var2 = UrlRequester.method2125(); + long var4 = graphicsTickTimes[FileSystem.field1484]; + graphicsTickTimes[FileSystem.field1484] = var2; + FileSystem.field1484 = FileSystem.field1484 + 1 & 31; + if (var4 != 0L && var2 > var4) { + int var6 = (int)(var2 - var4); + fps = ((var6 >> 1) + 32000) / var6; } - if (++field341 - 1 > 50) { // L: 349 - field341 -= 50; // L: 350 - this.fullRedraw = true; // L: 351 - this.canvas.setSize(AttackOption.canvasWidth, class0.canvasHeight); // L: 352 - this.canvas.setVisible(true); // L: 353 - if (var1 == this.frame) { // L: 354 - Insets var7 = this.frame.getInsets(); // L: 355 - this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); // L: 356 + if (++field117 - 1 > 50) { + field117 -= 50; + this.fullRedraw = true; + this.canvas.setSize(MouseRecorder.canvasWidth, Client.canvasHeight); + this.canvas.setVisible(true); + if (var1 == this.frame) { + Insets var7 = this.frame.getInsets(); + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 358 + this.canvas.setLocation(this.canvasX, this.canvasY); } } - if (this.isCanvasInvalid) { // L: 360 + if (this.isCanvasInvalid) { this.replaceCanvas(); } - this.method581(); // L: 361 - this.draw(this.fullRedraw); // L: 362 - if (this.fullRedraw) { // L: 363 + this.method210(); + this.draw(this.fullRedraw); + if (this.fullRedraw) { this.clearBackground(); } - this.fullRedraw = false; // L: 364 - } // L: 365 + this.fullRedraw = false; + } - @ObfuscatedName("c") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "179024739" + garbageValue = "-295553069" ) - final void method581() { - Bounds var1 = this.getFrameContentBounds(); // L: 368 - if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 369 - this.resizeCanvas(); // L: 370 - this.resizeCanvasNextFrame = false; // L: 371 + final void method210() { + Bounds var1 = this.getFrameContentBounds(); + if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { + this.resizeCanvas(); + this.resizeCanvasNextFrame = false; } - } // L: 373 + } - @ObfuscatedName("n") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1411086569" + garbageValue = "-1139596163" ) - final void method582() { - this.resizeCanvasNextFrame = true; // L: 376 - } // L: 377 + final void method256() { + this.resizeCanvasNextFrame = true; + } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1781774601" + garbageValue = "-1754382036" ) @Export("kill") final synchronized void kill() { - if (!isKilled) { // L: 380 - isKilled = true; // L: 381 + if (!isKilled) { + isKilled = true; try { - this.canvas.removeFocusListener(this); // L: 383 - } catch (Exception var5) { // L: 385 + this.canvas.removeFocusListener(this); + } catch (Exception var5) { } try { - this.kill0(); // L: 387 - } catch (Exception var4) { // L: 389 + this.kill0(); + } catch (Exception var4) { } - if (this.frame != null) { // L: 390 + if (this.frame != null) { try { - System.exit(0); // L: 392 - } catch (Throwable var3) { // L: 394 + System.exit(0); + } catch (Throwable var3) { } } - if (taskHandler != null) { // L: 396 + if (taskHandler != null) { try { - taskHandler.close(); // L: 398 - } catch (Exception var2) { // L: 400 + taskHandler.close(); + } catch (Exception var2) { } } - this.vmethod1278(); // L: 402 + this.vmethod899(); } - } // L: 403 + } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1587549695" + descriptor = "(B)V", + garbageValue = "-1" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("aw") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2087654500" + garbageValue = "1217845372" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "49" + descriptor = "(ZI)V", + garbageValue = "-1475528453" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1785168903" + descriptor = "(B)V", + garbageValue = "46" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("at") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "1399625911" + garbageValue = "-232047700" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); // L: 470 - if (class13.fontHelvetica13 == null) { // L: 471 - class13.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 472 - class265.loginScreenFontMetrics = this.canvas.getFontMetrics(class13.fontHelvetica13); // L: 473 + Graphics var4 = this.canvas.getGraphics(); + if (class6.fontHelvetica13 == null) { + class6.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + UserComparator10.loginScreenFontMetrics = this.canvas.getFontMetrics(class6.fontHelvetica13); } - if (var3) { // L: 475 - var4.setColor(Color.black); // L: 476 - var4.fillRect(0, 0, AttackOption.canvasWidth, class0.canvasHeight); // L: 477 + if (var3) { + var4.setColor(Color.black); + var4.fillRect(0, 0, MouseRecorder.canvasWidth, Client.canvasHeight); } - Color var5 = new Color(140, 17, 17); // L: 479 + Color var5 = new Color(140, 17, 17); try { - if (MilliClock.field1527 == null) { // L: 481 - MilliClock.field1527 = this.canvas.createImage(304, 34); + if (class54.field794 == null) { + class54.field794 = this.canvas.createImage(304, 34); } - Graphics var6 = MilliClock.field1527.getGraphics(); // L: 482 - var6.setColor(var5); // L: 483 - var6.drawRect(0, 0, 303, 33); // L: 484 - var6.fillRect(2, 2, var1 * 3, 30); // L: 485 - var6.setColor(Color.black); // L: 486 - var6.drawRect(1, 1, 301, 31); // L: 487 - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 488 - var6.setFont(class13.fontHelvetica13); // L: 489 - var6.setColor(Color.white); // L: 490 - var6.drawString(var2, (304 - class265.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 491 - var4.drawImage(MilliClock.field1527, AttackOption.canvasWidth / 2 - 152, class0.canvasHeight / 2 - 18, (ImageObserver)null); // L: 492 - } catch (Exception var9) { // L: 494 - int var7 = AttackOption.canvasWidth / 2 - 152; // L: 495 - int var8 = class0.canvasHeight / 2 - 18; // L: 496 - var4.setColor(var5); // L: 497 - var4.drawRect(var7, var8, 303, 33); // L: 498 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 499 - var4.setColor(Color.black); // L: 500 - var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 501 - var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 502 - var4.setFont(class13.fontHelvetica13); // L: 503 - var4.setColor(Color.white); // L: 504 - var4.drawString(var2, var7 + (304 - class265.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 505 + Graphics var6 = class54.field794.getGraphics(); + var6.setColor(var5); + var6.drawRect(0, 0, 303, 33); + var6.fillRect(2, 2, var1 * 3, 30); + var6.setColor(Color.black); + var6.drawRect(1, 1, 301, 31); + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); + var6.setFont(class6.fontHelvetica13); + var6.setColor(Color.white); + var6.drawString(var2, (304 - UserComparator10.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(class54.field794, MouseRecorder.canvasWidth / 2 - 152, Client.canvasHeight / 2 - 18, (ImageObserver)null); + } catch (Exception var9) { + int var7 = MouseRecorder.canvasWidth / 2 - 152; + int var8 = Client.canvasHeight / 2 - 18; + var4.setColor(var5); + var4.drawRect(var7, var8, 303, 33); + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); + var4.setColor(Color.black); + var4.drawRect(var7 + 1, var8 + 1, 301, 31); + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); + var4.setFont(class6.fontHelvetica13); + var4.setColor(Color.white); + var4.drawString(var2, var7 + (304 - UserComparator10.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } - } catch (Exception var10) { // L: 508 - this.canvas.repaint(); // L: 509 + } catch (Exception var10) { + this.canvas.repaint(); } - } // L: 511 + } - @ObfuscatedName("ah") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1903578766" + garbageValue = "-1859584500" ) - protected final void method672() { - MilliClock.field1527 = null; // L: 514 - class13.fontHelvetica13 = null; // L: 515 - class265.loginScreenFontMetrics = null; // L: 516 - } // L: 517 + protected final void method224() { + class54.field794 = null; + class6.fontHelvetica13 = null; + UserComparator10.loginScreenFontMetrics = null; + } - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1320809291" + garbageValue = "-1367970758" ) @Export("error") protected void error(String var1) { - if (!this.hasErrored) { // L: 520 - this.hasErrored = true; // L: 521 - System.out.println("error_game_" + var1); // L: 522 + if (!this.hasErrored) { + this.hasErrored = true; + System.out.println("error_game_" + var1); try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 524 - } catch (Exception var3) { // L: 526 + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); + } catch (Exception var3) { } } - } // L: 527 + } - @ObfuscatedName("ap") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)Ljava/awt/Container;", - garbageValue = "1" + garbageValue = "75" ) @Export("container") Container container() { - return (Container)(this.frame != null ? this.frame : this); // L: 530 + return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(B)Llw;", - garbageValue = "-6" + descriptor = "(B)Llo;", + garbageValue = "-70" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { - Container var1 = this.container(); // L: 535 - int var2 = Math.max(var1.getWidth(), this.field334); // L: 536 - int var3 = Math.max(var1.getHeight(), this.field328); // L: 537 - if (this.frame != null) { // L: 538 - Insets var4 = this.frame.getInsets(); // L: 539 - var2 -= var4.right + var4.left; // L: 540 - var3 -= var4.bottom + var4.top; // L: 541 + Container var1 = this.container(); + int var2 = Math.max(var1.getWidth(), this.field110); + int var3 = Math.max(var1.getHeight(), this.field107); + if (this.frame != null) { + Insets var4 = this.frame.getInsets(); + var2 -= var4.right + var4.left; + var3 -= var4.bottom + var4.top; } - return new Bounds(var2, var3); // L: 543 + return new Bounds(var2, var3); } - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-969524667" + garbageValue = "-1916598411" ) @Export("hasFrame") protected final boolean hasFrame() { - return this.frame != null; // L: 547 + return this.frame != null; } - @ObfuscatedName("ae") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1888551887" + descriptor = "(B)V", + garbageValue = "-19" ) - protected abstract void vmethod1278(); + protected abstract void vmethod899(); + + public final void destroy() { + if (this == gameEngine && !isKilled) { + stopTimeMs = UrlRequester.method2125(); + SceneTilePaint.method4322(5000L); + this.kill(); + } + } public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { // L: 434 - this.fullRedraw = true; // L: 435 - if (ClientPacket.currentTimeMillis() - this.field348 > 1000L) { // L: 436 - Rectangle var2 = var1.getClipBounds(); // L: 437 - if (var2 == null || var2.width >= AttackOption.canvasWidth && var2.height >= class0.canvasHeight) { - this.isCanvasInvalid = true; // L: 438 + if (this == gameEngine && !isKilled) { + this.fullRedraw = true; + if (UrlRequester.method2125() - this.field120 > 1000L) { + Rectangle var2 = var1.getClipBounds(); + if (var2 == null || var2.width >= MouseRecorder.canvasWidth && var2.height >= Client.canvasHeight) { + this.isCanvasInvalid = true; } } } - } // L: 440 + } - public final void destroy() { - if (this == gameEngine && !isKilled) { // L: 423 - stopTimeMs = ClientPacket.currentTimeMillis(); // L: 424 - class18.method272(5000L); // L: 425 - this.kill(); // L: 426 - } - } // L: 427 - - public abstract void init(); + public final void focusGained(FocusEvent var1) { + volatileFocus = true; + this.fullRedraw = true; + } public void run() { try { - if (TaskHandler.javaVendor != null) { // L: 280 - String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 281 - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 282 - String var2 = TaskHandler.javaVersion; // L: 283 - 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: 284 - this.error("wrongjava"); // L: 285 - return; // L: 286 + if (TaskHandler.javaVendor != null) { + String var1 = TaskHandler.javaVendor.toLowerCase(); + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { + String var2 = TaskHandler.javaVersion; + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { + this.error("wrongjava"); + return; } - if (var2.startsWith("1.6.0_")) { // L: 288 + if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class105.isDigit(var2.charAt(var3)); ++var3) { // L: 289 290 + for (var3 = 6; var3 < var2.length() && GrandExchangeOfferAgeComparator.isDigit(var2.charAt(var3)); ++var3) { } - String var4 = var2.substring(6, var3); // L: 291 - if (Varps.isNumber(var4) && FontName.method6335(var4) < 10) { // L: 292 - this.error("wrongjava"); // L: 293 - return; // L: 294 + String var4 = var2.substring(6, var3); + if (class249.isNumber(var4) && NetCache.method5088(var4) < 10) { + this.error("wrongjava"); + return; } } - fiveOrOne = 5; // L: 297 + fiveOrOne = 5; } } - this.setFocusCycleRoot(true); // L: 300 - this.addCanvas(); // L: 301 - this.setUp(); // L: 302 + this.setFocusCycleRoot(true); + this.addCanvas(); + this.setUp(); Object var8; try { - var8 = new NanoClock(); // L: 306 - } catch (Throwable var6) { // L: 308 - var8 = new MilliClock(); // L: 309 + var8 = new NanoClock(); + } catch (Throwable var6) { + var8 = new MilliClock(); } - class160.clock = (Clock)var8; // L: 312 + Messages.clock = (Clock)var8; - while (0L == stopTimeMs || ClientPacket.currentTimeMillis() < stopTimeMs) { // L: 313 - class372.gameCyclesToDo = class160.clock.wait(cycleDurationMillis, fiveOrOne); // L: 314 + while (stopTimeMs == 0L || UrlRequester.method2125() < stopTimeMs) { + Skills.gameCyclesToDo = Messages.clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < class372.gameCyclesToDo; ++var5) { // L: 315 + for (int var5 = 0; var5 < Skills.gameCyclesToDo; ++var5) { this.clientTick(); } - this.graphicsTick(); // L: 316 - this.post(this.canvas); // L: 317 + this.graphicsTick(); + this.post(this.canvas); } - } catch (Exception var7) { // L: 320 - FriendsChat.RunException_sendStackTrace((String)null, var7); // L: 321 - this.error("crash"); // L: 322 + } catch (Exception var7) { + BufferedSink.RunException_sendStackTrace((String)null, var7); + this.error("crash"); } - this.kill(); // L: 324 - } // L: 325 - - public final void update(Graphics var1) { - this.paint(var1); // L: 430 - } // L: 431 + this.kill(); + } public final void start() { - if (this == gameEngine && !isKilled) { // L: 413 - stopTimeMs = 0L; // L: 414 + if (this == gameEngine && !isKilled) { + stopTimeMs = 0L; } - } // L: 415 - - public final void windowActivated(WindowEvent var1) { - } // L: 451 - - public final void windowClosing(WindowEvent var1) { - this.destroy(); // L: 455 - } // L: 456 - - public final void windowDeiconified(WindowEvent var1) { - } // L: 459 + } public final void windowOpened(WindowEvent var1) { - } // L: 461 - - public final void windowClosed(WindowEvent var1) { - } // L: 452 - - public final void windowDeactivated(WindowEvent var1) { - } // L: 458 + } public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 448 - } // L: 449 + volatileFocus = false; + } - public final void stop() { - if (this == gameEngine && !isKilled) { // L: 418 - stopTimeMs = ClientPacket.currentTimeMillis() + 4000L; // L: 419 - } - } // L: 420 + public final void windowClosed(WindowEvent var1) { + } + + public final void windowDeactivated(WindowEvent var1) { + } + + public final void windowDeiconified(WindowEvent var1) { + } public final void windowIconified(WindowEvent var1) { - } // L: 460 + } - public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 443 - this.fullRedraw = true; // L: 444 - } // L: 445 + public final void windowActivated(WindowEvent var1) { + } + + public final void windowClosing(WindowEvent var1) { + this.destroy(); + } + + public final void update(Graphics var1) { + this.paint(var1); + } + + public abstract void init(); + + public final void stop() { + if (this == gameEngine && !isKilled) { + stopTimeMs = UrlRequester.method2125() + 4000L; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "-14039" + ) + public static boolean method345() { + try { + if (class234.musicPlayerStatus == 2) { + if (WorldMapLabel.musicTrack == null) { + WorldMapLabel.musicTrack = MusicTrack.readTrack(class234.musicTrackArchive, class234.musicTrackGroupId, UserComparator6.musicTrackFileId); + if (WorldMapLabel.musicTrack == null) { + return false; + } + } + + if (KitDefinition.soundCache == null) { + KitDefinition.soundCache = new SoundCache(class234.soundEffectsArchive, class234.musicSamplesArchive); + } + + if (class234.midiPcmStream.loadMusicTrack(WorldMapLabel.musicTrack, class234.musicPatchesArchive, KitDefinition.soundCache, 22050)) { + class234.midiPcmStream.clearAll(); + class234.midiPcmStream.setPcmStreamVolume(HorizontalAlignment.musicTrackVolume); + class234.midiPcmStream.setMusicTrack(WorldMapLabel.musicTrack, EnumComposition.musicTrackBoolean); + class234.musicPlayerStatus = 0; + WorldMapLabel.musicTrack = null; + KitDefinition.soundCache = null; + class234.musicTrackArchive = null; + return true; + } + } + } catch (Exception var1) { + var1.printStackTrace(); + class234.midiPcmStream.clear(); + class234.musicPlayerStatus = 0; + WorldMapLabel.musicTrack = null; + KitDefinition.soundCache = null; + class234.musicTrackArchive = null; + } + + return false; + } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIII)J", - garbageValue = "-1582150364" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-428766711" ) - static long method716(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + ArchiveDiskActionHandler.charToByteCp1252(var0.charAt(var3)); + } + + return var2; } - @ObfuscatedName("hu") + @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1255982290" + descriptor = "(Lio;III)V", + garbageValue = "1590834282" ) - static final boolean method717() { - return Client.isMenuOpen; // L: 7756 + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + class7.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var3 = PcmPlayer.Widget_getSpellActionName(var0); + if (var3 != null) { + class7.insertMenuItemNoShift(var3, ScriptFrame.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + } + } + + if (var0.buttonType == 3) { + class7.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } + + if (var0.buttonType == 4) { + class7.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + class7.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + class7.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + int var4; + int var5; + int var6; + int var7; + int var15; + if (var0.type == 2) { + var15 = 0; + + for (var4 = 0; var4 < var0.height; ++var4) { + for (var5 = 0; var5 < var0.width; ++var5) { + var6 = (var0.paddingX + 32) * var5; + var7 = (var0.paddingY + 32) * var4; + if (var15 < 20) { + var6 += var0.inventoryXOffsets[var15]; + var7 += var0.inventoryYOffsets[var15]; + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { + Client.dragItemSlotDestination = var15; + Client.hoveredItemContainer = var0; + if (var0.itemIds[var15] > 0) { + ItemComposition var8 = KeyHandler.ItemDefinition_get(var0.itemIds[var15] - 1); + if (Client.isItemSelected == 1 && ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { + if (var0.id != Tiles.selectedItemWidget || var15 != KeyHandler.selectedItemSlot) { + class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); + } + } else if (Client.isSpellSelected && ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { + if ((ViewportMouse.selectedSpellFlags & 16) == 16) { + class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); + } + } else { + String[] var9 = var8.inventoryActions; + int var10 = -1; + if (Client.shiftClickDrop && class79.method1979()) { + var10 = var8.getShiftClickIndex(); + } + + if (ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { + for (int var11 = 4; var11 >= 3; --var11) { + if (var11 != var10) { + class376.addWidgetItemMenuItem(var0, var8, var15, var11, false); + } + } + } + + int var12 = MusicPatchNode.getWidgetFlags(var0); + boolean var22 = (var12 >> 31 & 1) != 0; + if (var22) { + class7.insertMenuItemNoShift("Use", ScriptFrame.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); + } + + Object var10000 = null; + int var13; + if (ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { + for (var13 = 2; var13 >= 0; --var13) { + if (var13 != var10) { + class376.addWidgetItemMenuItem(var0, var8, var15, var13, false); + } + } + + if (var10 >= 0) { + class376.addWidgetItemMenuItem(var0, var8, var15, var10, true); + } + } + + var9 = var0.itemActions; + if (var9 != null) { + for (var13 = 4; var13 >= 0; --var13) { + if (var9[var13] != null) { + byte var14 = 0; + if (var13 == 0) { + var14 = 39; + } + + if (var13 == 1) { + var14 = 40; + } + + if (var13 == 2) { + var14 = 41; + } + + if (var13 == 3) { + var14 = 42; + } + + if (var13 == 4) { + var14 = 43; + } + + class7.insertMenuItemNoShift(var9[var13], ScriptFrame.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); + } + } + } + + class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); + } + } + } + + ++var15; + } + } + } + + if (var0.isIf3) { + if (Client.isSpellSelected) { + if (class110.method2322(MusicPatchNode.getWidgetFlags(var0)) && (ViewportMouse.selectedSpellFlags & 32) == 32) { + class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + } + } else { + for (var15 = 9; var15 >= 5; --var15) { + var6 = MusicPatchNode.getWidgetFlags(var0); + boolean var20 = (var6 >> var15 + 1 & 1) != 0; + String var18; + if (!var20 && var0.onOp == null) { + var18 = null; + } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { + var18 = var0.actions[var15]; + } else { + var18 = null; + } + + if (var18 != null) { + class7.insertMenuItemNoShift(var18, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); + } + } + + var3 = PcmPlayer.Widget_getSpellActionName(var0); + if (var3 != null) { + class7.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + } + + for (var4 = 4; var4 >= 0; --var4) { + var7 = MusicPatchNode.getWidgetFlags(var0); + boolean var21 = (var7 >> var4 + 1 & 1) != 0; + String var16; + if (!var21 && var0.onOp == null) { + var16 = null; + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { + var16 = var0.actions[var4]; + } else { + var16 = null; + } + + if (var16 != null) { + PcmPlayer.insertMenuItem(var16, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); + } + } + + var5 = MusicPatchNode.getWidgetFlags(var0); + boolean var19 = (var5 & 1) != 0; + if (var19) { + class7.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } + } + + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1091902185" + ) + static final void method343() { + Client.field603 = Client.cycleCntr; + UserComparator8.ClanChat_inClanChat = true; } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index b443892827..9f36c4799b 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -3,897 +3,162 @@ 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("hf") +@ObfuscatedName("hh") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1608001459 + intValue = -1421972333 ) @Export("plane") int plane; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1563453913 + intValue = -1203625827 ) @Export("height") int height; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1270457979 + intValue = 1101114041 ) @Export("centerX") int centerX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1248595947 + intValue = 1652145053 ) @Export("centerY") int centerY; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1891554599 + intValue = -515786911 ) @Export("orientation") int orientation; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 835758211 + intValue = -530095189 ) @Export("startX") int startX; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1267971371 + intValue = 803439659 ) @Export("endX") int endX; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -509888291 + intValue = 1516171493 ) @Export("startY") int startY; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2077981723 + intValue = -1126880699 ) @Export("endY") int endY; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 569603025 + intValue = 2104357143 ) - int field2552; - @ObfuscatedName("b") + int field2541; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1288318445 + intValue = -1530415993 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 4383749992013445467L + longValue = -7431595291754481309L ) @Export("tag") public long tag; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1389469279 + intValue = -1220854209 ) @Export("flags") int flags; GameObject() { - this.tag = 0L; // L: 16 - this.flags = 0; // L: 17 - } // L: 19 + this.tag = 0L; + this.flags = 0; + } - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-126" + descriptor = "(I)[Lhv;", + garbageValue = "-873058170" ) - public static void method4431() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 116 - if (ArchiveDiskActionHandler.field3557 != 0) { // L: 117 - ArchiveDiskActionHandler.field3557 = 1; // L: 118 + public static class227[] method4342() { + return new class227[]{class227.field2679, class227.field2675, class227.field2678, class227.field2676, class227.field2677, class227.field2680, class227.field2674, class227.field2683, class227.field2681, class227.field2682}; + } - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 120 - } catch (InterruptedException var3) { // L: 122 - } - } - - } - } // L: 125 - - @ObfuscatedName("j") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1327988393" + descriptor = "(ILbd;ZI)I", + garbageValue = "-1928503982" ) - static void method4433() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 195 - Login.currentLoginField = 1; // L: 196 - } else { - Login.currentLoginField = 0; // L: 199 - } - - } // L: 201 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1544544242" - ) - static void method4432() { - Login.loginIndex = 24; // L: 1527 - CollisionMap.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1528 - } // L: 1529 - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-1747523197" - ) - @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: 7935 - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { // L: 7936 - Client.mouseCrossX = var6; // L: 8020 - Client.mouseCrossY = var7; // L: 8021 - Client.mouseCrossColor = 2; // L: 8022 - Client.mouseCrossState = 0; // L: 8023 - Client.destinationX = var0; // L: 8024 - Client.destinationY = var1; // L: 8025 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher); // L: 8027 - var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8028 - var8.packetBuffer.writeShort(var3); // L: 8029 - var8.packetBuffer.method6649(Timer.selectedItemSlot); // L: 8030 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8031 - var8.packetBuffer.method6658(class246.selectedItemWidget); // L: 8032 - var8.packetBuffer.writeShort(WorldMapSprite.baseY + var1); // L: 8033 - var8.packetBuffer.method6648(Buddy.selectedItemId); // L: 8034 - Client.packetWriter.addNode(var8); // L: 8035 - } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 8632 - Client.mouseCrossY = var7; // L: 8633 - Client.mouseCrossColor = 2; // L: 8634 - Client.mouseCrossState = 0; // L: 8635 - Client.destinationX = var0; // L: 8636 - Client.destinationY = var1; // L: 8637 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 8638 - var8.packetBuffer.method6648(Client.field634); // L: 8639 - var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8640 - var8.packetBuffer.method6705(Client.selectedSpellChildIndex); // L: 8641 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8642 - var8.packetBuffer.method6658(class15.selectedSpellWidget); // L: 8643 - var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8644 - var8.packetBuffer.method6649(var3); // L: 8645 - Client.packetWriter.addNode(var8); // L: 8646 - } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 8427 - Client.mouseCrossY = var7; // L: 8428 - Client.mouseCrossColor = 2; // L: 8429 - Client.mouseCrossState = 0; // L: 8430 - Client.destinationX = var0; // L: 8431 - Client.destinationY = var1; // L: 8432 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2578, Client.packetWriter.isaacCipher); // L: 8434 - var8.packetBuffer.writeShort(WorldMapSprite.baseY + var1); // L: 8435 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8436 - var8.packetBuffer.method6648(var0 + class15.baseX); // L: 8437 - var8.packetBuffer.writeShort(var3); // L: 8438 - Client.packetWriter.addNode(var8); // L: 8439 - } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 8669 - Client.mouseCrossY = var7; // L: 8670 - Client.mouseCrossColor = 2; // L: 8671 - Client.mouseCrossState = 0; // L: 8672 - Client.destinationX = var0; // L: 8673 - Client.destinationY = var1; // L: 8674 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); // L: 8676 - var8.packetBuffer.method6648(WorldMapSprite.baseY + var1); // L: 8677 - var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8678 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8679 - var8.packetBuffer.method6648(var3); // L: 8680 - Client.packetWriter.addNode(var8); // L: 8681 - } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 8314 - Client.mouseCrossY = var7; // L: 8315 - Client.mouseCrossColor = 2; // L: 8316 - Client.mouseCrossState = 0; // L: 8317 - Client.destinationX = var0; // L: 8318 - Client.destinationY = var1; // L: 8319 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); // L: 8321 - var8.packetBuffer.writeShort(var0 + class15.baseX); // L: 8322 - var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8323 - var8.packetBuffer.writeShort(var3); // L: 8324 - var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8325 - Client.packetWriter.addNode(var8); // L: 8326 - } else if (var2 == 6) { - 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 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); // L: 8624 - var8.packetBuffer.writeShort(var3); // L: 8625 - var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8626 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8627 - var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8628 - Client.packetWriter.addNode(var8); // L: 8629 - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 8558 - if (var13 != null) { // L: 8559 - Client.mouseCrossX = var6; // L: 8560 - Client.mouseCrossY = var7; // L: 8561 - Client.mouseCrossColor = 2; // L: 8562 - Client.mouseCrossState = 0; // L: 8563 - Client.destinationX = var0; // L: 8564 - Client.destinationY = var1; // L: 8565 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2666, Client.packetWriter.isaacCipher); // L: 8567 - var9.packetBuffer.method6648(var3); // L: 8568 - var9.packetBuffer.method6648(Buddy.selectedItemId); // L: 8569 - var9.packetBuffer.method6658(class246.selectedItemWidget); // L: 8570 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8571 - var9.packetBuffer.writeShort(Timer.selectedItemSlot); // L: 8572 - Client.packetWriter.addNode(var9); // L: 8573 + static int method4341(int var0, Script var1, boolean var2) { + Widget var7; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { + int var4; + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { + var7 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var4 >= 1 && var4 <= 10) { + class79 var8 = new class79(var4, var7.id, var7.childIndex, var7.itemId); + Interpreter.field754.add(var8); + return 1; + } else { + throw new RuntimeException(); } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 8052 - if (var13 != null) { // L: 8053 - Client.mouseCrossX = var6; // L: 8054 - Client.mouseCrossY = var7; // L: 8055 - Client.mouseCrossColor = 2; // L: 8056 - Client.mouseCrossState = 0; // L: 8057 - Client.destinationX = var0; // L: 8058 - Client.destinationY = var1; // L: 8059 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2617, Client.packetWriter.isaacCipher); // L: 8060 - var9.packetBuffer.method6649(Client.selectedSpellChildIndex); // L: 8061 - var9.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8062 - var9.packetBuffer.writeShort(Client.field634); // L: 8063 - var9.packetBuffer.method6649(var3); // L: 8064 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8065 - Client.packetWriter.addNode(var9); // L: 8066 - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 8108 - if (var13 != null) { // L: 8109 - Client.mouseCrossX = var6; // L: 8110 - Client.mouseCrossY = var7; // L: 8111 - Client.mouseCrossColor = 2; // L: 8112 - Client.mouseCrossState = 0; // L: 8113 - Client.destinationX = var0; // L: 8114 - Client.destinationY = var1; // L: 8115 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); // L: 8117 - var9.packetBuffer.method6648(var3); // L: 8118 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8119 - Client.packetWriter.addNode(var9); // L: 8120 - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 8272 - if (var13 != null) { // L: 8273 - Client.mouseCrossX = var6; // L: 8274 - Client.mouseCrossY = var7; // L: 8275 - Client.mouseCrossColor = 2; // L: 8276 - Client.mouseCrossState = 0; // L: 8277 - Client.destinationX = var0; // L: 8278 - Client.destinationY = var1; // L: 8279 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher); // L: 8281 - var9.packetBuffer.method6649(var3); // L: 8282 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8283 - Client.packetWriter.addNode(var9); // L: 8284 - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 8442 - if (var13 != null) { // L: 8443 - Client.mouseCrossX = var6; // L: 8444 - Client.mouseCrossY = var7; // L: 8445 - Client.mouseCrossColor = 2; // L: 8446 - Client.mouseCrossState = 0; // L: 8447 - Client.destinationX = var0; // L: 8448 - Client.destinationY = var1; // L: 8449 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8451 - var9.packetBuffer.method6648(var3); // L: 8452 - var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8453 - Client.packetWriter.addNode(var9); // L: 8454 - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 7953 - if (var13 != null) { // L: 7954 - Client.mouseCrossX = var6; // L: 7955 - Client.mouseCrossY = var7; // L: 7956 - Client.mouseCrossColor = 2; // L: 7957 - Client.mouseCrossState = 0; // L: 7958 - Client.destinationX = var0; // L: 7959 - Client.destinationY = var1; // L: 7960 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2681, Client.packetWriter.isaacCipher); // L: 7962 - var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7963 - var9.packetBuffer.method6705(var3); // L: 7964 - Client.packetWriter.addNode(var9); // L: 7965 - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 7996 - if (var13 != null) { // L: 7997 - Client.mouseCrossX = var6; // L: 7998 - Client.mouseCrossY = var7; // L: 7999 - Client.mouseCrossColor = 2; // L: 8000 - Client.mouseCrossState = 0; // L: 8001 - Client.destinationX = var0; // L: 8002 - Client.destinationY = var1; // L: 8003 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); // L: 8005 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8006 - var9.packetBuffer.method6705(var3); // L: 8007 - Client.packetWriter.addNode(var9); // L: 8008 + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { + Interpreter.Interpreter_intStackSize -= 3; + int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var5 >= 1 && var5 <= 10) { + class79 var6 = new class79(var5, var3, var4, UrlRequester.getWidget(var3).itemId); + Interpreter.field754.add(var6); + return 1; + } else { + throw new RuntimeException(); } } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; // L: 8587 - if (var15 != null) { // L: 8588 - Client.mouseCrossX = var6; // L: 8589 - Client.mouseCrossY = var7; // L: 8590 - Client.mouseCrossColor = 2; // L: 8591 - Client.mouseCrossState = 0; // L: 8592 - Client.destinationX = var0; // L: 8593 - Client.destinationY = var1; // L: 8594 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); // L: 8596 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8597 - var9.packetBuffer.writeShort(var3); // L: 8598 - var9.packetBuffer.method6649(Timer.selectedItemSlot); // L: 8599 - var9.packetBuffer.method6649(Buddy.selectedItemId); // L: 8600 - var9.packetBuffer.writeIntME(class246.selectedItemWidget); // L: 8601 - Client.packetWriter.addNode(var9); // L: 8602 - } - } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 8238 - if (var15 != null) { // L: 8239 - Client.mouseCrossX = var6; // L: 8240 - Client.mouseCrossY = var7; // L: 8241 - Client.mouseCrossColor = 2; // L: 8242 - Client.mouseCrossState = 0; // L: 8243 - Client.destinationX = var0; // L: 8244 - Client.destinationY = var1; // L: 8245 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2611, Client.packetWriter.isaacCipher); // L: 8246 - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8247 - var9.packetBuffer.method6658(class15.selectedSpellWidget); // L: 8248 - var9.packetBuffer.method6649(var3); // L: 8249 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8250 - var9.packetBuffer.method6705(Client.field634); // L: 8251 - Client.packetWriter.addNode(var9); // L: 8252 - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 8220 - Client.mouseCrossY = var7; // L: 8221 - Client.mouseCrossColor = 2; // L: 8222 - Client.mouseCrossState = 0; // L: 8223 - Client.destinationX = var0; // L: 8224 - Client.destinationY = var1; // L: 8225 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); // L: 8227 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8228 - var8.packetBuffer.method6659(class246.selectedItemWidget); // L: 8229 - var8.packetBuffer.method6648(Buddy.selectedItemId); // L: 8230 - var8.packetBuffer.writeShort(Timer.selectedItemSlot); // L: 8231 - var8.packetBuffer.writeShort(var3); // L: 8232 - var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8233 - var8.packetBuffer.method6648(WorldMapSprite.baseY + var1); // L: 8234 - Client.packetWriter.addNode(var8); // L: 8235 - } else if (var2 == 17) { - Client.mouseCrossX = var6; // L: 8649 - Client.mouseCrossY = var7; // L: 8650 - Client.mouseCrossColor = 2; // L: 8651 - Client.mouseCrossState = 0; // L: 8652 - Client.destinationX = var0; // L: 8653 - Client.destinationY = var1; // L: 8654 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); // L: 8655 - var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8656 - var8.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8657 - var8.packetBuffer.method6649(var3); // L: 8658 - var8.packetBuffer.method6648(Client.selectedSpellChildIndex); // L: 8659 - var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8660 - var8.packetBuffer.method6648(Client.field634); // L: 8661 - var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8662 - Client.packetWriter.addNode(var8); // L: 8663 - } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 8340 - Client.mouseCrossY = var7; // L: 8341 - Client.mouseCrossColor = 2; // L: 8342 - Client.mouseCrossState = 0; // L: 8343 - Client.destinationX = var0; // L: 8344 - Client.destinationY = var1; // L: 8345 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); // L: 8347 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8348 - var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8349 - var8.packetBuffer.method6705(var0 + class15.baseX); // L: 8350 - var8.packetBuffer.method6649(var3); // L: 8351 - Client.packetWriter.addNode(var8); // L: 8352 - } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 8701 - Client.mouseCrossY = var7; // L: 8702 - Client.mouseCrossColor = 2; // L: 8703 - Client.mouseCrossState = 0; // L: 8704 - Client.destinationX = var0; // L: 8705 - Client.destinationY = var1; // L: 8706 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8708 - var8.packetBuffer.method6705(var0 + class15.baseX); // L: 8709 - var8.packetBuffer.writeShort(var3); // L: 8710 - var8.packetBuffer.writeShort(WorldMapSprite.baseY + var1); // L: 8711 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8712 - Client.packetWriter.addNode(var8); // L: 8713 - } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 8288 - Client.mouseCrossY = var7; // L: 8289 - Client.mouseCrossColor = 2; // L: 8290 - Client.mouseCrossState = 0; // L: 8291 - Client.destinationX = var0; // L: 8292 - Client.destinationY = var1; // L: 8293 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); // L: 8295 - var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8296 - var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8297 - var8.packetBuffer.writeShort(var0 + class15.baseX); // L: 8298 - var8.packetBuffer.method6649(var3); // L: 8299 - Client.packetWriter.addNode(var8); // L: 8300 - } else if (var2 == 21) { - 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 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2678, Client.packetWriter.isaacCipher); // L: 8481 - var8.packetBuffer.method6705(var3); // L: 8482 - var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8483 - var8.packetBuffer.method6648(var0 + class15.baseX); // L: 8484 - var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8485 - Client.packetWriter.addNode(var8); // L: 8486 - } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 8355 - Client.mouseCrossY = var7; // L: 8356 - Client.mouseCrossColor = 2; // L: 8357 - Client.mouseCrossState = 0; // L: 8358 - Client.destinationX = var0; // L: 8359 - Client.destinationY = var1; // L: 8360 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); // L: 8362 - var8.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8363 - var8.packetBuffer.method6705(var0 + class15.baseX); // L: 8364 - var8.packetBuffer.method6648(var3); // L: 8365 - var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8366 - Client.packetWriter.addNode(var8); // L: 8367 - } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 8012 - DevicePcmPlayerProvider.scene.setViewportWalking(); // L: 8013 - } else { - DevicePcmPlayerProvider.scene.menuOpen(SoundSystem.Client_plane, var0, var1, true); // L: 8016 - } - } else { - PacketBufferNode var11; - Widget var16; - if (var2 == 24) { - var16 = WorldMapData_1.getWidget(var1); // L: 8606 - boolean var12 = true; // L: 8607 - if (var16.contentType > 0) { // L: 8608 - var12 = class343.method6080(var16); - } + return 2; + } + } else if (Interpreter.field742 >= 10) { + throw new RuntimeException(); + } else { + if (var0 >= 2000) { + var7 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else { + var7 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + } - if (var12) { // L: 8609 - var11 = InterfaceParent.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8611 - var11.packetBuffer.writeInt(var1); // L: 8612 - Client.packetWriter.addNode(var11); // L: 8613 - } - } else { - if (var2 == 25) { - var16 = class17.getWidgetChild(var1, var0); // L: 8204 - if (var16 != null) { // L: 8205 - class20.Widget_runOnTargetLeave(); // L: 8206 - ItemComposition.selectSpell(var1, var0, ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var16)), var16.itemId); // L: 8207 - Client.isItemSelected = 0; // L: 8208 - Client.selectedSpellActionName = SecureRandomCallable.Widget_getSpellActionName(var16); // L: 8209 - if (Client.selectedSpellActionName == null) { // L: 8210 - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { // L: 8211 - Client.selectedSpellName = var16.dataText + SecureRandomFuture.colorStartTag(16777215); - } else { - Client.selectedSpellName = SecureRandomFuture.colorStartTag(65280) + var16.spellName + SecureRandomFuture.colorStartTag(16777215); // L: 8212 - } - } - - return; // L: 8214 - } - - if (var2 == 26) { - class20.method288(); // L: 8217 - } else { - int var10; - Widget var14; - if (var2 == 28) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8387 - var8.packetBuffer.writeInt(var1); // L: 8388 - Client.packetWriter.addNode(var8); // L: 8389 - var14 = WorldMapData_1.getWidget(var1); // L: 8390 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8391 - var10 = var14.cs1Instructions[0][1]; // L: 8392 - Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8393 - class6.changeGameOptions(var10); // L: 8394 - } - } else if (var2 == 29) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8039 - var8.packetBuffer.writeInt(var1); // L: 8040 - Client.packetWriter.addNode(var8); // L: 8041 - var14 = WorldMapData_1.getWidget(var1); // L: 8042 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8043 - var10 = var14.cs1Instructions[0][1]; // L: 8044 - if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8045 - Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8046 - class6.changeGameOptions(var10); // L: 8047 - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 8134 - ClanChannelMember.resumePauseWidget(var1, var0); // L: 8135 - Client.meslayerContinueWidget = class17.getWidgetChild(var1, var0); // L: 8136 - Script.invalidateWidget(Client.meslayerContinueWidget); // L: 8137 - } - } else if (var2 == 31) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8490 - var8.packetBuffer.method6648(Timer.selectedItemSlot); // L: 8491 - var8.packetBuffer.method6658(var1); // L: 8492 - var8.packetBuffer.method6705(Buddy.selectedItemId); // L: 8493 - var8.packetBuffer.writeIntME(class246.selectedItemWidget); // L: 8494 - var8.packetBuffer.method6648(var3); // L: 8495 - var8.packetBuffer.method6705(var0); // L: 8496 - Client.packetWriter.addNode(var8); // L: 8497 - Client.field869 = 0; // L: 8498 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8499 - Client.field729 = var0; // L: 8500 - } else if (var2 == 32) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); // L: 8399 - var8.packetBuffer.method6648(var0); // L: 8400 - var8.packetBuffer.writeShort(var3); // L: 8401 - var8.packetBuffer.method6649(Client.selectedSpellChildIndex); // L: 8402 - var8.packetBuffer.writeInt(var1); // L: 8403 - var8.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8404 - Client.packetWriter.addNode(var8); // L: 8405 - Client.field869 = 0; // L: 8406 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8407 - Client.field729 = var0; // L: 8408 - } else if (var2 == 33) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2663, Client.packetWriter.isaacCipher); // L: 8071 - var8.packetBuffer.writeInt(var1); // L: 8072 - var8.packetBuffer.writeShort(var0); // L: 8073 - var8.packetBuffer.method6649(var3); // L: 8074 - Client.packetWriter.addNode(var8); // L: 8075 - Client.field869 = 0; // L: 8076 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8077 - Client.field729 = var0; // L: 8078 - } else if (var2 == 34) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2638, Client.packetWriter.isaacCipher); // L: 8548 - var8.packetBuffer.writeInt(var1); // L: 8549 - var8.packetBuffer.method6648(var0); // L: 8550 - var8.packetBuffer.method6649(var3); // L: 8551 - Client.packetWriter.addNode(var8); // L: 8552 - Client.field869 = 0; // L: 8553 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8554 - Client.field729 = var0; // L: 8555 - } else if (var2 == 35) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2628, Client.packetWriter.isaacCipher); // L: 8515 - var8.packetBuffer.method6648(var0); // L: 8516 - var8.packetBuffer.method6649(var3); // L: 8517 - var8.packetBuffer.method6659(var1); // L: 8518 - Client.packetWriter.addNode(var8); // L: 8519 - Client.field869 = 0; // L: 8520 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8521 - Client.field729 = var0; // L: 8522 - } else if (var2 == 36) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2590, Client.packetWriter.isaacCipher); // L: 7986 - var8.packetBuffer.method6658(var1); // L: 7987 - var8.packetBuffer.method6649(var0); // L: 7988 - var8.packetBuffer.method6648(var3); // L: 7989 - Client.packetWriter.addNode(var8); // L: 7990 - Client.field869 = 0; // L: 7991 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 7992 - Client.field729 = var0; // L: 7993 - } else if (var2 == 37) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2580, Client.packetWriter.isaacCipher); // L: 8537 - var8.packetBuffer.method6705(var3); // L: 8538 - var8.packetBuffer.writeShort(var0); // L: 8539 - var8.packetBuffer.method6658(var1); // L: 8540 - Client.packetWriter.addNode(var8); // L: 8541 - Client.field869 = 0; // L: 8542 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8543 - Client.field729 = var0; // L: 8544 - } else { - if (var2 == 38) { - class20.Widget_runOnTargetLeave(); // L: 8096 - var16 = WorldMapData_1.getWidget(var1); // L: 8097 - Client.isItemSelected = 1; // L: 8098 - Timer.selectedItemSlot = var0; // L: 8099 - class246.selectedItemWidget = var1; // L: 8100 - Buddy.selectedItemId = var3; // L: 8101 - Script.invalidateWidget(var16); // L: 8102 - Client.selectedItemName = SecureRandomFuture.colorStartTag(16748608) + class250.ItemDefinition_get(var3).name + SecureRandomFuture.colorStartTag(16777215); // L: 8103 - if (Client.selectedItemName == null) { // L: 8104 - Client.selectedItemName = "null"; - } - - return; // L: 8105 - } - - if (var2 == 39) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); // L: 8504 - var8.packetBuffer.writeIntME(var1); // L: 8505 - var8.packetBuffer.method6649(var3); // L: 8506 - var8.packetBuffer.method6648(var0); // L: 8507 - Client.packetWriter.addNode(var8); // L: 8508 - Client.field869 = 0; // L: 8509 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8510 - Client.field729 = var0; // L: 8511 - } else if (var2 == 40) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2641, Client.packetWriter.isaacCipher); // L: 8526 - var8.packetBuffer.writeShort(var0); // L: 8527 - var8.packetBuffer.writeIntME(var1); // L: 8528 - var8.packetBuffer.writeShort(var3); // L: 8529 - Client.packetWriter.addNode(var8); // L: 8530 - Client.field869 = 0; // L: 8531 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8532 - Client.field729 = var0; // L: 8533 - } else if (var2 == 41) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2637, Client.packetWriter.isaacCipher); // L: 8304 - var8.packetBuffer.writeShort(var0); // L: 8305 - var8.packetBuffer.method6649(var3); // L: 8306 - var8.packetBuffer.writeIntME(var1); // L: 8307 - Client.packetWriter.addNode(var8); // L: 8308 - Client.field869 = 0; // L: 8309 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8310 - Client.field729 = var0; // L: 8311 - } else if (var2 == 42) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); // L: 8330 - var8.packetBuffer.method6648(var3); // L: 8331 - var8.packetBuffer.method6648(var0); // L: 8332 - var8.packetBuffer.writeInt(var1); // L: 8333 - Client.packetWriter.addNode(var8); // L: 8334 - Client.field869 = 0; // L: 8335 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8336 - Client.field729 = var0; // L: 8337 - } else if (var2 == 43) { - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2645, Client.packetWriter.isaacCipher); // L: 8691 - var8.packetBuffer.writeIntME(var1); // L: 8692 - var8.packetBuffer.writeShort(var3); // L: 8693 - var8.packetBuffer.method6705(var0); // L: 8694 - Client.packetWriter.addNode(var8); // L: 8695 - Client.field869 = 0; // L: 8696 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8697 - Client.field729 = var0; // L: 8698 - } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 8458 - if (var15 != null) { // L: 8459 - Client.mouseCrossX = var6; // L: 8460 - Client.mouseCrossY = var7; // L: 8461 - Client.mouseCrossColor = 2; // L: 8462 - Client.mouseCrossState = 0; // L: 8463 - Client.destinationX = var0; // L: 8464 - Client.destinationY = var1; // L: 8465 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8467 - var9.packetBuffer.method6705(var3); // L: 8468 - var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8469 - Client.packetWriter.addNode(var9); // L: 8470 - } - } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 7969 - if (var15 != null) { // L: 7970 - Client.mouseCrossX = var6; // L: 7971 - Client.mouseCrossY = var7; // L: 7972 - Client.mouseCrossColor = 2; // L: 7973 - Client.mouseCrossState = 0; // L: 7974 - Client.destinationX = var0; // L: 7975 - Client.destinationY = var1; // L: 7976 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2625, Client.packetWriter.isaacCipher); // L: 7978 - var9.packetBuffer.method6649(var3); // L: 7979 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7980 - Client.packetWriter.addNode(var9); // L: 7981 - } - } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 7937 - if (var15 != null) { // L: 7938 - Client.mouseCrossX = var6; // L: 7939 - Client.mouseCrossY = var7; // L: 7940 - Client.mouseCrossColor = 2; // L: 7941 - Client.mouseCrossState = 0; // L: 7942 - Client.destinationX = var0; // L: 7943 - Client.destinationY = var1; // L: 7944 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); // L: 7946 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7947 - var9.packetBuffer.method6649(var3); // L: 7948 - Client.packetWriter.addNode(var9); // L: 7949 - } - } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 8256 - if (var15 != null) { // L: 8257 - Client.mouseCrossX = var6; // L: 8258 - Client.mouseCrossY = var7; // L: 8259 - Client.mouseCrossColor = 2; // L: 8260 - Client.mouseCrossState = 0; // L: 8261 - Client.destinationX = var0; // L: 8262 - Client.destinationY = var1; // L: 8263 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8265 - var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8266 - var9.packetBuffer.method6648(var3); // L: 8267 - Client.packetWriter.addNode(var9); // L: 8268 - } - } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 8411 - if (var15 != null) { // L: 8412 - Client.mouseCrossX = var6; // L: 8413 - Client.mouseCrossY = var7; // L: 8414 - Client.mouseCrossColor = 2; // L: 8415 - Client.mouseCrossState = 0; // L: 8416 - Client.destinationX = var0; // L: 8417 - Client.destinationY = var1; // L: 8418 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher); // L: 8420 - var9.packetBuffer.method6648(var3); // L: 8421 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8422 - Client.packetWriter.addNode(var9); // L: 8423 - } - } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 8370 - if (var15 != null) { // L: 8371 - Client.mouseCrossX = var6; // L: 8372 - Client.mouseCrossY = var7; // L: 8373 - Client.mouseCrossColor = 2; // L: 8374 - Client.mouseCrossState = 0; // L: 8375 - Client.destinationX = var0; // L: 8376 - Client.destinationY = var1; // L: 8377 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 8379 - var9.packetBuffer.method6649(var3); // L: 8380 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8381 - Client.packetWriter.addNode(var9); // L: 8382 - } - } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 8188 - if (var15 != null) { // L: 8189 - Client.mouseCrossX = var6; // L: 8190 - Client.mouseCrossY = var7; // L: 8191 - Client.mouseCrossColor = 2; // L: 8192 - Client.mouseCrossState = 0; // L: 8193 - Client.destinationX = var0; // L: 8194 - Client.destinationY = var1; // L: 8195 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 8197 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8198 - var9.packetBuffer.method6705(var3); // L: 8199 - Client.packetWriter.addNode(var9); // L: 8200 - } - } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 8141 - if (var15 != null) { // L: 8142 - Client.mouseCrossX = var6; // L: 8143 - Client.mouseCrossY = var7; // L: 8144 - Client.mouseCrossColor = 2; // L: 8145 - Client.mouseCrossState = 0; // L: 8146 - Client.destinationX = var0; // L: 8147 - Client.destinationY = var1; // L: 8148 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2674, Client.packetWriter.isaacCipher); // L: 8150 - var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8151 - var9.packetBuffer.writeShort(var3); // L: 8152 - Client.packetWriter.addNode(var9); // L: 8153 - } - } else if (var2 != 1007 && var2 != 57) { - if (var2 == 58) { - var16 = class17.getWidgetChild(var1, var0); // L: 8157 - if (var16 != null) { // L: 8158 - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher); // L: 8160 - var9.packetBuffer.method6649(var16.itemId); // L: 8161 - var9.packetBuffer.writeIntME(var1); // L: 8162 - var9.packetBuffer.method6705(Client.selectedSpellChildIndex); // L: 8163 - var9.packetBuffer.method6648(var0); // L: 8164 - var9.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8165 - var9.packetBuffer.writeShort(Client.field634); // L: 8166 - Client.packetWriter.addNode(var9); // L: 8167 - } - } else if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 8081 - Client.mouseCrossY = var7; // L: 8082 - Client.mouseCrossColor = 2; // L: 8083 - Client.mouseCrossState = 0; // L: 8084 - Client.destinationX = var0; // L: 8085 - Client.destinationY = var1; // L: 8086 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2623, Client.packetWriter.isaacCipher); // L: 8088 - var8.packetBuffer.method6649(var3); // L: 8089 - var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8090 - var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8091 - var8.packetBuffer.method6648(var0 + class15.baseX); // L: 8092 - Client.packetWriter.addNode(var8); // L: 8093 - } else if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 8124 - Client.mouseCrossY = var7; // L: 8125 - Client.mouseCrossColor = 2; // L: 8126 - Client.mouseCrossState = 0; // L: 8127 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); // L: 8129 - var8.packetBuffer.writeShort(var3); // L: 8130 - Client.packetWriter.addNode(var8); // L: 8131 - } else if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 8171 - Client.mouseCrossY = var7; // L: 8172 - Client.mouseCrossColor = 2; // L: 8173 - Client.mouseCrossState = 0; // L: 8174 - var13 = Client.npcs[var3]; // L: 8175 - if (var13 != null) { // L: 8176 - NPCComposition var17 = var13.definition; // L: 8177 - if (var17.transforms != null) { // L: 8178 - var17 = var17.transform(); - } - - if (var17 != null) { // L: 8179 - var11 = InterfaceParent.getPacketBufferNode(ClientPacket.field2634, Client.packetWriter.isaacCipher); // L: 8181 - var11.packetBuffer.method6649(var17.id); // L: 8182 - Client.packetWriter.addNode(var11); // L: 8183 - } - } - } else if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 8577 - Client.mouseCrossY = var7; // L: 8578 - Client.mouseCrossColor = 2; // L: 8579 - Client.mouseCrossState = 0; // L: 8580 - var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); // L: 8582 - var8.packetBuffer.writeShort(var3); // L: 8583 - Client.packetWriter.addNode(var8); // L: 8584 - } else if (var2 == 1005) { - var16 = WorldMapData_1.getWidget(var1); // L: 8716 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8717 - UserComparator10.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class250.ItemDefinition_get(var3).name); - } else { - var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); // L: 8720 - var9.packetBuffer.writeShort(var3); // L: 8721 - Client.packetWriter.addNode(var9); // L: 8722 - } - - Client.field869 = 0; // L: 8724 - Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8725 - Client.field729 = var0; // L: 8726 - } else if (var2 == 1012 || var2 == 1011 || var2 == 1009 || var2 == 1008 || var2 == 1010) { - class80.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8666 - } - } else { - var16 = class17.getWidgetChild(var1, var0); // L: 8684 - if (var16 != null) { // L: 8685 - MouseHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8686 - } - } - } - } - } - } + if (var7.onResize == null) { + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); + var9.widget = var7; + var9.args = var7.onResize; + var9.field961 = Interpreter.field742 + 1; + Client.scriptEvents.addFirst(var9); + return 1; } } - - if (Client.isItemSelected != 0) { // L: 8728 - Client.isItemSelected = 0; // L: 8729 - Script.invalidateWidget(WorldMapData_1.getWidget(class246.selectedItemWidget)); // L: 8730 - } - - if (Client.isSpellSelected) { // L: 8732 - class20.Widget_runOnTargetLeave(); - } - - if (Login.field1034 != null && Client.field869 == 0) { // L: 8733 - Script.invalidateWidget(Login.field1034); - } - - } // L: 8734 + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index b3cb3e789c..b0bc8ba0eb 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -3,136 +3,451 @@ 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("jt") +@ObfuscatedName("jj") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("f") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = 664373343 + intValue = 672319355 + ) + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1872389181 ) @Export("world") public final int world; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -1846074913095996279L + longValue = -7476556361608611427L ) @Export("age") public final long age; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljk;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("offerName") String offerName; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lnt;BI)V" + descriptor = "(Lnv;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); - this.previousOfferName = var1.readStringCp1252NullTerminated(); // L: 112 - this.world = var1.readUnsignedShort(); // L: 113 - this.age = var1.readLong(); // L: 114 - int var4 = var1.readInt(); // L: 115 - int var5 = var1.readInt(); // L: 116 - this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 - this.grandExchangeOffer.method5224(2); // L: 118 - this.grandExchangeOffer.method5229(var2); // L: 119 - this.grandExchangeOffer.unitPrice = var4; // L: 120 - this.grandExchangeOffer.totalQuantity = var5; // L: 121 - this.grandExchangeOffer.currentQuantity = 0; // L: 122 - this.grandExchangeOffer.currentPrice = 0; // L: 123 - this.grandExchangeOffer.id = var3; // L: 124 - } // L: 125 + this.previousOfferName = var1.readStringCp1252NullTerminated(); + this.world = var1.readUnsignedShort(); + this.age = var1.readLong(); + int var4 = var1.readInt(); + int var5 = var1.readInt(); + this.grandExchangeOffer = new GrandExchangeOffer(); + this.grandExchangeOffer.method5157(2); + this.grandExchangeOffer.method5158(var2); + this.grandExchangeOffer.unitPrice = var4; + this.grandExchangeOffer.totalQuantity = var5; + this.grandExchangeOffer.currentQuantity = 0; + this.grandExchangeOffer.currentPrice = 0; + this.grandExchangeOffer.id = var3; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "827394451" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-103" ) @Export("getOfferName") public String getOfferName() { - return this.offerName; // L: 128 + return this.offerName; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "73" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1488255767" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { - return this.previousOfferName; // L: 132 + return this.previousOfferName; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)[Loj;", - garbageValue = "-77" + descriptor = "(II)I", + garbageValue = "238780662" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4239, FillMode.SOLID, FillMode.field4241}; // L: 15 + public static int method5152(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 7 & 127L); + return var1; } - @ObfuscatedName("h") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1329889616" + descriptor = "(ILbd;ZI)I", + garbageValue = "-2107492280" ) - static final void method5223() { - Object var10000 = null; // L: 107 - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - UserComparator10.addGameMessage(30, "", var0); // L: 109 - } // L: 111 + static int method5148(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (Canvas.friendSystem.field713 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; + } else if (Canvas.friendSystem.field713 == 1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.friendsList.getSize(); + } - @ObfuscatedName("iy") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-106576024" - ) - static void method5222(int var0, int var1) { - int var2 = class309.fontBold12.stringWidth("Choose Option"); // L: 7910 + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)Canvas.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } - int var3; - int var4; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7911 - var4 = class309.fontBold12.stringWidth(class0.method1(var3)); // L: 7912 - if (var4 > var2) { // L: 7913 - var2 = var4; + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendLoginUpdate.method5763(var5, var6); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Canvas.friendSystem.addFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Canvas.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Canvas.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Canvas.friendSystem.removeIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var5 = class52.method1648(var5); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.isFriended(new Username(var5, GraphicsObject.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (MouseRecorder.friendsChat != null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.name; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (MouseRecorder.friendsChat != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)MouseRecorder.friendsChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)MouseRecorder.friendsChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat != null ? MouseRecorder.friendsChat.minKick : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + SecureRandomCallable.clanKickUser(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat != null ? MouseRecorder.friendsChat.rank * -1047234431 * 553895809 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + GrandExchangeOfferOwnWorldComparator.Clan_joinChat(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + Login.Clan_leaveChat(); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!Canvas.friendSystem.method1473()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)Canvas.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var5 = class52.method1648(var5); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.isIgnored(new Username(var5, GraphicsObject.loginType)) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && MouseRecorder.friendsChat.get(var3).getUsername().equals(MouseHandler.localPlayer.username)) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (MouseRecorder.friendsChat != null && MouseRecorder.friendsChat.owner != null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.owner; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && ((ClanMate)MouseRecorder.friendsChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + Canvas.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + Canvas.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + Canvas.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + Canvas.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Canvas.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && ((ClanMate)MouseRecorder.friendsChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } } } - - var2 += 8; // L: 7915 - var3 = Client.menuOptionsCount * 15 + 22; // L: 7916 - var4 = var0 - var2 / 2; // L: 7917 - if (var2 + var4 > AttackOption.canvasWidth) { // L: 7918 - var4 = AttackOption.canvasWidth - var2; - } - - if (var4 < 0) { // L: 7919 - var4 = 0; - } - - int var5 = var1; // L: 7920 - if (var1 + var3 > class0.canvasHeight) { // L: 7921 - var5 = class0.canvasHeight - var3; - } - - if (var5 < 0) { // L: 7922 - var5 = 0; - } - - StructComposition.menuX = var4; // L: 7923 - class143.menuY = var5; // L: 7924 - UserComparator3.menuWidth = var2; // L: 7925 - PendingSpawn.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7926 - } // L: 7927 + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index e044c9294e..29f145153f 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,112 +7,68 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jf") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; @ObfuscatedName("v") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("events") public final List events; static { - GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); // L: 11 + GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); new GrandExchangeOfferWorldComparator(); - GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41 - GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54 + GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); + GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator(); - } // L: 67 + } @ObfuscatedSignature( - descriptor = "(Lnt;Z)V", + descriptor = "(Lnv;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { - int var3 = var1.readUnsignedShort(); // L: 82 - boolean var4 = var1.readUnsignedByte() == 1; // L: 83 + int var3 = var1.readUnsignedShort(); + boolean var4 = var1.readUnsignedByte() == 1; byte var5; - if (var4) { // L: 85 + if (var4) { var5 = 1; } else { - var5 = 0; // L: 86 + var5 = 0; } - int var6 = var1.readUnsignedShort(); // L: 87 - this.events = new ArrayList(var6); // L: 88 + int var6 = var1.readUnsignedShort(); + this.events = new ArrayList(var6); - for (int var7 = 0; var7 < var6; ++var7) { // L: 89 - this.events.add(new GrandExchangeEvent(var1, var5, var3)); // L: 90 + for (int var7 = 0; var7 < var6; ++var7) { + this.events.add(new GrandExchangeEvent(var1, var5, var3)); } - } // L: 92 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZS)V", - garbageValue = "255" + descriptor = "(Ljava/util/Comparator;ZI)V", + garbageValue = "1669193209" ) @Export("sort") public void sort(Comparator var1, boolean var2) { - if (var2) { // L: 95 - Collections.sort(this.events, var1); // L: 96 + if (var2) { + Collections.sort(this.events, var1); } else { - Collections.sort(this.events, Collections.reverseOrder(var1)); // L: 99 + Collections.sort(this.events, Collections.reverseOrder(var1)); } - } // L: 101 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "38" - ) - public static String method5182(String var0) { - int var1 = var0.length(); // L: 170 - char[] var2 = new char[var1]; // L: 171 - byte var3 = 2; // L: 172 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 173 - char var5 = var0.charAt(var4); // L: 174 - if (var3 == 0) { // L: 175 - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 176 - var5 = HitSplatDefinition.method3013(var5); - } - - 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 } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index c0cbf459e8..cd7f27b4c0 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,99 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jk") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("f") + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("s") @Export("state") byte state; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1583312423 + intValue = -738417027 ) @Export("id") public int id; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1337068893 + intValue = 902744841 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 85465659 + intValue = 1486444339 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -631103109 + intValue = -445380121 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1719757481 + intValue = -421297425 ) @Export("currentPrice") public int currentPrice; public GrandExchangeOffer() { - } // L: 13 + } @ObfuscatedSignature( - descriptor = "(Lnt;Z)V", + descriptor = "(Lnv;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { - this.state = var1.readByte(); // L: 16 - this.id = var1.readUnsignedShort(); // L: 17 - this.unitPrice = var1.readInt(); // L: 18 - this.totalQuantity = var1.readInt(); // L: 19 - this.currentQuantity = var1.readInt(); // L: 20 - this.currentPrice = var1.readInt(); // L: 21 - } // L: 22 + this.state = var1.readByte(); + this.id = var1.readUnsignedShort(); + this.unitPrice = var1.readInt(); + this.totalQuantity = var1.readInt(); + this.currentQuantity = var1.readInt(); + this.currentPrice = var1.readInt(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "10" + descriptor = "(I)I", + garbageValue = "1580532327" ) @Export("status") public int status() { - return this.state & 7; // L: 50 + return this.state & 7; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "48" + garbageValue = "-51" ) @Export("type") public int type() { - return (this.state & 8) == 8 ? 1 : 0; // L: 54 + return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-59" - ) - void method5224(int var1) { - this.state &= -8; // L: 58 - this.state = (byte)(this.state | var1 & 7); // L: 59 - } // L: 60 - @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1688062511" + garbageValue = "2117063899" ) - void method5229(int var1) { - this.state &= -9; // L: 63 + void method5157(int var1) { + this.state &= -8; + this.state = (byte)(this.state | var1 & 7); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "1" + ) + void method5158(int var1) { + this.state &= -9; if (var1 == 1) { - this.state = (byte)(this.state | 8); // L: 64 + this.state = (byte)(this.state | 8); } - } // L: 65 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-240867466" + ) + static void method5168() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "77" + ) + public static String method5167(String var0) { + int var1 = var0.length(); + char[] var2 = new char[var1]; + byte var3 = 2; + + for (int var4 = 0; var4 < var1; ++var4) { + char var5 = var0.charAt(var4); + if (var3 == 0) { + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { + var5 = Clock.method2679(var5); + } + + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; + } + } else { + var3 = 1; + } + } else { + var3 = 2; + } + + var2[var4] = var5; + } + + return new String(var2); + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 8809efabec..11c42ddf70 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,76 +1,80 @@ 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("jy") +@ObfuscatedName("ju") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1278349979 + ) + @Export("VarpDefinition_fileCount") + public static int VarpDefinition_fileCount; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1870973391 + ) + public static int field3633; + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;B)I", - garbageValue = "1" + descriptor = "(Ljj;Ljj;I)I", + garbageValue = "-1896317478" ) @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 + return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("k") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lbk;I)V", - garbageValue = "1304582630" + descriptor = "(III)I", + garbageValue = "-113649637" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1497 - Client.isMembersWorld = var0.isMembersOnly(); // L: 1498 - boolean var1 = var0.isMembersOnly(); // L: 1499 - if (var1 != ItemComposition.ItemDefinition_inMembersWorld) { // L: 1501 - Projectile.method2075(); // L: 1502 - ItemComposition.ItemDefinition_inMembersWorld = var1; // L: 1503 - } - } + static final int method5126(int var0, int var1) { + int var2 = ParamComposition.method2925(var0 - 1, var1 - 1) + ParamComposition.method2925(1 + var0, var1 - 1) + ParamComposition.method2925(var0 - 1, var1 + 1) + ParamComposition.method2925(1 + var0, var1 + 1); + int var3 = ParamComposition.method2925(var0 - 1, var1) + ParamComposition.method2925(var0 + 1, var1) + ParamComposition.method2925(var0, var1 - 1) + ParamComposition.method2925(var0, 1 + var1); + int var4 = ParamComposition.method2925(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; + } - if (var0.properties != Client.worldProperties) { // L: 1507 - class27.method364(ModeWhere.archive8, var0.properties); // L: 1508 - } - - Client.worldHost = var0.host; // L: 1510 - Client.worldId = var0.id; // L: 1511 - Client.worldProperties = var0.properties; // L: 1512 - UserComparator7.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1513 - MouseRecorder.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1514 - UserComparator2.currentPort = UserComparator7.worldPort; // L: 1515 - } // L: 1516 - - @ObfuscatedName("lz") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "-56" + descriptor = "(CI)Z", + garbageValue = "-189475512" ) - static final void method5203(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { // L: 11524 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method49()) { // L: 11525 - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11526 - PacketWriter var4 = Client.packetWriter; // L: 11527 - PacketBufferNode var5 = InterfaceParent.getPacketBufferNode(ClientPacket.field2675, var4.isaacCipher); // L: 11528 - var5.packetBuffer.writeByte(4 + class44.stringCp1252NullTerminatedByteSize(var3.name)); // L: 11529 - var5.packetBuffer.writeByte(var0); // L: 11530 - var5.packetBuffer.writeShort(var1); // L: 11531 - var5.packetBuffer.writeBoolean(var2); // L: 11532 - var5.packetBuffer.writeStringCp1252NullTerminated(var3.name); // L: 11533 - var4.addNode(var5); // L: 11534 - } - } - } // L: 11535 + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-439805198" + ) + static int method5132(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1957941774" + ) + public static int method5131(String var0) { + return var0.length() + 2; + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 9af602042f..b954e197ec 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,85 +1,55 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; 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("je") +@ObfuscatedName("jl") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = -3156287025995646729L + ) + static long field3625; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 770071241 + ) + static int field3628; + @ObfuscatedName("ge") + @ObfuscatedGetter( + intValue = 964659383 + ) + @Export("baseX") + static int baseX; + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "1398133242" + descriptor = "(Ljj;Ljj;B)I", + garbageValue = "14" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 + return var1.getOfferName().compareTo(var2.getOfferName()); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 64 + return super.equals(var1); } - @ObfuscatedName("v") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-1807946914" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-671560252" ) - static String method5193(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { // L: 67 - RunException var2 = (RunException)var0; // L: 68 - var1 = var2.message + " | "; // L: 69 - var0 = var2.throwable; // L: 70 - } else { - var1 = ""; // L: 72 - } - - StringWriter var12 = new StringWriter(); // L: 73 - PrintWriter var3 = new PrintWriter(var12); // L: 74 - var0.printStackTrace(var3); // L: 75 - var3.close(); // L: 76 - String var4 = var12.toString(); // L: 77 - BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78 - String var6 = var5.readLine(); // L: 79 - - while (true) { - while (true) { - String var7 = var5.readLine(); // L: 81 - if (var7 == null) { // L: 82 - var1 = var1 + "| " + var6; // L: 100 - return var1; // L: 101 - } - - int var8 = var7.indexOf(40); // L: 83 - int var9 = var7.indexOf(41, var8 + 1); // L: 84 - if (var8 >= 0 && var9 >= 0) { // L: 85 - String var10 = var7.substring(var8 + 1, var9); // L: 86 - int var11 = var10.indexOf(".java:"); // L: 87 - if (var11 >= 0) { // L: 88 - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89 - var1 = var1 + var10 + ' '; // L: 90 - continue; // L: 91 - } - - var7 = var7.substring(0, var8); // L: 93 - } - - var7 = var7.trim(); // L: 95 - var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96 - var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97 - var1 = var1 + var7 + ' '; // L: 98 - } - } + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 042917e171..2c945d9df8 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,83 +1,118 @@ -import java.security.SecureRandom; 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("bp") +@ObfuscatedName("ah") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("ro") - @ObfuscatedGetter( - intValue = -2144247307 - ) - static int field607; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 972437249 - ) - public static int field608; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[[Liv;" + descriptor = "Lof;" ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("dn") + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("fk") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lkt;" ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("f") + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("s") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 11744 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;B)I", - garbageValue = "16" + descriptor = "(Ljj;Ljj;I)I", + garbageValue = "702454082" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 11747 + if (var2.world == var1.world) { return 0; } else { - if (this.filterWorlds) { // L: 11748 - if (Client.worldId == var1.world) { // L: 11749 + if (this.filterWorlds) { + if (Client.worldId == var1.world) { return -1; } - if (var2.world == Client.worldId) { // L: 11750 + if (var2.world == Client.worldId) { return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 11752 + return var1.world < var2.world ? -1 : 1; } } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11756 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 11760 + return super.equals(var1); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "287723584" + descriptor = "(IIIII)I", + garbageValue = "1440909835" ) - static SecureRandom method1271() { - SecureRandom var0 = new SecureRandom(); // L: 39 - var0.nextInt(); // L: 40 - return var0; // L: 41 + static final int method890(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "2121777325" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 < 0 || AbstractArchive.field3591 != 0 && var3 > AbstractArchive.field3591) { + throw new RuntimeException(); + } else if (var2 == 0) { + byte[] var6 = new byte[var3]; + var1.readBytes(var6, 0, var3); + return var6; + } else { + int var4 = var1.readInt(); + if (var4 >= 0 && (AbstractArchive.field3591 == 0 || var4 <= AbstractArchive.field3591)) { + byte[] var5 = new byte[var4]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } + + return var5; + } else { + throw new RuntimeException(); + } + } + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1148986120" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 2736a60a88..d0065dbeb2 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -4,24 +4,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jp") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "-518931969" + descriptor = "(Ljj;Ljj;B)I", + garbageValue = "19" ) @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 + return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 77 + return super.equals(var1); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 3d2e3cc812..6b0769454e 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -4,34 +4,77 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("kn") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("od") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lns;" ) - @Export("FloorOverlayDefinition_archive") - static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("z") - @Export("musicTrackBoolean") - static boolean musicTrackBoolean; + @Export("HitSplatDefinition_cachedSprites") + static class371 HitSplatDefinition_cachedSprites; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "-1968162163" + descriptor = "(Ljj;Ljj;B)I", + garbageValue = "69" ) @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 + return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } + + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(Lio;IIZB)V", + garbageValue = "37" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { + var0.width = var0.height * var0.field2974 / var0.field2975; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.field2975 * var0.width / var0.field2974; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 781e0c6719..091f1e1c7e 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -4,231 +4,89 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("jx") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "448917166" + descriptor = "Lkq;" + ) + @Export("clientLanguage") + static Language clientLanguage; + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljj;Ljj;I)I", + garbageValue = "2116557757" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28 + return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 32 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 36 + return super.equals(var1); } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lns;II)V", - garbageValue = "-1956438799" + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "1878009564" ) - @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; - } + public static String method5141(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + int var5 = var1; - int var3 = var0.readBits(2); // L: 201 - Player var4 = Client.players[var1]; // L: 202 - if (var3 == 0) { // L: 203 - if (var2) { // L: 204 - var4.field1201 = false; // L: 205 - } else if (Client.localPlayerIndex == var1) { // L: 208 - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (class15.baseX + var4.pathX[0] >> 13 << 14) + (WorldMapSprite.baseY + var4.pathY[0] >> 13); // L: 209 - if (var4.field1280 != -1) { // L: 210 - Players.Players_orientations[var1] = var4.field1280; + int var8; + for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { + int var7 = var0[var5++] & 255; + if (var7 < 128) { + if (var7 == 0) { + var8 = 65533; } else { - Players.Players_orientations[var1] = var4.orientation; // L: 211 + var8 = var7; } - - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 212 - Client.players[var1] = null; // L: 213 - if (var0.readBits(1) != 0) { // L: 214 - class35.updateExternalPlayer(var0, var1); - } - - } - } else { - 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.field1201 = false; // L: 243 - } else if (var2) { // L: 245 - var4.field1201 = true; // L: 246 - var4.tileX = var6; // L: 247 - var4.tileY = var7; // L: 248 - } else { - var4.field1201 = false; // L: 251 - var4.method2217(var6, var7, Players.field1361[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.field1201 = false; // L: 314 - } else if (var2) { // L: 316 - var4.field1201 = true; // L: 317 - var4.tileX = var6; // L: 318 - var4.tileY = var7; // L: 319 - } else { - var4.field1201 = false; // L: 322 - var4.method2217(var6, var7, Players.field1361[var1]); // L: 323 - } - - } else { - 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; + } else if (var7 < 192) { + var8 = 65533; + } else if (var7 < 224) { + if (var5 < var6 && (var0[var5] & 192) == 128) { + var8 = (var7 & 31) << 6 | var0[var5++] & 63; + if (var8 < 128) { + var8 = 65533; } - - var9 = var6 & 31; // L: 333 - if (var9 > 15) { // L: 334 - var9 -= 32; + } else { + var8 = 65533; + } + } else if (var7 < 240) { + if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { + var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 < 2048) { + var8 = 65533; } - - 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 - if (var2) { // L: 341 - var4.field1201 = true; // L: 342 - var4.tileX = var10; // L: 343 - var4.tileY = var11; // L: 344 - } else { - var4.field1201 = false; // L: 347 - var4.method2217(var10, var11, Players.field1361[var1]); // L: 348 - } + } else { + var8 = 65533; + } + } else if (var7 < 248) { + if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { + var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 >= 65536 && var8 <= 1114111) { + var8 = 65533; } else { - var4.resetPath(var10, var11); // L: 338 - var4.field1201 = false; // L: 339 + var8 = 65533; } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 350 - if (Client.localPlayerIndex == var1) { // L: 351 - SoundSystem.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 + class15.baseX + var4.pathX[0] & 16383) - class15.baseX; // L: 358 - var11 = (var9 + WorldMapSprite.baseY + var4.pathY[0] & 16383) - WorldMapSprite.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.field1201 = false; // L: 362 - } else if (var2) { // L: 364 - var4.field1201 = true; // L: 365 - var4.tileX = var10; // L: 366 - var4.tileY = var11; // L: 367 - } else { - var4.field1201 = false; // L: 370 - var4.method2217(var10, var11, Players.field1361[var1]); // L: 371 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 373 - if (Client.localPlayerIndex == var1) { // L: 374 - SoundSystem.Client_plane = var4.plane; - } - + var8 = 65533; } + } else { + var8 = 65533; } } - } // L: 206 215 254 325 352 375 + + return new String(var3, 0, var4); + } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 7d40b476ab..b9e9f9efda 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,115 +4,150 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lq") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("f") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + static IndexedSprite field3919; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1984805427 + intValue = -725671069 ) @Export("compass") public int compass; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1191054589 + intValue = 281871837 ) - public int field3892; + public int field3915; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 269750755 + intValue = -714909153 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -109749595 + intValue = 359740853 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1879938001 + intValue = -1827053533 ) - public int field3903; + public int field3910; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1525663871 + ) + public int field3912; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1041444647 + ) + public int field3908; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1591959495 + ) + public int field3914; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 616409549 + intValue = -262798545 ) - public int field3902; - @ObfuscatedName("m") + public int field3913; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 854150451 + intValue = 1828601193 ) - public int field3897; + public int field3911; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -901027001 + intValue = -1968587229 ) - public int field3899; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 2096329335 - ) - public int field3900; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1403628021 - ) - public int field3901; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1431986937 - ) - public int field3896; + public int field3917; public GraphicsDefaults() { - this.compass = -1; // L: 7 - this.field3892 = -1; // L: 8 - this.mapScenes = -1; // L: 9 - this.headIconsPk = -1; // L: 10 - this.field3903 = -1; // L: 11 - this.field3902 = -1; // L: 12 - this.field3897 = -1; // L: 13 - this.field3899 = -1; // L: 14 - this.field3900 = -1; // L: 15 - this.field3901 = -1; // L: 16 - this.field3896 = -1; // L: 17 + this.compass = -1; + this.field3915 = -1; + this.mapScenes = -1; + this.headIconsPk = -1; + this.field3910 = -1; + this.field3912 = -1; + this.field3908 = -1; + this.field3914 = -1; + this.field3913 = -1; + this.field3911 = -1; + this.field3917 = -1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "1205783534" + descriptor = "(Ljy;I)V", + garbageValue = "2124642870" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3890.group); // L: 20 - Buffer var3 = new Buffer(var2); // L: 21 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3904.group); + Buffer var3 = new Buffer(var2); while (true) { - int var4 = var3.readUnsignedByte(); // L: 23 - if (var4 == 0) { // L: 24 - return; // L: 51 + int var4 = var3.readUnsignedByte(); + if (var4 == 0) { + return; } - switch(var4) { // L: 25 + switch(var4) { case 1: - var3.readMedium(); // L: 31 - break; // L: 32 + var3.readMedium(); + break; case 2: - this.compass = var3.method6630(); // L: 36 - this.field3892 = var3.method6630(); // L: 37 - this.mapScenes = var3.method6630(); // L: 38 - this.headIconsPk = var3.method6630(); // L: 39 - this.field3903 = var3.method6630(); // L: 40 - this.field3902 = var3.method6630(); // L: 41 - this.field3897 = var3.method6630(); // L: 42 - this.field3899 = var3.method6630(); // L: 43 - this.field3900 = var3.method6630(); // L: 44 - this.field3901 = var3.method6630(); // L: 45 - this.field3896 = var3.method6630(); // L: 46 + this.compass = var3.method6674(); + this.field3915 = var3.method6674(); + this.mapScenes = var3.method6674(); + this.headIconsPk = var3.method6674(); + this.field3910 = var3.method6674(); + this.field3912 = var3.method6674(); + this.field3908 = var3.method6674(); + this.field3914 = var3.method6674(); + this.field3913 = var3.method6674(); + this.field3911 = var3.method6674(); + this.field3917 = var3.method6674(); } } } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "315603069" + ) + static int method6024(int var0, Script var1, boolean var2) { + if (var0 == 6800) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6801 && var0 != 6802) { + if (var0 == 6850) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6851 && var0 != 6852) { + if (var0 == 6853) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } + } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 02532dd1a5..edbad0111b 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,147 +1,473 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("aw") @Implements("GraphicsObject") public final class GraphicsObject extends Renderable { - @ObfuscatedName("p") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("f") + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "[Lof;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("ld") @ObfuscatedGetter( - intValue = -1904705757 + intValue = 632390903 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -962046693 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -117960567 + intValue = 764906277 ) @Export("cycleStart") int cycleStart; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1714081181 + intValue = -2015841491 ) @Export("plane") int plane; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lfm;" - ) - @Export("sequenceDefinition") - SequenceDefinition sequenceDefinition; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -868861481 + intValue = -239549733 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1366179757 + intValue = -800969311 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 774867755 + intValue = -1195317417 ) @Export("height") int height; - @ObfuscatedName("r") + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lfz;" + ) + @Export("sequenceDefinition") + SequenceDefinition sequenceDefinition; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1955367267 + intValue = -1468887815 ) @Export("frame") int frame; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1076483913 + intValue = -692732741 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("d") + @ObfuscatedName("x") @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.isFinished = false; // L: 18 - this.id = var1; // L: 21 - this.plane = var2; // L: 22 - this.x = var3; // L: 23 - this.y = var4; // L: 24 - this.height = var5; // L: 25 - this.cycleStart = var7 + var6; // L: 26 - int var8 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 27 - if (var8 != -1) { // L: 28 - this.isFinished = false; // L: 29 - this.sequenceDefinition = WorldMapScaleHandler.SequenceDefinition_get(var8); // L: 30 + this.frame = 0; + this.frameCycle = 0; + this.isFinished = false; + this.id = var1; + this.plane = var2; + this.x = var3; + this.y = var4; + this.height = var5; + this.cycleStart = var7 + var6; + int var8 = PcmPlayer.SpotAnimationDefinition_get(this.id).sequence; + if (var8 != -1) { + this.isFinished = false; + this.sequenceDefinition = World.SequenceDefinition_get(var8); } else { - this.isFinished = true; // L: 32 + this.isFinished = true; } - } // L: 33 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1850791831" + garbageValue = "1996698154" ) @Export("advance") final void advance(int var1) { - if (!this.isFinished) { // L: 36 - this.frameCycle += var1; // L: 37 + if (!this.isFinished) { + this.frameCycle += var1; - while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { // L: 38 - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 39 - ++this.frame; // L: 40 - if (this.frame >= this.sequenceDefinition.frameIds.length) { // L: 41 - this.isFinished = true; // L: 42 + while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; + ++this.frame; + if (this.frame >= this.sequenceDefinition.frameIds.length) { + this.isFinished = true; break; } } } - } // L: 46 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lgd;", - garbageValue = "326918784" + descriptor = "(I)Lgl;", + garbageValue = "1291603774" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 49 + SpotAnimationDefinition var1 = PcmPlayer.SpotAnimationDefinition_get(this.id); Model var2; - if (!this.isFinished) { // L: 51 + if (!this.isFinished) { var2 = var1.getModel(this.frame); } else { - var2 = var1.getModel(-1); // L: 52 + var2 = var1.getModel(-1); } - return var2 == null ? null : var2; // L: 53 + return var2 == null ? null : var2; } - @ObfuscatedName("ha") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-651642471" + descriptor = "(II)Leb;", + garbageValue = "315871348" ) - static final void method2014() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7319 7320 7326 - if (var0.hitpoints == -1) { // L: 7321 - var0.delay = 0; // L: 7322 - FriendSystem.method1875(var0); // L: 7323 + public static HealthBarDefinition method1647(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = DevicePcmPlayerProvider.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;ZB)Z", + garbageValue = "-45" + ) + static boolean method1645(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); + int var3 = var2.read(); + var2.seek(0L); + var2.write(var3); + var2.seek(0L); + var2.close(); + return true; + } catch (Exception var4) { + return false; + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lkt;Lkt;I)V", + garbageValue = "2107200471" + ) + static void method1646(Font var0, Font var1) { + if (WorldMapAreaData.worldSelectBackSprites == null) { + WorldMapAreaData.worldSelectBackSprites = ChatChannel.method1735(class270.archive8, "sl_back", ""); + } + + IndexedSprite[] var2; + Archive var3; + int var4; + int var5; + if (worldSelectFlagSprites == null) { + var3 = class270.archive8; + var4 = var3.getGroupId("sl_flags"); + var5 = var3.getFileId(var4, ""); + var2 = FileSystem.method2628(var3, var4, var5); + worldSelectFlagSprites = var2; + } + + if (ApproximateRouteStrategy.worldSelectArrows == null) { + var3 = class270.archive8; + var4 = var3.getGroupId("sl_arrows"); + var5 = var3.getFileId(var4, ""); + var2 = FileSystem.method2628(var3, var4, var5); + ApproximateRouteStrategy.worldSelectArrows = var2; + } + + if (ChatChannel.worldSelectStars == null) { + var3 = class270.archive8; + var4 = var3.getGroupId("sl_stars"); + var5 = var3.getFileId(var4, ""); + var2 = FileSystem.method2628(var3, var4, var5); + ChatChannel.worldSelectStars = var2; + } + + if (class137.worldSelectLeftSprite == null) { + class137.worldSelectLeftSprite = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "leftarrow", ""); + } + + if (BuddyRankComparator.worldSelectRightSprite == null) { + BuddyRankComparator.worldSelectRightSprite = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (ChatChannel.worldSelectStars != null) { + ChatChannel.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + ChatChannel.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (ApproximateRouteStrategy.worldSelectArrows != null) { + int var22 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var22, 4); } else { - var0.remove(); // L: 7325 + ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var22, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var22 + 15, 4); + } else { + ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var22 + 15, 4); + } + + var0.draw("World", var22 + 32, 17, 16777215, -1); + int var23 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var23, 4); + } else { + ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var23, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var23 + 15, 4); + } else { + ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var23 + 15, 4); + } + + var0.draw("Players", var23 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var4, 4); + } else { + ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var4, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var4 + 15, 4); + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); + var5 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var5, 4); + } else { + ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var5, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var5 + 15, 4); + } + + var0.draw("Type", var5 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (WorldMapAreaData.worldSelectBackSprites != null) { + byte var26 = 88; + byte var27 = 19; + var4 = 765 / (var26 + 1) - 1; + var5 = 480 / (var27 + 1); + + int var6; + int var7; + do { + var6 = var5; + var7 = var4; + if (var5 * (var4 - 1) >= World.World_count) { + --var4; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + } while(var5 != var6 || var4 != var7); + + var6 = (765 - var26 * var4) / (var4 + 1); + if (var6 > 5) { + var6 = 5; + } + + var7 = (480 - var27 * var5) / (var5 + 1); + if (var7 > 5) { + var7 = 5; + } + + int var8 = (765 - var26 * var4 - var6 * (var4 - 1)) / 2; + int var9 = (480 - var5 * var27 - var7 * (var5 - 1)) / 2; + int var10 = (var5 + World.World_count - 1) / var5; + Login.worldSelectPagesCount = var10 - var4; + if (class137.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + class137.worldSelectLeftSprite.drawAt(8, Client.canvasHeight / 2 - class137.worldSelectLeftSprite.subHeight / 2); + } + + if (BuddyRankComparator.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + BuddyRankComparator.worldSelectRightSprite.drawAt(MouseRecorder.canvasWidth - BuddyRankComparator.worldSelectRightSprite.subWidth - 8, Client.canvasHeight / 2 - BuddyRankComparator.worldSelectRightSprite.subHeight / 2); + } + + int var11 = var9 + 23; + int var12 = var8 + Login.xPadding; + int var13 = 0; + boolean var14 = false; + int var15 = Login.worldSelectPage; + + int var16; + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { + World var17 = class15.World_worlds[var16]; + boolean var18 = true; + String var19 = Integer.toString(var17.population); + if (var17.population == -1) { + var19 = "OFF"; + var18 = false; + } else if (var17.population > 1980) { + var19 = "FULL"; + var18 = false; + } + + int var21 = 0; + byte var20; + if (var17.isBeta()) { + if (var17.isMembersOnly()) { + var20 = 7; + } else { + var20 = 6; + } + } else if (var17.isDeadman()) { + var21 = 16711680; + if (var17.isMembersOnly()) { + var20 = 5; + } else { + var20 = 4; + } + } else if (var17.method1408()) { + if (var17.isMembersOnly()) { + var20 = 9; + } else { + var20 = 8; + } + } else if (var17.isPvp()) { + if (var17.isMembersOnly()) { + var20 = 3; + } else { + var20 = 2; + } + } else if (var17.isMembersOnly()) { + var20 = 1; + } else { + var20 = 0; + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var26 && MouseHandler.MouseHandler_y < var27 + var11 && var18) { + Login.hoveredWorldIndex = var16; + WorldMapAreaData.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); + var14 = true; + } else { + WorldMapAreaData.worldSelectBackSprites[var20].drawAt(var12, var11); + } + + if (worldSelectFlagSprites != null) { + worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); + } + + var0.drawCentered(Integer.toString(var17.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1); + var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1); + var11 = var11 + var27 + var7; + ++var13; + if (var13 >= var5) { + var11 = var9 + 23; + var12 = var12 + var6 + var26; + var13 = 0; + ++var15; + } + } + + if (var14) { + var16 = var1.stringWidth(class15.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var24 = var1.ascent + 8; + int var25 = MouseHandler.MouseHandler_y + 25; + if (var24 + var25 > 480) { + var25 = MouseHandler.MouseHandler_y - 25 - var24; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 0); + var1.drawCentered(class15.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); } } - } // L: 7328 + class263.rasterProvider.drawFull(0, 0); + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1426148283" + ) + static final int method1638(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index ba8610065e..bef4dd2e7e 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -3,85 +3,85 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("bh") @Implements("HealthBar") public class HealthBar extends Node { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Leb;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lkk;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Ley;)V" + descriptor = "(Leb;)V" ) HealthBar(HealthBarDefinition var1) { - this.updates = new IterableNodeDeque(); // L: 12 - this.definition = var1; // L: 15 - } // L: 16 + this.updates = new IterableNodeDeque(); + this.definition = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-45" + descriptor = "(IIIII)V", + garbageValue = "-1687472084" ) @Export("put") void put(int var1, int var2, int var3, int var4) { - HealthBarUpdate var5 = null; // L: 19 - int var6 = 0; // L: 20 + HealthBarUpdate var5 = null; + int var6 = 0; - for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { // L: 21 - ++var6; // L: 22 - if (var7.cycle == var1) { // L: 23 - var7.set(var1, var2, var3, var4); // L: 24 - return; // L: 25 + for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { + ++var6; + if (var7.cycle == var1) { + var7.set(var1, var2, var3, var4); + return; } if (var7.cycle <= var1) { - var5 = var7; // L: 27 + 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("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)Lcw;", - garbageValue = "-1561739593" + descriptor = "(IB)Lbz;", + garbageValue = "93" ) @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 - var2.remove(); // L: 42 - var2 = var3; // L: 43 + HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); + if (var2 != null && var2.cycle <= var1) { + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { + var2.remove(); + var2 = var3; } - if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { return var2; } else { - var2.remove(); // L: 49 - return null; // L: 50 + var2.remove(); + return null; } } else { return null; @@ -91,10 +91,66 @@ public class HealthBar extends Node { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "1" + garbageValue = "-27" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5364(); // L: 55 + return this.updates.method5383(); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-971711054" + ) + static String method1945(int var0) { + return ""; + } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "([Lio;II)V", + garbageValue = "-166878609" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + WorldMapData_0.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + UserComparator10.runScriptEvent(var5); + } + + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = UrlRequester.getWidget(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + continue; + } + } + + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + UserComparator10.runScriptEvent(var5); + } + } + } + } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 80ad80a0a6..3473d1d8e7 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,240 +4,256 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("eb") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) - @Export("HealthBarDefinition_archive") - static AbstractArchive HealthBarDefinition_archive; + @Export("HitSplatDefinition_spritesArchive") + static AbstractArchive HitSplatDefinition_spritesArchive; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("HealthBarDefinition_cached") - static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("HealthBarDefinition_cachedSprites") - static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("j") + public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1611863233 + intValue = 1095688779 ) - public int field1602; - @ObfuscatedName("r") + public int field1578; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 765111099 + intValue = 888679261 ) @Export("int1") public int int1; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -448867717 + intValue = -1338315527 ) @Export("int2") public int int2; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 608050033 + intValue = 1826410989 ) @Export("int3") public int int3; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 277480779 + intValue = -1303491697 ) - public int field1607; - @ObfuscatedName("b") + public int field1585; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -891708783 + intValue = 1768192547 ) @Export("int5") public int int5; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1488754817 + intValue = -1284114831 ) @Export("frontSpriteID") int frontSpriteID; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1162639959 + intValue = 1888620897 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1514706787 + intValue = 384103279 ) @Export("width") public int width; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -320308869 + intValue = -1942526605 ) @Export("widthPadding") public int widthPadding; static { - HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 - HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15 + HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); } HealthBarDefinition() { - this.int1 = 255; // L: 19 - this.int2 = 255; // L: 20 - this.int3 = -1; // L: 21 - this.field1607 = 1; // L: 22 - this.int5 = 70; // L: 23 - this.frontSpriteID = -1; // L: 24 - this.backSpriteID = -1; // L: 25 - this.width = 30; // L: 26 - this.widthPadding = 0; // L: 27 - } // L: 29 + this.int1 = 255; + this.int2 = 255; + this.int3 = -1; + this.field1585 = 1; + this.int5 = 70; + this.frontSpriteID = -1; + this.backSpriteID = -1; + this.width = 30; + this.widthPadding = 0; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1015511162" + descriptor = "(Lnv;I)V", + garbageValue = "-1663696297" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 48 - if (var2 == 0) { // L: 49 - return; // L: 52 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 50 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-1870101408" - ) - @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.method6630(); - } else if (var2 == 8) { // L: 66 - this.backSpriteID = var1.method6630(); - } else if (var2 == 11) { - this.int3 = var1.readUnsignedShort(); // L: 67 - } else if (var2 == 14) { // L: 68 - this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 69 - this.widthPadding = var1.readUnsignedByte(); - } - - } // L: 71 - @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Loa;", - garbageValue = "-1342831199" + descriptor = "(Lnv;II)V", + garbageValue = "-1852726856" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { + var1.readUnsignedShort(); + } else if (var2 == 2) { + this.int1 = var1.readUnsignedByte(); + } else if (var2 == 3) { + this.int2 = var1.readUnsignedByte(); + } else if (var2 == 4) { + this.int3 = 0; + } else if (var2 == 5) { + this.int5 = var1.readUnsignedShort(); + } else if (var2 == 6) { + var1.readUnsignedByte(); + } else if (var2 == 7) { + this.frontSpriteID = var1.method6674(); + } else if (var2 == 8) { + this.backSpriteID = var1.method6674(); + } else if (var2 == 11) { + this.int3 = var1.readUnsignedShort(); + } else if (var2 == 14) { + this.width = var1.readUnsignedByte(); + } else if (var2 == 15) { + this.widthPadding = var1.readUnsignedByte(); + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Lom;", + garbageValue = "103" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 74 + if (this.frontSpriteID < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 75 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); if (var1 != null) { - return var1; // L: 76 + return var1; } else { - var1 = Tile.SpriteBuffer_getSprite(class378.HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 77 - if (var1 != null) { // L: 78 + var1 = ViewportMouse.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); + if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } - return var1; // L: 80 + return var1; } } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Loa;", - garbageValue = "1938378988" + descriptor = "(I)Lom;", + garbageValue = "389239456" ) @Export("getBackSprite") public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { // L: 84 + if (this.backSpriteID < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); if (var1 != null) { - return var1; // L: 86 + return var1; } else { - var1 = Tile.SpriteBuffer_getSprite(class378.HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 87 - if (var1 != null) { // L: 88 + var1 = ViewportMouse.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); + if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } - return var1; // L: 90 + return var1; } } } - @ObfuscatedName("o") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IZS)Ljava/lang/String;", - garbageValue = "-25961" + descriptor = "(ILbd;ZI)I", + garbageValue = "2134650169" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { // L: 114 - int var3 = var0; // L: 116 - String var2; - if (var1 && var0 >= 0) { // L: 119 - int var4 = 2; // L: 123 + static int method2798(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.method2417(var3) ? 1 : 0; + return 1; + } else if (var0 == 3501) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class267.method4922(var3) ? 1 : 0; + return 1; + } else if (var0 == 3502) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class120.method2484(var3) ? 1 : 0; + return 1; + } else { + return 2; + } + } - for (int var5 = var0 / 10; var5 != 0; ++var4) { // L: 124 125 127 - var5 /= 10; // L: 126 - } - - char[] var6 = new char[var4]; // L: 129 - var6[0] = '+'; // L: 130 - - for (int var7 = var4 - 1; var7 > 0; --var7) { // L: 131 - int var8 = var3; // L: 132 - var3 /= 10; // L: 133 - int var9 = var8 - var3 * 10; // L: 134 - if (var9 >= 10) { // L: 135 - var6[var7] = (char)(var9 + 87); - } else { - var6[var7] = (char)(var9 + 48); // L: 136 + @ObfuscatedName("jr") + @ObfuscatedSignature( + descriptor = "(Lio;B)Z", + garbageValue = "2" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = JagexCache.method2617(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var2 == var3) { + return false; + } + } else if (var3 != var2) { + return false; } - - var2 = new String(var6); // L: 138 - } else { - var2 = Integer.toString(var0, 10); // L: 120 } - return var2; // L: 140 - } else { - return Integer.toString(var0); + return true; } } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index c72cfc23df..0596aa6fb5 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,126 +1,76 @@ -import java.applet.Applet; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("cw") +@ObfuscatedName("bz") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1899211573 + intValue = 1564822049 ) @Export("cycle") int cycle; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1533499455 + intValue = 396108399 ) @Export("health") int health; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1222578815 + intValue = -1574607109 ) @Export("health2") int health2; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 266860217 + intValue = -1966461257 ) @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { - this.cycle = var1; // L: 12 - this.health = var2; // L: 13 - this.health2 = var3; // L: 14 - this.cycleOffset = var4; // L: 15 - } // L: 16 + this.cycle = var1; + this.health = var2; + this.health2 = var3; + this.cycleOffset = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-672501131" + garbageValue = "1017297352" ) @Export("set") void set(int var1, int var2, int var3, int var4) { - this.cycle = var1; // L: 19 - this.health = var2; // L: 20 - this.health2 = var3; // L: 21 - this.cycleOffset = var4; // L: 22 - } // L: 23 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "-2088910415" - ) - static boolean method2284(String var0, int var1, String var2) { - if (var1 == 0) { // L: 59 - try { - if (!class44.field309.startsWith("win")) { // L: 61 - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 62 - throw new Exception(); - } else { - String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 63 - - for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 64 - if (var13.indexOf(var0.charAt(var4)) == -1) { // L: 65 - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 67 - return true; // L: 68 - } - } catch (Throwable var8) { // L: 70 - return false; // L: 71 - } - } else if (var1 == 1) { // L: 74 - try { - Applet var7 = class44.applet; // L: 77 - Object[] var5 = new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}; // L: 78 - Object var3 = JSObject.getWindow(var7).call(var2, var5); // L: 81 - return var3 != null; // L: 84 - } catch (Throwable var9) { // L: 86 - return false; // L: 87 - } - } else if (var1 == 2) { // L: 90 - try { - class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 92 - return true; // L: 93 - } catch (Exception var10) { // L: 95 - return false; // L: 96 - } - } else if (var1 == 3) { // L: 99 - try { - class42.method521(class44.applet, "loggedout"); // L: 101 - } catch (Throwable var12) { // L: 103 - } - - try { - class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 105 - return true; // L: 106 - } catch (Exception var11) { // L: 108 - return false; // L: 109 - } - } else { - throw new IllegalArgumentException(); // L: 112 - } + this.cycle = var1; + this.health = var2; + this.health2 = var3; + this.cycleOffset = var4; } - @ObfuscatedName("ii") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2083004569" + descriptor = "(II)Lei;", + garbageValue = "-1737036949" ) - static final int method2283() { - return Client.menuOptionsCount - 1; // L: 8968 + @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); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1474231876" + ) + public static int method1894(int var0, int var1, int var2) { + int var3 = class118.method2461(var2 - var1 + 1); + var3 <<= var1; + var0 |= var3; + return var0; } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 9c424dbabe..7f4e3fb1af 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -7,406 +7,415 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("es") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("rw") + @ObfuscatedGetter( + intValue = 1601554383 + ) + static int field1713; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("HitSplatDefinition_archive") static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - static AbstractArchive field1741; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("HitSplatDefinition_fontsArchive") static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lht;" - ) - @Export("HitSplatDefinition_cached") - static EvictingDualNodeHashTable HitSplatDefinition_cached; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" + ) + @Export("HitSplatDefinition_cached") + public static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhw;" ) @Export("HitSplatDefinition_cachedSprites") - static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("o") + public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("HitSplatDefinition_cachedFonts") - static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -723534111 + intValue = 411738229 ) @Export("fontId") int fontId; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1591266189 + intValue = 258226795 ) @Export("textColor") public int textColor; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1859530029 + intValue = 162491923 ) - public int field1738; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1375425207 - ) - int field1739; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1428779523 - ) - int field1736; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1020786297 - ) - int field1730; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 106928431 - ) - int field1754; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 561650227 - ) - public int field1733; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -492190243 - ) - public int field1744; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 2037036053 - ) - public int field1745; - @ObfuscatedName("c") - String field1746; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1791772153 - ) - public int field1747; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1747683339 - ) - public int field1748; - @ObfuscatedName("w") - @Export("transforms") - public int[] transforms; + public int field1716; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -911835177 + intValue = 1731798421 + ) + int field1717; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -687229769 + ) + int field1720; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1240611547 + ) + int field1719; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -670431333 + ) + int field1718; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1031558843 + ) + public int field1721; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1977484367 + ) + public int field1722; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -148229729 + ) + public int field1706; + @ObfuscatedName("b") + String field1724; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1909368231 + ) + public int field1725; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1197229655 + ) + public int field1726; + @ObfuscatedName("y") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -707974113 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 486037971 + intValue = -673375799 ) @Export("transformVarp") int transformVarp; static { - HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18 - HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 19 - HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); // L: 20 + HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); + HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); + HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); } HitSplatDefinition() { - this.fontId = -1; // L: 26 - this.textColor = 16777215; // L: 27 - this.field1738 = 70; // L: 28 - this.field1739 = -1; // L: 29 - this.field1736 = -1; // L: 30 - this.field1730 = -1; // L: 31 - this.field1754 = -1; // L: 32 - this.field1733 = 0; // L: 33 - this.field1744 = 0; // L: 34 - this.field1745 = -1; // L: 35 - this.field1746 = ""; // L: 36 - this.field1747 = -1; // L: 37 - this.field1748 = 0; // L: 38 - this.transformVarbit = -1; // L: 40 - this.transformVarp = -1; // L: 41 - } // L: 43 + this.fontId = -1; + this.textColor = 16777215; + this.field1716 = 70; + this.field1717 = -1; + this.field1720 = -1; + this.field1719 = -1; + this.field1718 = -1; + this.field1721 = 0; + this.field1722 = 0; + this.field1706 = -1; + this.field1724 = ""; + this.field1725 = -1; + this.field1726 = 0; + this.transformVarbit = -1; + this.transformVarp = -1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1789586115" + descriptor = "(Lnv;I)V", + garbageValue = "992937334" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 63 - if (var2 == 0) { // L: 64 - return; // L: 67 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 65 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-1884352839" + descriptor = "(Lnv;II)V", + garbageValue = "144346720" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 70 - this.fontId = var1.method6630(); - } else if (var2 == 2) { // L: 71 + if (var2 == 1) { + this.fontId = var1.method6674(); + } else if (var2 == 2) { this.textColor = var1.readMedium(); - } else if (var2 == 3) { // L: 72 - this.field1739 = var1.method6630(); - } else if (var2 == 4) { // L: 73 - this.field1730 = var1.method6630(); - } else if (var2 == 5) { // L: 74 - this.field1736 = var1.method6630(); - } else if (var2 == 6) { // L: 75 - this.field1754 = var1.method6630(); - } else if (var2 == 7) { // L: 76 - this.field1733 = var1.readShort(); - } else if (var2 == 8) { // L: 77 - this.field1746 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { // L: 78 - this.field1738 = var1.readUnsignedShort(); + } else if (var2 == 3) { + this.field1717 = var1.method6674(); + } else if (var2 == 4) { + this.field1719 = var1.method6674(); + } else if (var2 == 5) { + this.field1720 = var1.method6674(); + } else if (var2 == 6) { + this.field1718 = var1.method6674(); + } else if (var2 == 7) { + this.field1721 = var1.readShort(); + } else if (var2 == 8) { + this.field1724 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { + this.field1716 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field1744 = var1.readShort(); + this.field1722 = var1.readShort(); } else if (var2 == 11) { - this.field1745 = 0; - } else if (var2 == 12) { // L: 81 - this.field1747 = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 82 - this.field1748 = var1.readShort(); + this.field1706 = 0; + } else if (var2 == 12) { + this.field1725 = var1.readUnsignedByte(); + } else if (var2 == 13) { + this.field1726 = var1.readShort(); } else if (var2 == 14) { - this.field1745 = var1.readUnsignedShort(); // L: 83 - } else if (var2 == 17 || var2 == 18) { // L: 84 - this.transformVarbit = var1.readUnsignedShort(); // L: 85 - if (this.transformVarbit == 65535) { // L: 86 + this.field1706 = var1.readUnsignedShort(); + } else if (var2 == 17 || var2 == 18) { + this.transformVarbit = var1.readUnsignedShort(); + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 87 - if (this.transformVarp == 65535) { // L: 88 + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } - int var3 = -1; // L: 89 - if (var2 == 18) { // L: 90 - var3 = var1.readUnsignedShort(); // L: 91 - if (var3 == 65535) { // L: 92 + int var3 = -1; + if (var2 == 18) { + var3 = var1.readUnsignedShort(); + if (var3 == 65535) { var3 = -1; } } - int var4 = var1.readUnsignedByte(); // L: 94 - this.transforms = new int[var4 + 2]; // L: 95 + int var4 = var1.readUnsignedByte(); + this.transforms = new int[var4 + 2]; - for (int var5 = 0; var5 <= var4; ++var5) { // L: 96 - this.transforms[var5] = var1.readUnsignedShort(); // L: 97 - if (this.transforms[var5] == 65535) { // L: 98 + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.readUnsignedShort(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 100 + this.transforms[var4 + 1] = var3; } - } // L: 103 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Les;", - garbageValue = "0" + descriptor = "(I)Les;", + garbageValue = "-1548593405" ) @Export("transform") public final HitSplatDefinition transform() { - int var1 = -1; // L: 106 - if (this.transformVarbit != -1) { // L: 107 - var1 = ScriptFrame.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 108 + int var1 = -1; + if (this.transformVarbit != -1) { + var1 = WorldMapSection0.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 110 - var2 = this.transforms[var1]; // L: 111 + if (var1 >= 0 && var1 < this.transforms.length - 1) { + var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Decimator.method1171(var2) : null; // L: 112 113 + return var2 != -1 ? ObjectComposition.method3044(var2) : null; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "991764239" + ) + @Export("getString") + public String getString(int var1) { + String var2 = this.field1724; + + while (true) { + int var3 = var2.indexOf("%1"); + if (var3 < 0) { + return var2; + } + + var2 = var2.substring(0, var3) + MusicPatchNode.intToString(var1, false) + var2.substring(var3 + 2); + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)Lom;", + garbageValue = "2141708978" + ) + public SpritePixels method2970() { + if (this.field1717 < 0) { + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1717); + if (var1 != null) { + return var1; + } else { + var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1717, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1717); + } + + return var1; + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)Lom;", + garbageValue = "-5" + ) + public SpritePixels method2960() { + if (this.field1720 < 0) { + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1720); + if (var1 != null) { + return var1; + } else { + var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1720, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1720); + } + + return var1; + } + } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-47892003" + descriptor = "(I)Lom;", + garbageValue = "-890691987" ) - @Export("getString") - public String getString(int var1) { - String var2 = this.field1746; // L: 117 + public SpritePixels method2961() { + if (this.field1719 < 0) { + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1719); + if (var1 != null) { + return var1; + } else { + var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1719, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1719); + } - while (true) { - int var3 = var2.indexOf("%1"); // L: 119 - if (var3 < 0) { // L: 120 - return var2; // L: 123 + return var1; } - - var2 = var2.substring(0, var3) + HealthBarDefinition.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 } } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)Loa;", - garbageValue = "80" + descriptor = "(B)Lom;", + garbageValue = "-104" ) - public SpritePixels method2978() { - if (this.field1739 < 0) { // L: 127 + public SpritePixels method2962() { + if (this.field1718 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1739); // L: 128 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1718); if (var1 != null) { - return var1; // L: 129 + return var1; } else { - var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1739, 0); // L: 130 - if (var1 != null) { // L: 131 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1739); + var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1718, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1718); } - return var1; // L: 133 + return var1; } } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Loa;", - garbageValue = "-85" - ) - public SpritePixels method3005() { - if (this.field1736 < 0) { // L: 137 - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1736); // L: 138 - if (var1 != null) { - return var1; // L: 139 - } else { - var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1736, 0); // L: 140 - if (var1 != null) { // L: 141 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1736); - } - - return var1; // L: 143 - } - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Loa;", - garbageValue = "-905077857" - ) - public SpritePixels method2980() { - if (this.field1730 < 0) { // L: 147 - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1730); // L: 148 - if (var1 != null) { - return var1; // L: 149 - } else { - var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1730, 0); // L: 150 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1730); // L: 151 - } - - return var1; // L: 153 - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)Loa;", - garbageValue = "86" - ) - public SpritePixels method2981() { - if (this.field1754 < 0) { // L: 157 - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1754); - if (var1 != null) { - return var1; // L: 159 - } else { - var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1754, 0); // L: 160 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1754); // L: 161 - } - - return var1; // L: 163 - } - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Lkj;", - garbageValue = "-548642853" + descriptor = "(I)Lkt;", + garbageValue = "1025238458" ) @Export("getFont") public Font getFont() { - if (this.fontId == -1) { // L: 167 + if (this.fontId == -1) { return null; } else { - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 168 - if (var1 != null) { // L: 169 + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); + if (var1 != null) { return var1; } else { - var1 = Bounds.method6034(field1741, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170 + var1 = class251.method4840(class163.field1913, HitSplatDefinition_fontsArchive, this.fontId, 0); if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171 + HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } - return var1; // L: 173 + return var1; } } } - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "20" + descriptor = "(IIII)J", + garbageValue = "-1512777852" ) - static char method3013(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 79 80 + static long method2988(int var0, int var1, int var2) { + return (long)(var2 << 16 | var0 << 8 | var1); } - @ObfuscatedName("h") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1542178595" + descriptor = "(I)V", + garbageValue = "172246338" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 158 + static void method2981() { + if (class367.field4127 != null) { + Client.field679 = Client.cycle; + class367.field4127.method5183(); + + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + class367.field4127.method5182((Client.players[var0].x >> 7) + GrandExchangeOfferNameComparator.baseX, (Client.players[var0].y >> 7) + NPC.baseY); + } + } + } + } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index e97b1373d4..84ce5f6382 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,127 +4,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("eh") @Implements("HorizontalAlignment") -public enum HorizontalAlignment implements Enumerated -{ - @ObfuscatedName("f") +public enum HorizontalAlignment implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Leh;" ) - field1630(1, 0), - @ObfuscatedName("e") + field1612(2, 0), + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Leh;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(2, 1), + HorizontalAlignment_centered(0, 1), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Leh;" ) - field1632(0, 2); + field1608(1, 2); - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1337520325 + intValue = 408090273 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("bt") + @Export("otp") + static String otp; + @ObfuscatedName("dm") + @ObfuscatedGetter( + longValue = 2624473618268498173L + ) + static long field1609; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1196948591 ) @Export("value") public final int value; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1920193363 + intValue = -491897209 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 + this.value = var3; + this.id = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 23 + return this.id; } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "537873753" + descriptor = "(II)Z", + garbageValue = "1899123482" ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 84 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 85 - char var7 = var0.charAt(var6 + var1); // L: 86 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 87 - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 88 - var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 89 - var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 90 - var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 91 - var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 92 - var3[var6 + var4] = -123; - } else if (var7 == 8224) { // L: 93 - var3[var6 + var4] = -122; - } else if (var7 == 8225) { // L: 94 - var3[var6 + var4] = -121; - } else if (var7 == 710) { // L: 95 - var3[var6 + var4] = -120; - } else if (var7 == 8240) { // L: 96 - var3[var6 + var4] = -119; - } else if (var7 == 352) { // L: 97 - var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 98 - var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 99 - var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 100 - var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 101 - var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 102 - var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 103 - var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 104 - var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 105 - var3[var6 + var4] = -107; - } else if (var7 == 8211) { // L: 106 - var3[var6 + var4] = -106; - } else if (var7 == 8212) { // L: 107 - var3[var6 + var4] = -105; - } else if (var7 == 732) { // L: 108 - var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 109 - var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 110 - var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 111 - var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 112 - var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 113 - var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 114 - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; // L: 115 - } - } - - return var5; // L: 117 + public static boolean method2816(int var0) { + return (var0 >> 28 & 1) != 0; } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index c2e100d4ce..ac4ec68149 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,19 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("ie") @Implements("Huffman") public class Huffman { - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; @ObfuscatedName("f") + static byte[][][] field3113; + @ObfuscatedName("gz") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("s") @Export("masks") int[] masks; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("bits") byte[] bits; @ObfuscatedName("v") @@ -23,127 +22,127 @@ public class Huffman { int[] keys; public Huffman(byte[] var1) { - int var2 = var1.length; // L: 9 - this.masks = new int[var2]; // L: 10 - this.bits = var1; // L: 11 - int[] var3 = new int[33]; // L: 12 - this.keys = new int[8]; // L: 13 - int var4 = 0; // L: 14 + int var2 = var1.length; + this.masks = new int[var2]; + this.bits = var1; + int[] var3 = new int[33]; + this.keys = new int[8]; + int var4 = 0; - for (int var5 = 0; var5 < var2; ++var5) { // L: 15 - byte var6 = var1[var5]; // L: 16 - if (var6 != 0) { // L: 17 - int var7 = 1 << 32 - var6; // L: 18 - int var8 = var3[var6]; // L: 19 - this.masks[var5] = var8; // L: 20 + for (int var5 = 0; var5 < var2; ++var5) { + byte var6 = var1[var5]; + if (var6 != 0) { + int var7 = 1 << 32 - var6; + int var8 = var3[var6]; + this.masks[var5] = var8; int var9; int var10; int var11; int var12; - if ((var8 & var7) != 0) { // L: 22 + if ((var8 & var7) != 0) { var9 = var3[var6 - 1]; } else { - var9 = var8 | var7; // L: 24 + var9 = var8 | var7; - for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25 - var11 = var3[var10]; // L: 26 - if (var11 != var8) { // L: 27 + for (var10 = var6 - 1; var10 >= 1; --var10) { + var11 = var3[var10]; + if (var11 != var8) { break; } - var12 = 1 << 32 - var10; // L: 28 - if ((var11 & var12) != 0) { // L: 29 - var3[var10] = var3[var10 - 1]; // L: 30 + var12 = 1 << 32 - var10; + if ((var11 & var12) != 0) { + var3[var10] = var3[var10 - 1]; break; } - var3[var10] = var11 | var12; // L: 33 + var3[var10] = var11 | var12; } } - var3[var6] = var9; // L: 38 + var3[var6] = var9; - for (var10 = var6 + 1; var10 <= 32; ++var10) { // L: 39 - if (var8 == var3[var10]) { // L: 40 + for (var10 = var6 + 1; var10 <= 32; ++var10) { + if (var8 == var3[var10]) { var3[var10] = var9; } } - var10 = 0; // L: 42 + var10 = 0; - for (var11 = 0; var11 < var6; ++var11) { // L: 43 - var12 = Integer.MIN_VALUE >>> var11; // L: 44 - if ((var8 & var12) != 0) { // L: 45 - if (this.keys[var10] == 0) { // L: 46 + for (var11 = 0; var11 < var6; ++var11) { + var12 = Integer.MIN_VALUE >>> var11; + if ((var8 & var12) != 0) { + if (this.keys[var10] == 0) { this.keys[var10] = var4; } - var10 = this.keys[var10]; // L: 47 + var10 = this.keys[var10]; } else { - ++var10; // L: 49 + ++var10; } - if (var10 >= this.keys.length) { // L: 50 - int[] var13 = new int[this.keys.length * 2]; // L: 51 + if (var10 >= this.keys.length) { + int[] var13 = new int[this.keys.length * 2]; - for (int var14 = 0; var14 < this.keys.length; ++var14) { // L: 52 + for (int var14 = 0; var14 < this.keys.length; ++var14) { var13[var14] = this.keys[var14]; } - this.keys = var13; // L: 53 + this.keys = var13; } - var12 >>>= 1; // L: 55 + var12 >>>= 1; } - this.keys[var10] = ~var5; // L: 57 - if (var10 >= var4) { // L: 58 + this.keys[var10] = ~var5; + if (var10 >= var4) { var4 = var10 + 1; } } } - } // L: 60 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "-1958410774" + garbageValue = "-2001454460" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { - int var6 = 0; // L: 63 - int var7 = var5 << 3; // L: 64 + int var6 = 0; + int var7 = var5 << 3; - for (var3 += var2; var2 < var3; ++var2) { // L: 65 66 - int var8 = var1[var2] & 255; // L: 67 - int var9 = this.masks[var8]; // L: 68 - byte var10 = this.bits[var8]; // L: 69 - if (var10 == 0) { // L: 70 + for (var3 += var2; var2 < var3; ++var2) { + int var8 = var1[var2] & 255; + int var9 = this.masks[var8]; + byte var10 = this.bits[var8]; + if (var10 == 0) { throw new RuntimeException("" + var8); } - int var11 = var7 >> 3; // L: 71 - int var12 = var7 & 7; // L: 72 - var6 &= -var12 >> 31; // L: 73 - int var13 = (var12 + var10 - 1 >> 3) + var11; // L: 74 - var12 += 24; // L: 76 - var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77 - if (var11 < var13) { // L: 78 - ++var11; // L: 79 - var12 -= 8; // L: 80 + int var11 = var7 >> 3; + int var12 = var7 & 7; + var6 &= -var12 >> 31; + int var13 = (var10 + var12 - 1 >> 3) + var11; + var12 += 24; + var4[var11] = (byte)(var6 |= var9 >>> var12); + if (var11 < var13) { + ++var11; + var12 -= 8; var4[var11] = (byte)(var6 = var9 >>> var12); if (var11 < var13) { - ++var11; // L: 83 + ++var11; var12 -= 8; var4[var11] = (byte)(var6 = var9 >>> var12); if (var11 < var13) { ++var11; - var12 -= 8; // L: 88 - var4[var11] = (byte)(var6 = var9 >>> var12); // L: 89 + var12 -= 8; + var4[var11] = (byte)(var6 = var9 >>> var12); if (var11 < var13) { ++var11; - var12 -= 8; // L: 92 + var12 -= 8; var4[var11] = (byte)(var6 = var9 << -var12); } } @@ -153,21 +152,21 @@ public class Huffman { var7 += var10; } - return (var7 + 7 >> 3) - var5; // L: 97 + return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "1331615778" + garbageValue = "-2100484345" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { if (var5 == 0) { return 0; } else { - int var6 = 0; // L: 102 - var5 += var4; // L: 103 + int var6 = 0; + var5 += var4; int var7 = var2; while (true) { @@ -175,11 +174,11 @@ public class Huffman { if (var8 < 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 109 + ++var6; } int var9; - if ((var9 = this.keys[var6]) < 0) { // L: 110 + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -188,29 +187,29 @@ public class Huffman { var6 = 0; } - if ((var8 & 64) != 0) { // L: 115 + if ((var8 & 64) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 116 + ++var6; } if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); - if (var4 >= var5) { // L: 119 + if (var4 >= var5) { break; } - var6 = 0; // L: 120 + var6 = 0; } - if ((var8 & 32) != 0) { // L: 122 + if ((var8 & 32) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 123 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 124 - var3[var4++] = (byte)(~var9); // L: 125 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; } @@ -221,159 +220,153 @@ public class Huffman { if ((var8 & 16) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 130 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 131 + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); - if (var4 >= var5) { // L: 133 + if (var4 >= var5) { break; } - var6 = 0; // L: 134 + var6 = 0; } - if ((var8 & 8) != 0) { // L: 136 + if ((var8 & 8) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 137 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 138 - var3[var4++] = (byte)(~var9); // L: 139 - if (var4 >= var5) { // L: 140 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 141 + var6 = 0; } - if ((var8 & 4) != 0) { // L: 143 + if ((var8 & 4) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 144 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 145 - var3[var4++] = (byte)(~var9); // L: 146 - if (var4 >= var5) { // L: 147 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 148 + var6 = 0; } - if ((var8 & 2) != 0) { // L: 150 + if ((var8 & 2) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 151 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 152 - var3[var4++] = (byte)(~var9); // L: 153 - if (var4 >= var5) { // L: 154 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 155 + var6 = 0; } if ((var8 & 1) != 0) { - var6 = this.keys[var6]; // L: 157 + var6 = this.keys[var6]; } else { - ++var6; // L: 158 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 159 - var3[var4++] = (byte)(~var9); // L: 160 - if (var4 >= var5) { // L: 161 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 162 + var6 = 0; } ++var7; } - return var7 + 1 - var2; // L: 165 + return var7 + 1 - var2; } } - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;IIIIIII)V", - garbageValue = "1430130968" + descriptor = "([Lkf;II)Lkf;", + garbageValue = "-498785884" ) - @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: 81 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 82 + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; - while (true) { - var7 = var0.readUnsignedByte(); // L: 84 - if (var7 == 0) { // L: 85 - if (var1 == 0) { // L: 86 - int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 87 - int var11 = var2 + var4 + 932731; // L: 90 - int var12 = var3 + var5 + 556238; // L: 91 - int var13 = AttackOption.method2382(var11 + 45365, var12 + 91923, 4) - 128 + (AttackOption.method2382(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (AttackOption.method2382(var11, var12, 1) - 128 >> 2); // L: 93 - var13 = (int)(0.3D * (double)var13) + 35; // L: 94 - if (var13 < 10) { // L: 95 - var13 = 10; - } else if (var13 > 60) { // L: 96 - var13 = 60; - } - - var14[var3] = -var13 * 8; // L: 99 - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 101 - } - break; - } - - if (var7 == 1) { // L: 104 - int var8 = var0.readUnsignedByte(); // L: 105 - if (var8 == 1) { // L: 106 - var8 = 0; - } - - if (var1 == 0) { // L: 107 - 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: 108 - } - break; - } - - if (var7 <= 49) { // L: 111 - Tiles.field1111[var1][var2][var3] = var0.readByte(); // L: 112 - class22.field186[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 113 - class16.field132[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 114 - } else if (var7 <= 81) { // L: 117 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 118 - } else { - AccessFile.field4098[var1][var2][var3] = (byte)(var7 - 81); // L: 121 - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); // L: 126 - if (var7 == 0) { // L: 127 - break; - } - - if (var7 == 1) { // L: 128 - var0.readUnsignedByte(); // L: 129 - break; - } - - if (var7 <= 49) { // L: 132 - var0.readUnsignedByte(); - } + for (int var3 = 0; var3 < var2.length; ++var3) { + Enumerated var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; } } - } // L: 135 + return null; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-69" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class100.Widget_loadedInterfaces[var0]) { + return true; + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { + return false; + } else { + int var1 = Widget.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + class100.Widget_loadedInterfaces[var0] = true; + return true; + } else { + if (Widget.Widget_interfaceComponents[var0] == null) { + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { + if (Widget.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + } + } + } + } + + class100.Widget_loadedInterfaces[var0] = true; + return true; + } + } + } + + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "311556641" + ) + static final void method4834() { + Scene.Scene_isLowDetail = false; + Client.isLowDetail = false; + } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 861be32442..f5c810c415 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,88 +3,107 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("lu") @Implements("IgnoreList") public class IgnoreList extends UserList { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lnb;)V" + descriptor = "(Lnf;)V" ) public IgnoreList(LoginType var1) { - super(400); // L: 12 - this.loginType = var1; // L: 13 - } // L: 14 + super(400); + this.loginType = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Llf;", - garbageValue = "1590299985" + descriptor = "(B)Llm;", + garbageValue = "-70" ) @Export("newInstance") User newInstance() { - return new Ignored(); // L: 17 + return new Ignored(); } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)[Llf;", - garbageValue = "-1320557093" + descriptor = "(II)[Llm;", + garbageValue = "-2047984332" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Ignored[var1]; // L: 21 + return new Ignored[var1]; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "89" + descriptor = "(Lnv;II)V", + garbageValue = "541103993" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { // L: 25 - int var3 = var1.readUnsignedByte(); // L: 26 - boolean var4 = (var3 & 1) == 1; // L: 27 - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 28 - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 29 - var1.readStringCp1252NullTerminated(); // L: 30 - if (var5 != null && var5.hasCleanName()) { // L: 31 - Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 32 - if (var4) { // L: 33 - Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 34 - if (var8 != null && var7 != var8) { // L: 35 - if (var7 != null) { // L: 36 - this.remove(var8); // L: 37 + if (var1.offset < var2) { + int var3 = var1.readUnsignedByte(); + boolean var4 = (var3 & 1) == 1; + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + var1.readStringCp1252NullTerminated(); + if (var5 != null && var5.hasCleanName()) { + Ignored var7 = (Ignored)this.getByCurrentUsername(var5); + if (var4) { + Ignored var8 = (Ignored)this.getByCurrentUsername(var6); + if (var8 != null && var8 != var7) { + if (var7 != null) { + this.remove(var8); } else { - var7 = var8; // L: 40 + var7 = var8; } } } - if (var7 != null) { // L: 44 - this.changeName(var7, var5, var6); // L: 45 + if (var7 != null) { + this.changeName(var7, var5, var6); continue; } - if (this.getSize() < 400) { // L: 47 - int var9 = this.getSize(); // L: 48 - var7 = (Ignored)this.addLast(var5, var6); // L: 49 - var7.id = var9; // L: 50 + if (this.getSize() < 400) { + int var9 = this.getSize(); + var7 = (Ignored)this.addLast(var5, var6); + var7.id = var9; } continue; } - throw new IllegalStateException(); // L: 53 + throw new IllegalStateException(); } - return; // L: 54 + return; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1517650205" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { + if (KeyHandler.field59 == KeyHandler.field57) { + return false; + } else { + class120.field1417 = KeyHandler.field54[KeyHandler.field57]; + class126.field1449 = KeyHandler.field51[KeyHandler.field57]; + KeyHandler.field57 = KeyHandler.field57 + 1 & 127; + return true; + } } } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 0a1b142ea0..e8e1c72d3a 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,40 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("lt") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1770922261 + intValue = -1976990997 ) @Export("id") int id; Ignored() { - } // L: 6 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Llq;I)I", - garbageValue = "163760748" + descriptor = "(Llt;I)I", + garbageValue = "-338055787" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { - return this.id - var1.id; // L: 9 + return this.id - var1.id; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llf;I)I", - garbageValue = "-1545273649" + descriptor = "(Llm;I)I", + garbageValue = "2074675333" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.compareTo_ignored((Ignored)var1); // L: 13 + return this.compareTo_ignored((Ignored)var1); } public int compareTo(Object var1) { - return this.compareTo_ignored((Ignored)var1); // L: 17 + return this.compareTo_ignored((Ignored)var1); } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 9dc39803c7..ac8217a1b4 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -5,270 +5,273 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("of") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("pixels") public byte[] pixels; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("palette") public int[] palette; @ObfuscatedName("v") @Export("subWidth") public int subWidth; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("subHeight") public int subHeight; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("xOffset") public int xOffset; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("yOffset") public int yOffset; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("width") public int width; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("height") public int height; - @ObfuscatedName("f") + IndexedSprite() { + } + + @ObfuscatedName("s") @Export("normalize") public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 - byte[] var1 = new byte[this.width * this.height]; // L: 19 - int var2 = 0; // L: 20 + if (this.subWidth != this.width || this.subHeight != this.height) { + byte[] var1 = new byte[this.width * this.height]; + int var2 = 0; - for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 21 - for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 22 - var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++]; // L: 23 + for (int var3 = 0; var3 < this.subHeight; ++var3) { + for (int var4 = 0; var4 < this.subWidth; ++var4) { + var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++]; } } - this.pixels = var1; // L: 26 - this.subWidth = this.width; // L: 27 - this.subHeight = this.height; // L: 28 - this.xOffset = 0; // L: 29 - this.yOffset = 0; // L: 30 + this.pixels = var1; + this.subWidth = this.width; + this.subHeight = this.height; + this.xOffset = 0; + this.yOffset = 0; } - } // L: 31 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 - int var5 = this.palette[var4] >> 16 & 255; // L: 35 - var5 += var1; // L: 36 - if (var5 < 0) { // L: 37 + for (int var4 = 0; var4 < this.palette.length; ++var4) { + int var5 = this.palette[var4] >> 16 & 255; + var5 += var1; + if (var5 < 0) { var5 = 0; - } else if (var5 > 255) { // L: 38 + } else if (var5 > 255) { var5 = 255; } - int var6 = this.palette[var4] >> 8 & 255; // L: 39 - var6 += var2; // L: 40 - if (var6 < 0) { // L: 41 + int var6 = this.palette[var4] >> 8 & 255; + var6 += var2; + if (var6 < 0) { var6 = 0; - } else if (var6 > 255) { // L: 42 + } else if (var6 > 255) { var6 = 255; } - int var7 = this.palette[var4] & 255; // L: 43 - var7 += var3; // L: 44 - if (var7 < 0) { // L: 45 + int var7 = this.palette[var4] & 255; + var7 += var3; + if (var7 < 0) { var7 = 0; - } else if (var7 > 255) { // L: 46 + } else if (var7 > 255) { var7 = 255; } - this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); // L: 47 + this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); } - } // L: 49 + } @ObfuscatedName("v") @Export("drawAt") public void drawAt(int var1, int var2) { - var1 += this.xOffset; // L: 52 - var2 += this.yOffset; // L: 53 - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 54 - int var4 = 0; // L: 55 - int var5 = this.subHeight; // L: 56 - int var6 = this.subWidth; // L: 57 - int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 58 - int var8 = 0; // L: 59 + var1 += this.xOffset; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var4 = 0; + int var5 = this.subHeight; + int var6 = this.subWidth; + int var7 = Rasterizer2D.Rasterizer2D_width - var6; + int var8 = 0; int var9; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 60 - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 61 - var5 -= var9; // L: 62 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 63 - var4 += var9 * var6; // L: 64 - var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 65 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var5 -= var9; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var4 += var9 * var6; + var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 67 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 68 - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 69 - var6 -= var9; // L: 70 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 71 - var4 += var9; // L: 72 - var3 += var9; // L: 73 - var8 += var9; // L: 74 - var7 += var9; // L: 75 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var6 -= var9; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var4 += var9; + var3 += var9; + var8 += var9; + var7 += var9; } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 77 - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 78 - var6 -= var9; // L: 79 - var8 += var9; // L: 80 - var7 += var9; // L: 81 + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var6 -= var9; + var8 += var9; + var7 += var9; } - if (var6 > 0 && var5 > 0) { // L: 83 - IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); // L: 84 + if (var6 > 0 && var5 > 0) { + IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); } - } // L: 85 + } - @ObfuscatedName("j") - public void method6997(int var1, int var2, int var3, int var4) { - int var5 = this.subWidth; // L: 116 - int var6 = this.subHeight; // L: 117 - int var7 = 0; // L: 118 - int var8 = 0; // L: 119 - int var9 = this.width; // L: 120 - int var10 = this.height; // L: 121 - int var11 = (var9 << 16) / var3; // L: 122 - int var12 = (var10 << 16) / var4; // L: 123 + @ObfuscatedName("l") + public void method7066(int var1, int var2, int var3, int var4) { + int var5 = this.subWidth; + int var6 = this.subHeight; + int var7 = 0; + int var8 = 0; + int var9 = this.width; + int var10 = this.height; + int var11 = (var9 << 16) / var3; + int var12 = (var10 << 16) / var4; int var13; - if (this.xOffset > 0) { // L: 124 - var13 = (var11 + (this.xOffset << 16) - 1) / var11; // L: 125 - var1 += var13; // L: 126 - var7 += var13 * var11 - (this.xOffset << 16); // L: 127 + if (this.xOffset > 0) { + var13 = (var11 + (this.xOffset << 16) - 1) / var11; + var1 += var13; + var7 += var13 * var11 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 129 - var13 = (var12 + (this.yOffset << 16) - 1) / var12; // L: 130 - var2 += var13; // L: 131 - var8 += var13 * var12 - (this.yOffset << 16); // L: 132 + if (this.yOffset > 0) { + var13 = (var12 + (this.yOffset << 16) - 1) / var12; + var2 += var13; + var8 += var13 * var12 - (this.yOffset << 16); } - if (var5 < var9) { // L: 134 + if (var5 < var9) { var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { // L: 135 + if (var6 < var10) { var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 136 - int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 137 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 138 + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 139 - var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 140 - var4 -= var15; // L: 141 - var13 += var15 * Rasterizer2D.Rasterizer2D_width; // L: 142 - var8 += var12 * var15; // L: 143 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var15; + var13 += var15 * Rasterizer2D.Rasterizer2D_width; + var8 += var12 * var15; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 145 - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 146 - var3 -= var15; // L: 147 - var14 += var15; // L: 148 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var15; + var14 += var15; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 150 - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 151 - var3 -= var15; // L: 152 - var13 += var15; // L: 153 - var7 += var11 * var15; // L: 154 - var14 += var15; // L: 155 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var15; + var13 += var15; + var7 += var11 * var15; + var14 += var15; } - IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 - } // L: 158 + IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); + } - @ObfuscatedName("y") + @ObfuscatedName("j") @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 - var5 = -(var5 & 3); // L: 89 + int var9 = -(var5 >> 2); + var5 = -(var5 & 3); - for (int var10 = -var6; var10 < 0; ++var10) { // L: 90 + for (int var10 = -var6; var10 < 0; ++var10) { int var11; byte var12; - for (var11 = var9; var11 < 0; ++var11) { // L: 91 - var12 = var1[var3++]; // L: 92 + for (var11 = var9; var11 < 0; ++var11) { + var12 = var1[var3++]; if (var12 != 0) { - var0[var4++] = var2[var12 & 255]; // L: 93 - } else { - ++var4; // L: 94 - } - - var12 = var1[var3++]; // L: 95 - if (var12 != 0) { // L: 96 var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 97 + ++var4; } - var12 = var1[var3++]; // L: 98 - if (var12 != 0) { // L: 99 + var12 = var1[var3++]; + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 100 + ++var4; } - var12 = var1[var3++]; // L: 101 - if (var12 != 0) { // L: 102 + var12 = var1[var3++]; + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 103 + ++var4; + } + + var12 = var1[var3++]; + if (var12 != 0) { + var0[var4++] = var2[var12 & 255]; + } else { + ++var4; } } - for (var11 = var5; var11 < 0; ++var11) { // L: 105 - var12 = var1[var3++]; // L: 106 - if (var12 != 0) { // L: 107 + for (var11 = var5; var11 < 0; ++var11) { + var12 = var1[var3++]; + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 108 + ++var4; } } - var4 += var7; // L: 110 - var3 += var8; // L: 111 + var4 += var7; + var3 += var8; } - } // 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 + int var12 = var3; - for (int var13 = -var8; var13 < 0; ++var13) { // L: 162 - int var14 = var11 * (var4 >> 16); // L: 163 + for (int var13 = -var8; var13 < 0; ++var13) { + int var14 = var11 * (var4 >> 16); - for (int var15 = -var7; var15 < 0; ++var15) { // L: 164 - byte var16 = var1[(var3 >> 16) + var14]; // L: 165 - if (var16 != 0) { // L: 166 + for (int var15 = -var7; var15 < 0; ++var15) { + byte var16 = var1[(var3 >> 16) + var14]; + if (var16 != 0) { var0[var5++] = var2[var16 & 255]; } else { - ++var5; // L: 167 + ++var5; } - var3 += var9; // L: 168 + var3 += var9; } - var4 += var10; // L: 170 - var3 = var12; // L: 171 - var5 += var6; // L: 172 + var4 += var10; + var3 = var12; + var5 += var6; } - } // L: 174 + } } diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index fddc3c0a02..8eddeb2b88 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,186 +4,186 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("ak") @Implements("Instrument") public class Instrument { - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("volume") SoundEnvelope volume; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("delayTime") int delayTime; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("delayDecay") int delayDecay; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lbg;" + descriptor = "Laz;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lg;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("duration") int duration; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("offset") int offset; static { - Instrument_noise = new int[32768]; // L: 31 - Random var0 = new Random(0L); // L: 32 + Instrument_noise = new int[32768]; + Random var0 = new Random(0L); int var1; - for (var1 = 0; var1 < 32768; ++var1) { // L: 33 - Instrument_noise[var1] = (var0.nextInt() & 2) - 1; // L: 34 + for (var1 = 0; var1 < 32768; ++var1) { + Instrument_noise[var1] = (var0.nextInt() & 2) - 1; } - Instrument_sine = new int[32768]; // L: 36 + Instrument_sine = new int[32768]; - for (var1 = 0; var1 < 32768; ++var1) { // L: 37 - Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); // L: 38 + for (var1 = 0; var1 < 32768; ++var1) { + Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); } - Instrument_samples = new int[220500]; // L: 40 - Instrument_phases = new int[5]; // L: 44 - Instrument_delays = new int[5]; // L: 45 - Instrument_volumeSteps = new int[5]; // L: 46 - Instrument_pitchSteps = new int[5]; // L: 47 - Instrument_pitchBaseSteps = new int[5]; // L: 48 + Instrument_samples = new int[220500]; + Instrument_phases = new int[5]; + Instrument_delays = new int[5]; + Instrument_volumeSteps = new int[5]; + Instrument_pitchSteps = new int[5]; + Instrument_pitchBaseSteps = new int[5]; } Instrument() { - this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; // L: 17 - this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; // L: 18 - this.oscillatorDelays = new int[]{0, 0, 0, 0, 0}; // L: 19 - this.delayTime = 0; // L: 20 - this.delayDecay = 100; // L: 21 - this.duration = 500; // L: 24 - this.offset = 0; // L: 25 - } // L: 50 + this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; + this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; + this.oscillatorDelays = new int[]{0, 0, 0, 0, 0}; + this.delayTime = 0; + this.delayDecay = 100; + this.duration = 500; + this.offset = 0; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class307.clearIntArray(Instrument_samples, 0, var1); // L: 53 - if (var2 < 10) { // L: 54 + class308.clearIntArray(Instrument_samples, 0, var1); + if (var2 < 10) { return Instrument_samples; } else { - double var3 = (double)var1 / ((double)var2 + 0.0D); // L: 55 - this.pitch.reset(); // L: 56 - this.volume.reset(); // L: 57 - int var5 = 0; // L: 58 - int var6 = 0; // L: 59 - int var7 = 0; // L: 60 - if (this.pitchModifier != null) { // L: 61 - this.pitchModifier.reset(); // L: 62 - this.pitchModifierAmplitude.reset(); // L: 63 - var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); // L: 64 - var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); // L: 65 + double var3 = (double)var1 / ((double)var2 + 0.0D); + this.pitch.reset(); + this.volume.reset(); + int var5 = 0; + int var6 = 0; + int var7 = 0; + if (this.pitchModifier != null) { + this.pitchModifier.reset(); + this.pitchModifierAmplitude.reset(); + var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); + var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); } - int var8 = 0; // L: 67 - int var9 = 0; // L: 68 - int var10 = 0; // L: 69 - if (this.volumeMultiplier != null) { // L: 70 - this.volumeMultiplier.reset(); // L: 71 - this.volumeMultiplierAmplitude.reset(); // L: 72 - var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); // L: 73 - var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); // L: 74 + int var8 = 0; + int var9 = 0; + int var10 = 0; + if (this.volumeMultiplier != null) { + this.volumeMultiplier.reset(); + this.volumeMultiplierAmplitude.reset(); + var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); + var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); } int var11; - for (var11 = 0; var11 < 5; ++var11) { // L: 76 - if (this.oscillatorVolume[var11] != 0) { // L: 77 - Instrument_phases[var11] = 0; // L: 78 - Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); // L: 79 - Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; // L: 80 - Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); // L: 81 - Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); // L: 82 + for (var11 = 0; var11 < 5; ++var11) { + if (this.oscillatorVolume[var11] != 0) { + Instrument_phases[var11] = 0; + Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); + Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; + Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); + Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); } } @@ -192,30 +192,30 @@ public class Instrument { int var14; int var15; int[] var10000; - for (var11 = 0; var11 < var1; ++var11) { // L: 84 - var12 = this.pitch.doStep(var1); // L: 85 - var13 = this.volume.doStep(var1); // L: 86 - if (this.pitchModifier != null) { // L: 87 - var14 = this.pitchModifier.doStep(var1); // L: 88 - var15 = this.pitchModifierAmplitude.doStep(var1); // L: 89 - var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; // L: 90 - var7 = var7 + var6 + (var14 * var5 >> 16); // L: 91 + for (var11 = 0; var11 < var1; ++var11) { + var12 = this.pitch.doStep(var1); + var13 = this.volume.doStep(var1); + if (this.pitchModifier != null) { + var14 = this.pitchModifier.doStep(var1); + var15 = this.pitchModifierAmplitude.doStep(var1); + var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; + var7 = var7 + var6 + (var14 * var5 >> 16); } - if (this.volumeMultiplier != null) { // L: 93 - var14 = this.volumeMultiplier.doStep(var1); // L: 94 - var15 = this.volumeMultiplierAmplitude.doStep(var1); // L: 95 - var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; // L: 96 - var10 = var10 + var9 + (var14 * var8 >> 16); // L: 97 + if (this.volumeMultiplier != null) { + var14 = this.volumeMultiplier.doStep(var1); + var15 = this.volumeMultiplierAmplitude.doStep(var1); + var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; + var10 = var10 + var9 + (var14 * var8 >> 16); } - for (var14 = 0; var14 < 5; ++var14) { // L: 99 - if (this.oscillatorVolume[var14] != 0) { // L: 100 - var15 = Instrument_delays[var14] + var11; // L: 101 - if (var15 < var1) { // L: 102 - var10000 = Instrument_samples; // L: 103 + for (var14 = 0; var14 < 5; ++var14) { + if (this.oscillatorVolume[var14] != 0) { + var15 = Instrument_delays[var14] + var11; + if (var15 < var1) { + var10000 = Instrument_samples; var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); - var10000 = Instrument_phases; // L: 104 + var10000 = Instrument_phases; var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } @@ -223,204 +223,204 @@ public class Instrument { } int var16; - if (this.release != null) { // L: 108 - this.release.reset(); // L: 109 - this.attack.reset(); // L: 110 - var11 = 0; // L: 111 - boolean var19 = false; // L: 112 - boolean var20 = true; // L: 113 + if (this.release != null) { + this.release.reset(); + this.attack.reset(); + var11 = 0; + boolean var19 = false; + boolean var20 = true; - for (var14 = 0; var14 < var1; ++var14) { // L: 114 - var15 = this.release.doStep(var1); // L: 115 - var16 = this.attack.doStep(var1); // L: 116 - if (var20) { // L: 117 + for (var14 = 0; var14 < var1; ++var14) { + var15 = this.release.doStep(var1); + var16 = this.attack.doStep(var1); + if (var20) { var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; } else { - var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; // L: 118 + var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; } - var11 += 256; // L: 119 + var11 += 256; if (var11 >= var12) { - var11 = 0; // L: 120 - var20 = !var20; // L: 121 + var11 = 0; + var20 = !var20; } - if (var20) { // L: 123 + if (var20) { Instrument_samples[var14] = 0; } } } - if (this.delayTime > 0 && this.delayDecay > 0) { // L: 126 - var11 = (int)((double)this.delayTime * var3); // L: 127 + if (this.delayTime > 0 && this.delayDecay > 0) { + var11 = (int)((double)this.delayTime * var3); - for (var12 = var11; var12 < var1; ++var12) { // L: 128 + for (var12 = var11; var12 < var1; ++var12) { var10000 = Instrument_samples; var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } } - if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { // L: 130 - this.filterEnvelope.reset(); // L: 131 - var11 = this.filterEnvelope.doStep(var1 + 1); // L: 132 - var12 = this.filter.compute(0, (float)var11 / 65536.0F); // L: 133 - var13 = this.filter.compute(1, (float)var11 / 65536.0F); // L: 134 - if (var1 >= var12 + var13) { // L: 135 - var14 = 0; // L: 136 - var15 = var13; // L: 137 - if (var13 > var1 - var12) { // L: 138 + if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { + this.filterEnvelope.reset(); + var11 = this.filterEnvelope.doStep(var1 + 1); + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); + if (var1 >= var12 + var13) { + var14 = 0; + var15 = var13; + if (var13 > var1 - var12) { var15 = var1 - var12; } int var17; while (var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 140 + var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - for (var17 = 0; var17 < var12; ++var17) { // L: 141 + for (var17 = 0; var17 < var12; ++var17) { var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); } - for (var17 = 0; var17 < var14; ++var17) { // L: 142 + for (var17 = 0; var17 < var14; ++var17) { var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); } - Instrument_samples[var14] = var16; // L: 143 - var11 = this.filterEnvelope.doStep(var1 + 1); // L: 144 - ++var14; // L: 139 + Instrument_samples[var14] = var16; + var11 = this.filterEnvelope.doStep(var1 + 1); + ++var14; } - var15 = 128; // L: 147 + var15 = 128; while (true) { - if (var15 > var1 - var12) { // L: 149 + if (var15 > var1 - var12) { var15 = var1 - var12; } int var18; while (var14 < var15) { - var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 151 + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - for (var18 = 0; var18 < var12; ++var18) { // L: 152 + for (var18 = 0; var18 < var12; ++var18) { var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { // L: 153 + for (var18 = 0; var18 < var13; ++var18) { var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; // L: 154 - var11 = this.filterEnvelope.doStep(var1 + 1); // L: 155 - ++var14; // L: 150 + Instrument_samples[var14] = var17; + var11 = this.filterEnvelope.doStep(var1 + 1); + ++var14; } - if (var14 >= var1 - var12) { // L: 157 + if (var14 >= var1 - var12) { while (var14 < var1) { - var17 = 0; // L: 163 + var17 = 0; - for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { // L: 164 + for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { // L: 165 + for (var18 = 0; var18 < var13; ++var18) { var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; // L: 166 - this.filterEnvelope.doStep(var1 + 1); // L: 167 - ++var14; // L: 162 + Instrument_samples[var14] = var17; + this.filterEnvelope.doStep(var1 + 1); + ++var14; } break; } - var12 = this.filter.compute(0, (float)var11 / 65536.0F); // L: 158 - var13 = this.filter.compute(1, (float)var11 / 65536.0F); // L: 159 - var15 += 128; // L: 160 + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); + var15 += 128; } } } - for (var11 = 0; var11 < var1; ++var11) { // L: 171 - if (Instrument_samples[var11] < -32768) { // L: 172 + for (var11 = 0; var11 < var1; ++var11) { + if (Instrument_samples[var11] < -32768) { Instrument_samples[var11] = -32768; } - if (Instrument_samples[var11] > 32767) { // L: 173 + if (Instrument_samples[var11] > 32767) { Instrument_samples[var11] = 32767; } } - return Instrument_samples; // L: 175 + return Instrument_samples; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { - if (var3 == 1) { // L: 179 - return (var1 & 32767) < 16384 ? var2 : -var2; // L: 180 181 - } else if (var3 == 2) { // L: 183 + if (var3 == 1) { + return (var1 & 32767) < 16384 ? var2 : -var2; + } else if (var3 == 2) { return Instrument_sine[var1 & 32767] * var2 >> 14; - } else if (var3 == 3) { // L: 184 + } else if (var3 == 3) { return (var2 * (var1 & 32767) >> 14) - var2; } else { - return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; // L: 185 186 + return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) @Export("decode") final void decode(Buffer var1) { - this.pitch = new SoundEnvelope(); // L: 190 - this.pitch.decode(var1); // L: 191 - this.volume = new SoundEnvelope(); // L: 192 - this.volume.decode(var1); // L: 193 - int var2 = var1.readUnsignedByte(); // L: 194 - if (var2 != 0) { // L: 195 - --var1.offset; // L: 196 - this.pitchModifier = new SoundEnvelope(); // L: 197 - this.pitchModifier.decode(var1); // L: 198 - this.pitchModifierAmplitude = new SoundEnvelope(); // L: 199 - this.pitchModifierAmplitude.decode(var1); // L: 200 + this.pitch = new SoundEnvelope(); + this.pitch.decode(var1); + this.volume = new SoundEnvelope(); + this.volume.decode(var1); + int var2 = var1.readUnsignedByte(); + if (var2 != 0) { + --var1.offset; + this.pitchModifier = new SoundEnvelope(); + this.pitchModifier.decode(var1); + this.pitchModifierAmplitude = new SoundEnvelope(); + this.pitchModifierAmplitude.decode(var1); } - var2 = var1.readUnsignedByte(); // L: 202 - if (var2 != 0) { // L: 203 - --var1.offset; // L: 204 - this.volumeMultiplier = new SoundEnvelope(); // L: 205 - this.volumeMultiplier.decode(var1); // L: 206 - this.volumeMultiplierAmplitude = new SoundEnvelope(); // L: 207 - this.volumeMultiplierAmplitude.decode(var1); // L: 208 + var2 = var1.readUnsignedByte(); + if (var2 != 0) { + --var1.offset; + this.volumeMultiplier = new SoundEnvelope(); + this.volumeMultiplier.decode(var1); + this.volumeMultiplierAmplitude = new SoundEnvelope(); + this.volumeMultiplierAmplitude.decode(var1); } - var2 = var1.readUnsignedByte(); // L: 210 - if (var2 != 0) { // L: 211 - --var1.offset; // L: 212 - this.release = new SoundEnvelope(); // L: 213 - this.release.decode(var1); // L: 214 - this.attack = new SoundEnvelope(); // L: 215 - this.attack.decode(var1); // L: 216 + var2 = var1.readUnsignedByte(); + if (var2 != 0) { + --var1.offset; + this.release = new SoundEnvelope(); + this.release.decode(var1); + this.attack = new SoundEnvelope(); + this.attack.decode(var1); } - for (int var3 = 0; var3 < 10; ++var3) { // L: 218 - int var4 = var1.readUShortSmart(); // L: 219 - if (var4 == 0) { // L: 220 + for (int var3 = 0; var3 < 10; ++var3) { + int var4 = var1.readUShortSmart(); + if (var4 == 0) { break; } - this.oscillatorVolume[var3] = var4; // L: 221 - this.oscillatorPitch[var3] = var1.readShortSmart(); // L: 222 - this.oscillatorDelays[var3] = var1.readUShortSmart(); // L: 223 + this.oscillatorVolume[var3] = var4; + this.oscillatorPitch[var3] = var1.readShortSmart(); + this.oscillatorDelays[var3] = var1.readUShortSmart(); } - this.delayTime = var1.readUShortSmart(); // L: 225 - this.delayDecay = var1.readUShortSmart(); // L: 226 - this.duration = var1.readUnsignedShort(); // L: 227 - this.offset = var1.readUnsignedShort(); // L: 228 - this.filter = new AudioFilter(); // L: 229 - this.filterEnvelope = new SoundEnvelope(); // L: 230 - this.filter.method1176(var1, this.filterEnvelope); // L: 231 - } // L: 232 + this.delayTime = var1.readUShortSmart(); + this.delayDecay = var1.readUShortSmart(); + this.duration = var1.readUnsignedShort(); + this.offset = var1.readUnsignedShort(); + this.filter = new AudioFilter(); + this.filterEnvelope = new SoundEnvelope(); + this.filter.method812(var1, this.filterEnvelope); + } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index e8cc397d26..6aa4014f17 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,56 +3,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ox") +@ObfuscatedName("od") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("array") int[] array; public IntHashTable(int[] var1) { int var2; - for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { // L: 7 8 + for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { } - this.array = new int[var2 + var2]; // L: 9 + this.array = new int[var2 + var2]; int var3; - for (var3 = 0; var3 < var2 + var2; ++var3) { // L: 10 + for (var3 = 0; var3 < var2 + var2; ++var3) { this.array[var3] = -1; } int var4; - for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { // L: 11 15 - for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { // L: 12 13 + for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { + for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { } - this.array[var4 + var4] = var1[var3]; // L: 14 + this.array[var4 + var4] = var1[var3]; } - } // L: 17 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "354978778" + descriptor = "(IB)I", + garbageValue = "16" ) @Export("get") public int get(int var1) { - int var2 = (this.array.length >> 1) - 1; // L: 20 - int var3 = var1 & var2; // L: 21 + int var2 = (this.array.length >> 1) - 1; + int var3 = var1 & var2; while (true) { - int var4 = this.array[var3 + var3 + 1]; // L: 23 - if (var4 == -1) { // L: 24 + int var4 = this.array[var3 + var3 + 1]; + if (var4 == -1) { return -1; } - if (this.array[var3 + var3] == var1) { // L: 25 + if (this.array[var3 + var3] == var1) { return var4; } - var3 = var3 + 1 & var2; // L: 26 + var3 = var3 + 1 & var2; } } } diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index fba2956c63..f0be02a12c 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mc") +@ObfuscatedName("me") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("integer") public int integer; public IntegerNode(int var1) { - this.integer = var1; // L: 7 - } // L: 8 + this.integer = var1; + } } diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index ad9280212a..c254dd23ac 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -4,59 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("bj") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1079839403 + intValue = 1898626955 ) @Export("group") int group; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1640096453 + intValue = -1929991669 ) @Export("type") int type; @ObfuscatedName("v") - boolean field1148; + boolean field947; InterfaceParent() { - this.field1148 = false; // L: 8 - } // L: 10 + this.field947 = false; + } - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lhw;Lod;I)Lhg;", - garbageValue = "-1864429367" + descriptor = "(Lnv;II)V", + garbageValue = "-1906984930" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 29 - var2 = new PacketBufferNode(); // L: 30 - } else { - var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 33 + public static void method1798(Buffer var0, int var1) { + if (JagexCache.JagexCache_randomDat != null) { + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var3) { + } } - var2.clientPacket = var0; // L: 36 - var2.clientPacketLength = var0.length; // L: 37 - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); // L: 38 - } else if (var2.clientPacketLength == -2) { // L: 39 - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { // L: 40 - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { // L: 41 - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); // L: 42 - } - - var2.packetBuffer.setIsaacCipher(var1); // L: 43 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 44 - var2.index = 0; // L: 45 - return var2; // L: 46 } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index bfac75b6ac..9a0c201ee6 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,165 +1,211 @@ import java.util.ArrayList; +import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("ac") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("r") + @ObfuscatedName("w") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("f") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("b") + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1217280037 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("p") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 546325367 + intValue = -1109121055 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lbu;" + descriptor = "[Lar;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("p") + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("m") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("l") - static boolean field963; - @ObfuscatedName("w") - static boolean field951; - @ObfuscatedName("a") - static ArrayList field965; - @ObfuscatedName("aw") + @ObfuscatedName("d") + static boolean field752; + @ObfuscatedName("y") + static boolean field740; + @ObfuscatedName("g") + static ArrayList field754; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1747930903 + intValue = 744034499 ) - static int field966; - @ObfuscatedName("ah") - static final double field959; + static int field742; + @ObfuscatedName("aq") + static final double field756; static { - Interpreter_arrayLengths = new int[5]; // L: 76 - Interpreter_arrays = new int[5][5000]; // L: 77 - Interpreter_intStack = new int[1000]; // L: 78 - Interpreter_stringStack = new String[1000]; // L: 80 - Interpreter_frameDepth = 0; // L: 82 - Interpreter_frames = new ScriptFrame[50]; // L: 83 - Interpreter_calendar = java.util.Calendar.getInstance(); // L: 89 - Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 92 - field963 = false; // L: 95 - field951 = false; // L: 96 - field965 = new ArrayList(); // L: 97 - field966 = 0; // L: 98 - field959 = Math.log(2.0D); // L: 102 + Interpreter_arrayLengths = new int[5]; + Interpreter_arrays = new int[5][5000]; + Interpreter_intStack = new int[1000]; + Interpreter_stringStack = new String[1000]; + Interpreter_frameDepth = 0; + Interpreter_frames = new ScriptFrame[50]; + Interpreter_calendar = java.util.Calendar.getInstance(); + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + field752 = false; + field740 = false; + field754 = new ArrayList(); + field742 = 0; + field756 = Math.log(2.0D); } - @ObfuscatedName("f") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "(II)Lem;", - garbageValue = "-1531306565" + descriptor = "(ZI)V", + garbageValue = "-1377527653" ) - public static VarcInt method2009(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 17 - if (var1 != null) { // L: 18 - return var1; + static final void method1579(boolean var0) { + if (var0) { + Client.field447 = Login.field820 ? class99.field1268 : class99.field1270; } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 19 - var1 = new VarcInt(); // L: 20 - if (var2 != null) { // L: 21 - var1.method2745(new Buffer(var2)); + LinkedHashMap var1 = Decimator.clientPreferences.parameters; + String var3 = Login.Login_username; + int var4 = var3.length(); + int var5 = 0; + + for (int var6 = 0; var6 < var4; ++var6) { + var5 = (var5 << 5) - var5 + var3.charAt(var6); } - VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 22 - return var1; // L: 23 + Client.field447 = var1.containsKey(var5) ? class99.field1276 : class99.field1267; } + } - @ObfuscatedName("gy") + @ObfuscatedName("gj") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "90" + descriptor = "(IIIIZI)V", + garbageValue = "2099924114" ) @Export("setViewportShape") static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 4715 + if (var2 < 1) { var2 = 1; } - if (var3 < 1) { // L: 4716 + if (var3 < 1) { var3 = 1; } - int var5 = var3 - 334; // L: 4717 + int var5 = var3 - 334; int var6; - if (var5 < 0) { // L: 4719 - var6 = Client.field876; - } else if (var5 >= 100) { // L: 4720 - var6 = Client.field877; + if (var5 < 0) { + var6 = Client.field660; + } else if (var5 >= 100) { + var6 = Client.field631; } else { - var6 = (Client.field877 - Client.field876) * var5 / 100 + Client.field876; // L: 4721 + var6 = (Client.field631 - Client.field660) * var5 / 100 + Client.field660; } - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4722 + int var7 = var3 * var6 * 512 / (var2 * 334); int var8; int var9; - short var10; - if (var7 < Client.field881) { // L: 4723 - var10 = Client.field881; // L: 4724 - var6 = var10 * var2 * 334 / (var3 * 512); // L: 4725 - if (var6 > Client.field864) { // L: 4726 - var6 = Client.field864; // L: 4727 - var8 = var3 * var6 * 512 / (var10 * 334); // L: 4728 - var9 = (var2 - var8) / 2; // L: 4729 - if (var4) { // L: 4730 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4731 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4732 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4733 + short var18; + if (var7 < Client.field666) { + var18 = Client.field666; + var6 = var18 * var2 * 334 / (var3 * 512); + if (var6 > Client.field542) { + var6 = Client.field542; + var8 = var3 * var6 * 512 / (var18 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); } - var0 += var9; // L: 4735 - var2 -= var9 * 2; // L: 4736 + var0 += var9; + var2 -= var9 * 2; } - } else if (var7 > Client.field690) { // L: 4739 - var10 = Client.field690; // L: 4740 - var6 = var10 * var2 * 334 / (var3 * 512); // L: 4741 - if (var6 < Client.field880) { // L: 4742 - var6 = Client.field880; // L: 4743 - var8 = var10 * var2 * 334 / (var6 * 512); // L: 4744 - var9 = (var3 - var8) / 2; // L: 4745 - if (var4) { // L: 4746 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4747 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4748 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4749 + } else if (var7 > Client.field667) { + var18 = Client.field667; + var6 = var18 * var2 * 334 / (var3 * 512); + if (var6 < Client.field472) { + var6 = Client.field472; + var8 = var18 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); } - var1 += var9; // L: 4751 - var3 -= var9 * 2; // L: 4752 + var1 += var9; + var3 -= var9 * 2; } } - Client.viewportZoom = var3 * var6 / 334; // L: 4755 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4756 - class12.method209(var2, var3); // L: 4757 + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + int[] var17 = new int[9]; + + for (var9 = 0; var9 < var17.length; ++var9) { + int var10 = var9 * 32 + 15 + 128; + int var11 = var10 * 3 + 600; + int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; + int var15 = var3 - 334; + if (var15 < 0) { + var15 = 0; + } else if (var15 > 100) { + var15 = 100; + } + + int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight; + int var14 = var11 * var16 / 256; + var17[var9] = var13 * var14 >> 16; + } + + Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334); } - Client.viewportOffsetX = var0; // L: 4759 - Client.viewportOffsetY = var1; // L: 4760 - Client.viewportWidth = var2; // L: 4761 - Client.viewportHeight = var3; // L: 4762 - } // L: 4763 + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; + } + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1368981143" + ) + static final void method1635() { + Client.field604 = Client.cycleCntr; + Players.field1182 = true; + } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 4ef90bc514..61fd54d3ec 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,3 +1,4 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -5,291 +6,226 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ex") +@ObfuscatedName("el") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("InvDefinition_archive") - public static AbstractArchive InvDefinition_archive; - @ObfuscatedName("e") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("o") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljs;" ) - @Export("musicTrackArchive") - static AbstractArchive musicTrackArchive; - @ObfuscatedName("al") - @Export("null_string") - protected static String null_string; + @Export("archive4") + static Archive archive4; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1449643111 + intValue = 1729666439 ) @Export("size") public int size; static { - InvDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + InvDefinition_cached = new EvictingDualNodeHashTable(64); } InvDefinition() { - this.size = 0; // L: 12 - } // L: 14 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1281514365" - ) - @Export("decode") - void decode(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); // L: 28 - if (var2 == 0) { // L: 29 - return; // L: 32 - } - - this.decodeNext(var1, var2); // L: 30 - } + this.size = 0; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;IS)V", - garbageValue = "-25465" + descriptor = "(Lnv;I)V", + garbageValue = "-939191311" ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { // L: 35 - this.size = var1.readUnsignedShort(); - } - - } // L: 37 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1727698961" - ) - static int method2699(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 616 - Widget var3; - if (var0 >= 2000) { // L: 617 - var0 -= 1000; // L: 618 - var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 619 - var3 = WorldMapData_1.getWidget(var4); // L: 620 - } else { - var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 622 - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 623 - ChatChannel.Interpreter_intStackSize -= 2; // L: 624 - var3.scrollX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 625 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 626 - var3.scrollX = var3.scrollWidth - var3.width; + @Export("decode") + void decode(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - if (var3.scrollX < 0) { // L: 627 - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 628 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 629 - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { // L: 630 - var3.scrollY = 0; - } - - Script.invalidateWidget(var3); // L: 631 - return 1; // L: 632 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 634 - var3.color = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 635 - Script.invalidateWidget(var3); // L: 636 - return 1; // L: 637 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 639 - var3.fill = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 640 - Script.invalidateWidget(var3); // L: 641 - return 1; // L: 642 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 644 - var3.transparencyTop = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 645 - Script.invalidateWidget(var3); // L: 646 - return 1; // L: 647 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 649 - var3.lineWid = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 650 - Script.invalidateWidget(var3); // L: 651 - return 1; // L: 652 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 654 - var3.spriteId2 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 655 - Script.invalidateWidget(var3); // L: 656 - return 1; // L: 657 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 659 - var3.spriteAngle = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 660 - Script.invalidateWidget(var3); // L: 661 - return 1; // L: 662 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 664 - var3.spriteTiling = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 665 - Script.invalidateWidget(var3); // L: 666 - return 1; // L: 667 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 669 - var3.modelType = 1; // L: 670 - var3.modelId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 671 - Script.invalidateWidget(var3); // L: 672 - return 1; // L: 673 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 675 - ChatChannel.Interpreter_intStackSize -= 6; // L: 676 - var3.modelOffsetX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 677 - var3.modelOffsetY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 678 - var3.modelAngleX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 679 - var3.modelAngleY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 680 - var3.modelAngleZ = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 4]; // L: 681 - var3.modelZoom = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 5]; // L: 682 - Script.invalidateWidget(var3); // L: 683 - return 1; // L: 684 - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 686 - var8 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 687 - if (var8 != var3.sequenceId) { // L: 688 - var3.sequenceId = var8; // L: 689 - var3.modelFrame = 0; // L: 690 - var3.modelFrameCycle = 0; // L: 691 - Script.invalidateWidget(var3); // L: 692 - } - - return 1; // L: 694 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 696 - var3.modelOrthog = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 697 - Script.invalidateWidget(var3); // L: 698 - return 1; // L: 699 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 701 - String var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 702 - if (!var7.equals(var3.text)) { // L: 703 - var3.text = var7; // L: 704 - Script.invalidateWidget(var3); // L: 705 - } - - return 1; // L: 707 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 709 - var3.fontId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 710 - Script.invalidateWidget(var3); // L: 711 - return 1; // L: 712 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 714 - ChatChannel.Interpreter_intStackSize -= 3; // L: 715 - var3.textXAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 716 - var3.textYAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 717 - var3.textLineHeight = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 718 - Script.invalidateWidget(var3); // L: 719 - return 1; // L: 720 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 722 - var3.textShadowed = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 723 - Script.invalidateWidget(var3); // L: 724 - return 1; // L: 725 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 727 - var3.outline = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 728 - Script.invalidateWidget(var3); // L: 729 - return 1; // L: 730 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 732 - var3.spriteShadow = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 733 - Script.invalidateWidget(var3); // L: 734 - return 1; // L: 735 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 737 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 738 - Script.invalidateWidget(var3); // L: 739 - return 1; // L: 740 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 742 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 743 - Script.invalidateWidget(var3); // L: 744 - return 1; // L: 745 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 747 - ChatChannel.Interpreter_intStackSize -= 2; // L: 748 - var3.scrollWidth = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 749 - var3.scrollHeight = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 750 - Script.invalidateWidget(var3); // L: 751 - if (var4 != -1 && var3.type == 0) { // L: 752 - WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; // L: 753 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 755 - ClanChannelMember.resumePauseWidget(var3.id, var3.childIndex); // L: 756 - Client.meslayerContinueWidget = var3; // L: 757 - Script.invalidateWidget(var3); // L: 758 - return 1; // L: 759 - } else if (var0 == 1122) { // L: 761 - var3.spriteId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 762 - Script.invalidateWidget(var3); // L: 763 - return 1; // L: 764 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 766 - var3.color2 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 767 - Script.invalidateWidget(var3); // L: 768 - return 1; // L: 769 - } else if (var0 == 1124) { // L: 771 - var3.transparencyBot = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 772 - Script.invalidateWidget(var3); // L: 773 - return 1; // L: 774 - } else if (var0 == 1125) { // L: 776 - var8 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 777 - FillMode var6 = (FillMode)Clock.findEnumerated(GrandExchangeEvent.FillMode_values(), var8); // L: 778 - if (var6 != null) { // L: 779 - var3.fillMode = var6; // L: 780 - Script.invalidateWidget(var3); // L: 781 - } - - return 1; // L: 783 - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 785 - var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 786 - var3.field2994 = var5; // L: 787 - return 1; // L: 788 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 790 - var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 791 - var3.modelTransparency = var5; // L: 792 - return 1; // L: 793 - } else if (var0 == 1128) { // L: 795 - ChatChannel.Interpreter_intStackSize -= 2; // L: 796 - return 1; // L: 797 - } else { - return 2; // L: 799 - } - } + this.decodeNext(var1, var2); } } - @ObfuscatedName("ks") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lci;ZB)V", - garbageValue = "16" + descriptor = "(Lnv;II)V", + garbageValue = "1818996957" ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 11273 - int var3 = (int)var0.key; // L: 11274 - var0.remove(); // L: 11275 - if (var1) { // L: 11276 - class44.method540(var2); + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 2) { + this.size = var1.readUnsignedShort(); } - class10.method113(var2); // L: 11277 - Widget var4 = WorldMapData_1.getWidget(var3); // L: 11278 - if (var4 != null) { // L: 11279 - Script.invalidateWidget(var4); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZZB)V", + garbageValue = "-91" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + class41.method846(var0, var1, "openjs", var2); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)[B", + garbageValue = "2047506505" + ) + public static byte[] method2698() { + byte[] var0 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var0); + + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { + } + + if (var1 >= 24) { + throw new IOException(); + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { + var0[var2] = -1; + } } - WorldMapScaleHandler.method3856(); // L: 11280 - if (Client.rootInterface != -1) { // L: 11281 - class8.runIntfCloseListeners(Client.rootInterface, 1); + return var0; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1888273564" + ) + static int method2691(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else { + var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; } - } // L: 11282 + String var4 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { + } + } + + var4 = var4.substring(0, var4.length() - 1); + } + + Object[] var8 = new Object[var4.length() + 1]; + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var8[var7] = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var7 != -1) { + var8[0] = new Integer(var7); + } else { + var8 = null; + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { + var3.onVarTransmit = var8; + var3.varTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { + var3.onInvTransmit = var8; + var3.invTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { + var3.onStatTransmit = var8; + var3.statTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { + var3.onStockTransmit = var8; + } else if (var0 == 1426) { + var3.field3078 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { + var3.onResize = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { + var3.field3074 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { + var3.field3072 = var8; + } else if (var0 == 1430) { + var3.field3067 = var8; + } else { + if (var0 != 1431) { + return 2; + } + + var3.field3068 = var8; + } + + var3.hasListener = true; + return 1; + } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 4ceedb5692..40fb15cfdb 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,259 +4,241 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") +@ObfuscatedName("og") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 52014609 + intValue = 1924882517 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("results") int[] results; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("mm") int[] mm; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 125685661 + intValue = -1586397097 ) @Export("aa") int aa; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1381780371 + intValue = 2129163511 ) @Export("bb") int bb; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2057052317 + intValue = -1527841621 ) @Export("cc") int cc; public IsaacCipher(int[] var1) { - this.mm = new int[256]; // L: 15 - this.results = new int[256]; // L: 16 + this.mm = new int[256]; + this.results = new int[256]; - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 17 - this.results[var2] = var1[var2]; // L: 18 + for (int var2 = 0; var2 < var1.length; ++var2) { + this.results[var2] = var1[var2]; } - this.method7180(); // L: 20 - } // L: 21 + this.method7224(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(S)I", - garbageValue = "24118" + garbageValue = "-13443" ) @Export("nextInt") public final int nextInt() { - if (this.valuesRemaining == 0) { // L: 24 - this.generateMoreResults(); // L: 25 - this.valuesRemaining = 256; // L: 26 + if (this.valuesRemaining == 0) { + this.generateMoreResults(); + this.valuesRemaining = 256; } - return this.results[--this.valuesRemaining]; // L: 28 + return this.results[--this.valuesRemaining]; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1910986529" + garbageValue = "2041056232" ) - public final int method7168() { - if (this.valuesRemaining == 0) { // L: 32 - this.generateMoreResults(); // L: 33 - this.valuesRemaining = 256; // L: 34 + public final int method7218() { + if (this.valuesRemaining == 0) { + this.generateMoreResults(); + this.valuesRemaining = 256; } - return this.results[this.valuesRemaining - 1]; // L: 36 + return this.results[this.valuesRemaining - 1]; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1295369465" + garbageValue = "-120051499" ) @Export("generateMoreResults") final void generateMoreResults() { - this.bb += ++this.cc; // L: 43 + this.bb += ++this.cc; - for (int var1 = 0; var1 < 256; ++var1) { // L: 44 - int var2 = this.mm[var1]; // L: 45 - if ((var1 & 2) == 0) { // L: 46 - if ((var1 & 1) == 0) { // L: 47 + for (int var1 = 0; var1 < 256; ++var1) { + int var2 = this.mm[var1]; + if ((var1 & 2) == 0) { + if ((var1 & 1) == 0) { this.aa ^= this.aa << 13; } else { - this.aa ^= this.aa >>> 6; // L: 48 + this.aa ^= this.aa >>> 6; } - } else if ((var1 & 1) == 0) { // L: 51 + } else if ((var1 & 1) == 0) { this.aa ^= this.aa << 2; } else { - this.aa ^= this.aa >>> 16; // L: 52 + this.aa ^= this.aa >>> 16; } - this.aa += this.mm[128 + var1 & 255]; // L: 54 + this.aa += this.mm[var1 + 128 & 255]; int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; // L: 55 - this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; + this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; } - } // L: 58 + } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1132518043" + garbageValue = "-1476393929" ) - final void method7180() { - int var9 = -1640531527; // L: 70 - int var8 = -1640531527; // L: 71 - int var7 = -1640531527; // L: 72 - int var6 = -1640531527; // L: 73 - int var5 = -1640531527; // L: 74 - int var4 = -1640531527; // L: 75 - int var3 = -1640531527; // L: 76 - int var2 = -1640531527; // L: 77 + final void method7224() { + int var9 = -1640531527; + int var8 = -1640531527; + int var7 = -1640531527; + int var6 = -1640531527; + int var5 = -1640531527; + int var4 = -1640531527; + int var3 = -1640531527; + int var2 = -1640531527; int var1; - for (var1 = 0; var1 < 4; ++var1) { // L: 78 - var2 ^= var3 << 11; // L: 79 - var5 += var2; // L: 80 - var3 += var4; // L: 81 - var3 ^= var4 >>> 2; // L: 82 - var6 += var3; // L: 83 - var4 += var5; // L: 84 - var4 ^= var5 << 8; // L: 85 - var7 += var4; // L: 86 - var5 += var6; // L: 87 - var5 ^= var6 >>> 16; // L: 88 - var8 += var5; // L: 89 - var6 += var7; // L: 90 - var6 ^= var7 << 10; // L: 91 - var9 += var6; // L: 92 - var7 += var8; // L: 93 - var7 ^= var8 >>> 4; // L: 94 - var2 += var7; // L: 95 - var8 += var9; // L: 96 - var8 ^= var9 << 8; // L: 97 - var3 += var8; // L: 98 - var9 += var2; // L: 99 - var9 ^= var2 >>> 9; // L: 100 - var4 += var9; // L: 101 - var2 += var3; // L: 102 + for (var1 = 0; var1 < 4; ++var1) { + var2 ^= var3 << 11; + var5 += var2; + var3 += var4; + var3 ^= var4 >>> 2; + var6 += var3; + var4 += var5; + var4 ^= var5 << 8; + var7 += var4; + var5 += var6; + var5 ^= var6 >>> 16; + var8 += var5; + var6 += var7; + var6 ^= var7 << 10; + var9 += var6; + var7 += var8; + var7 ^= var8 >>> 4; + var2 += var7; + var8 += var9; + var8 ^= var9 << 8; + var3 += var8; + var9 += var2; + var9 ^= var2 >>> 9; + var4 += var9; + var2 += var3; } - for (var1 = 0; var1 < 256; var1 += 8) { // L: 104 - var2 += this.results[var1]; // L: 105 - var3 += this.results[var1 + 1]; // L: 106 - var4 += this.results[var1 + 2]; // L: 107 - var5 += this.results[var1 + 3]; // L: 108 - var6 += this.results[var1 + 4]; // L: 109 - var7 += this.results[var1 + 5]; // L: 110 - var8 += this.results[var1 + 6]; // L: 111 - var9 += this.results[var1 + 7]; // L: 112 - var2 ^= var3 << 11; // L: 113 - var5 += var2; // L: 114 - var3 += var4; // L: 115 - var3 ^= var4 >>> 2; // L: 116 - var6 += var3; // L: 117 - var4 += var5; // L: 118 - var4 ^= var5 << 8; // L: 119 - var7 += var4; // L: 120 - var5 += var6; // L: 121 - var5 ^= var6 >>> 16; // L: 122 - var8 += var5; // L: 123 - var6 += var7; // L: 124 - var6 ^= var7 << 10; // L: 125 - var9 += var6; // L: 126 - var7 += var8; // L: 127 - var7 ^= var8 >>> 4; // L: 128 - var2 += var7; // L: 129 - var8 += var9; // L: 130 - var8 ^= var9 << 8; // L: 131 - var3 += var8; // L: 132 - var9 += var2; // L: 133 - var9 ^= var2 >>> 9; // L: 134 - var4 += var9; // L: 135 - var2 += var3; // L: 136 - this.mm[var1] = var2; // L: 137 - this.mm[var1 + 1] = var3; // L: 138 - this.mm[var1 + 2] = var4; // L: 139 - this.mm[var1 + 3] = var5; // L: 140 - this.mm[var1 + 4] = var6; // L: 141 - this.mm[var1 + 5] = var7; // L: 142 - this.mm[var1 + 6] = var8; // L: 143 - this.mm[var1 + 7] = var9; // L: 144 + for (var1 = 0; var1 < 256; var1 += 8) { + var2 += this.results[var1]; + var3 += this.results[var1 + 1]; + var4 += this.results[var1 + 2]; + var5 += this.results[var1 + 3]; + var6 += this.results[var1 + 4]; + var7 += this.results[var1 + 5]; + var8 += this.results[var1 + 6]; + var9 += this.results[var1 + 7]; + var2 ^= var3 << 11; + var5 += var2; + var3 += var4; + var3 ^= var4 >>> 2; + var6 += var3; + var4 += var5; + var4 ^= var5 << 8; + var7 += var4; + var5 += var6; + var5 ^= var6 >>> 16; + var8 += var5; + var6 += var7; + var6 ^= var7 << 10; + var9 += var6; + var7 += var8; + var7 ^= var8 >>> 4; + var2 += var7; + var8 += var9; + var8 ^= var9 << 8; + var3 += var8; + var9 += var2; + var9 ^= var2 >>> 9; + var4 += var9; + var2 += var3; + this.mm[var1] = var2; + this.mm[var1 + 1] = var3; + this.mm[var1 + 2] = var4; + this.mm[var1 + 3] = var5; + this.mm[var1 + 4] = var6; + this.mm[var1 + 5] = var7; + this.mm[var1 + 6] = var8; + this.mm[var1 + 7] = var9; } - for (var1 = 0; var1 < 256; var1 += 8) { // L: 146 - var2 += this.mm[var1]; // L: 147 - var3 += this.mm[var1 + 1]; // L: 148 - var4 += this.mm[var1 + 2]; // L: 149 - var5 += this.mm[var1 + 3]; // L: 150 - var6 += this.mm[var1 + 4]; // L: 151 - var7 += this.mm[var1 + 5]; // L: 152 - var8 += this.mm[var1 + 6]; // L: 153 - var9 += this.mm[var1 + 7]; // L: 154 - var2 ^= var3 << 11; // L: 155 - var5 += var2; // L: 156 - var3 += var4; // L: 157 - var3 ^= var4 >>> 2; // L: 158 - var6 += var3; // L: 159 - var4 += var5; // L: 160 - var4 ^= var5 << 8; // L: 161 - var7 += var4; // L: 162 - var5 += var6; // L: 163 - var5 ^= var6 >>> 16; // L: 164 - var8 += var5; // L: 165 - var6 += var7; // L: 166 - var6 ^= var7 << 10; // L: 167 - var9 += var6; // L: 168 - var7 += var8; // L: 169 - var7 ^= var8 >>> 4; // L: 170 - var2 += var7; // L: 171 - var8 += var9; // L: 172 - var8 ^= var9 << 8; // L: 173 - var3 += var8; // L: 174 - var9 += var2; // L: 175 - var9 ^= var2 >>> 9; // L: 176 - var4 += var9; // L: 177 - var2 += var3; // L: 178 - this.mm[var1] = var2; // L: 179 - this.mm[var1 + 1] = var3; // L: 180 - this.mm[var1 + 2] = var4; // L: 181 - this.mm[var1 + 3] = var5; // L: 182 - this.mm[var1 + 4] = var6; // L: 183 - this.mm[var1 + 5] = var7; // L: 184 - this.mm[var1 + 6] = var8; // L: 185 - this.mm[var1 + 7] = var9; // L: 186 + for (var1 = 0; var1 < 256; var1 += 8) { + var2 += this.mm[var1]; + var3 += this.mm[var1 + 1]; + var4 += this.mm[var1 + 2]; + var5 += this.mm[var1 + 3]; + var6 += this.mm[var1 + 4]; + var7 += this.mm[var1 + 5]; + var8 += this.mm[var1 + 6]; + var9 += this.mm[var1 + 7]; + var2 ^= var3 << 11; + var5 += var2; + var3 += var4; + var3 ^= var4 >>> 2; + var6 += var3; + var4 += var5; + var4 ^= var5 << 8; + var7 += var4; + var5 += var6; + var5 ^= var6 >>> 16; + var8 += var5; + var6 += var7; + var6 ^= var7 << 10; + var9 += var6; + var7 += var8; + var7 ^= var8 >>> 4; + var2 += var7; + var8 += var9; + var8 ^= var9 << 8; + var3 += var8; + var9 += var2; + var9 ^= var2 >>> 9; + var4 += var9; + var2 += var3; + this.mm[var1] = var2; + this.mm[var1 + 1] = var3; + this.mm[var1 + 2] = var4; + this.mm[var1 + 3] = var5; + this.mm[var1 + 4] = var6; + this.mm[var1 + 5] = var7; + this.mm[var1 + 6] = var8; + this.mm[var1 + 7] = var9; } - this.generateMoreResults(); // L: 188 - this.valuesRemaining = 256; // L: 189 - } // L: 190 - - @ObfuscatedName("ko") - @ObfuscatedSignature( - descriptor = "(Liv;IIII)V", - garbageValue = "-719453937" - ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 11398 - if (var4 != null) { // L: 11399 - if (Client.minimapState < 3) { // L: 11400 - Friend.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: 11401 - } - - } - } // L: 11402 + this.generateMoreResults(); + this.valuesRemaining = 256; + } } diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index b761fa9e4e..cf6f6ba005 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -3,971 +3,1103 @@ 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("ef") +@ObfuscatedName("fh") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("r") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 852203709 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ItemDefinition_cached") static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ItemDefinition_cachedModels") static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 864003523 + intValue = -1292114683 ) @Export("id") public int id; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -82092197 + intValue = 1750005639 ) @Export("model") int model; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("name") public String name; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1197095781 + intValue = 1407039017 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1477199059 + intValue = -1552372897 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1947804351 + intValue = -1989829871 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 963136523 + intValue = 1675602801 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1965704601 + intValue = 369442955 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1159411923 + intValue = -287756753 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -950532785 + intValue = 416434897 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1201231959 + intValue = 1718947049 ) @Export("price") public int price; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1740445573 + intValue = -1737830199 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -637515031 + intValue = 814294011 ) @Export("maleModel") int maleModel; - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1731429003 + intValue = 655513513 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("aq") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1393379957 + intValue = -268401447 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ae") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 666917083 + intValue = -1474334481 ) @Export("femaleModel") int femaleModel; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1064602939 + intValue = 1855056873 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("an") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 164223345 + intValue = 544915679 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 508356555 + intValue = 1491032983 ) @Export("maleModel2") int maleModel2; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1276393651 + intValue = -1058407351 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -388318419 + intValue = 332133309 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1136192221 + intValue = 2037483539 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1993766353 + intValue = 1690892637 ) @Export("femaleHeadModel") int femaleHeadModel; @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -592852933 + intValue = 450115933 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("am") + @ObfuscatedName("ap") @Export("countobj") int[] countobj; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @Export("countco") int[] countco; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1686572351 + intValue = 1675161045 ) @Export("note") public int note; - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -2019053745 + intValue = -1896631069 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ax") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1896796711 + intValue = -1749524673 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ar") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -55547161 + intValue = 666052725 ) @Export("resizeY") int resizeY; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1335073571 + intValue = -1004700529 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bq") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -1227258885 + intValue = -1173475579 ) @Export("ambient") public int ambient; - @ObfuscatedName("bx") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -991965775 + intValue = -2023380123 ) @Export("contrast") public int contrast; - @ObfuscatedName("bi") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -319582403 + intValue = 1539222663 ) @Export("team") public int team; - @ObfuscatedName("bz") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bb") + @ObfuscatedName("bv") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -688029981 + intValue = -908467529 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -162075829 + intValue = 2135664685 ) @Export("notedId") int notedId; - @ObfuscatedName("be") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1046778855 + intValue = 1056634589 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("ba") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -411820485 + intValue = 1252151853 ) @Export("placeholderTemplate") public int placeholderTemplate; static { - ItemDefinition_cached = new EvictingDualNodeHashTable(64); // L: 28 - ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 29 - ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); // L: 30 + ItemDefinition_cached = new EvictingDualNodeHashTable(64); + ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); + ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); } ItemComposition() { - this.name = "null"; // L: 34 - this.zoom2d = 2000; // L: 39 - this.xan2d = 0; // L: 40 - this.yan2d = 0; // L: 41 - this.zan2d = 0; // L: 42 - this.offsetX2d = 0; // L: 43 - this.offsetY2d = 0; // L: 44 - this.isStackable = 0; // L: 45 - this.price = 1; // L: 46 - this.isMembersOnly = false; // L: 47 - this.groundActions = new String[]{null, null, "Take", null, null}; // L: 48 - this.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49 - this.shiftClickIndex = -2; // L: 51 - this.maleModel = -1; // L: 52 - this.maleModel1 = -1; // L: 53 - this.maleOffset = 0; // L: 54 - this.femaleModel = -1; // L: 55 - this.femaleModel1 = -1; // L: 56 - this.femaleOffset = 0; // L: 57 - this.maleModel2 = -1; // L: 58 - this.femaleModel2 = -1; // L: 59 - this.maleHeadModel = -1; // L: 60 - this.maleHeadModel2 = -1; // L: 61 - this.femaleHeadModel = -1; // L: 62 - this.femaleHeadModel2 = -1; // L: 63 - this.note = -1; // L: 66 - this.noteTemplate = -1; // L: 67 - this.resizeX = 128; // L: 68 - this.resizeY = 128; // L: 69 - this.resizeZ = 128; // L: 70 - this.ambient = 0; // L: 71 - this.contrast = 0; // L: 72 - this.team = 0; // L: 73 - this.isTradable = false; // L: 75 - this.unnotedId = -1; // L: 76 - this.notedId = -1; // L: 77 - this.placeholder = -1; // L: 78 - this.placeholderTemplate = -1; // L: 79 - } // L: 81 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1428524327" - ) - @Export("post") - void post() { - } // L: 121 + this.name = "null"; + this.zoom2d = 2000; + this.xan2d = 0; + this.yan2d = 0; + this.zan2d = 0; + this.offsetX2d = 0; + this.offsetY2d = 0; + this.isStackable = 0; + this.price = 1; + this.isMembersOnly = false; + this.groundActions = new String[]{null, null, "Take", null, null}; + this.inventoryActions = new String[]{null, null, null, null, "Drop"}; + this.shiftClickIndex = -2; + this.maleModel = -1; + this.maleModel1 = -1; + this.maleOffset = 0; + this.femaleModel = -1; + this.femaleModel1 = -1; + this.femaleOffset = 0; + this.maleModel2 = -1; + this.femaleModel2 = -1; + this.maleHeadModel = -1; + this.maleHeadModel2 = -1; + this.femaleHeadModel = -1; + this.femaleHeadModel2 = -1; + this.note = -1; + this.noteTemplate = -1; + this.resizeX = 128; + this.resizeY = 128; + this.resizeZ = 128; + this.ambient = 0; + this.contrast = 0; + this.team = 0; + this.isTradable = false; + this.unnotedId = -1; + this.notedId = -1; + this.placeholder = -1; + this.placeholderTemplate = -1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-139066670" + descriptor = "(I)V", + garbageValue = "706369202" + ) + @Export("post") + void post() { + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "-1087602261" ) @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(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 127 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "127788107" + descriptor = "(Lnv;II)V", + garbageValue = "542538160" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 132 + if (var2 == 1) { this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 133 + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 134 + } else if (var2 == 4) { this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 135 + } else if (var2 == 5) { this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 136 + } else if (var2 == 6) { 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) { + this.offsetX2d = var1.readUnsignedShort(); + if (this.offsetX2d > 32767) { 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) { + this.offsetY2d = var1.readUnsignedShort(); + if (this.offsetY2d > 32767) { this.offsetY2d -= 65536; } - } else if (var2 == 9) { // L: 145 - var1.readStringCp1252NullTerminated(); // L: 146 - } else if (var2 == 11) { // L: 148 + } else if (var2 == 9) { + var1.readStringCp1252NullTerminated(); + } else if (var2 == 11) { this.isStackable = 1; - } else if (var2 == 12) { // L: 149 + } else if (var2 == 12) { this.price = var1.readInt(); - } else if (var2 == 16) { // L: 150 + } else if (var2 == 16) { 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) { + this.maleModel = var1.readUnsignedShort(); + this.maleOffset = var1.readUnsignedByte(); + } else if (var2 == 24) { 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) { + this.femaleModel = var1.readUnsignedShort(); + this.femaleOffset = var1.readUnsignedByte(); + } else if (var2 == 26) { 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) { + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { this.groundActions[var2 - 30] = null; } - } else if (var2 >= 35 && var2 < 40) { // L: 165 + } else if (var2 >= 35 && var2 < 40) { 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) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - 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) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } 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) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - 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) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 42) { // L: 184 - this.shiftClickIndex = var1.readByte(); // L: 185 - } else if (var2 == 65) { // L: 187 + } else if (var2 == 42) { + this.shiftClickIndex = var1.readByte(); + } else if (var2 == 65) { this.isTradable = true; - } else if (var2 == 78) { // L: 188 + } else if (var2 == 78) { this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { // L: 189 + } else if (var2 == 79) { this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { // L: 190 + } else if (var2 == 90) { this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { // L: 191 + } else if (var2 == 91) { this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { // L: 192 + } else if (var2 == 92) { this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { // L: 193 + } else if (var2 == 93) { this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 94) { // L: 194 - var1.readUnsignedShort(); // L: 195 - } else if (var2 == 95) { // L: 197 + } else if (var2 == 94) { + var1.readUnsignedShort(); + } else if (var2 == 95) { this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 198 + } else if (var2 == 97) { this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 199 + } else if (var2 == 98) { 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) { + if (this.countobj == null) { + this.countobj = new int[10]; + this.countco = new int[10]; } - 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(); + this.countco[var2 - 100] = var1.readUnsignedShort(); + } else if (var2 == 110) { this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { // L: 209 + } else if (var2 == 111) { this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { // L: 210 + } else if (var2 == 112) { this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { // L: 211 + } else if (var2 == 113) { this.ambient = var1.readByte(); - } else if (var2 == 114) { // L: 212 + } else if (var2 == 114) { this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { // L: 213 + } else if (var2 == 115) { this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { // L: 214 + } else if (var2 == 139) { this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { // L: 215 + } else if (var2 == 140) { this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { // L: 216 + } else if (var2 == 148) { this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { // L: 217 + } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { // L: 218 - this.params = class19.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { + this.params = ObjectSound.readStringIntParameters(var1, this.params); } } - } // L: 220 + } - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lef;Lef;I)V", - garbageValue = "-368534972" + descriptor = "(Lfh;Lfh;I)V", + garbageValue = "1119757885" ) @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; + this.zoom2d = var1.zoom2d; + this.xan2d = var1.xan2d; + this.yan2d = var1.yan2d; + this.zan2d = var1.zan2d; + this.offsetX2d = var1.offsetX2d; + this.offsetY2d = var1.offsetY2d; + this.recolorFrom = var1.recolorFrom; + this.recolorTo = var1.recolorTo; + this.retextureFrom = var1.retextureFrom; + this.retextureTo = var1.retextureTo; + this.name = var2.name; + this.isMembersOnly = var2.isMembersOnly; + this.price = var2.price; + this.isStackable = 1; + } - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lef;Lef;I)V", - garbageValue = "-1437013277" + descriptor = "(Lfh;Lfh;S)V", + garbageValue = "-5813" ) @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; + this.zoom2d = var1.zoom2d; + this.xan2d = var1.xan2d; + this.yan2d = var1.yan2d; + this.zan2d = var1.zan2d; + this.offsetX2d = var1.offsetX2d; + this.offsetY2d = var1.offsetY2d; + this.recolorFrom = var2.recolorFrom; + this.recolorTo = var2.recolorTo; + this.retextureFrom = var2.retextureFrom; + this.retextureTo = var2.retextureTo; + this.name = var2.name; + this.isMembersOnly = var2.isMembersOnly; + this.isStackable = var2.isStackable; + this.maleModel = var2.maleModel; + this.maleModel1 = var2.maleModel1; + this.maleModel2 = var2.maleModel2; + this.femaleModel = var2.femaleModel; + this.femaleModel1 = var2.femaleModel1; + this.femaleModel2 = var2.femaleModel2; + this.maleHeadModel = var2.maleHeadModel; + this.maleHeadModel2 = var2.maleHeadModel2; + this.femaleHeadModel = var2.femaleHeadModel; + this.femaleHeadModel2 = var2.femaleHeadModel2; + this.team = var2.team; + this.groundActions = var2.groundActions; + this.inventoryActions = new String[5]; + if (var2.inventoryActions != null) { for (int var3 = 0; var3 < 4; ++var3) { this.inventoryActions[var3] = var2.inventoryActions[var3]; } } - this.inventoryActions[4] = "Discard"; // L: 269 - this.price = 0; // L: 270 - } // L: 271 + this.inventoryActions[4] = "Discard"; + this.price = 0; + } - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lef;Lef;I)V", - garbageValue = "-825669250" + descriptor = "(Lfh;Lfh;I)V", + garbageValue = "2098967802" ) @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; + this.zoom2d = var1.zoom2d; + this.xan2d = var1.xan2d; + this.yan2d = var1.yan2d; + this.zan2d = var1.zan2d; + this.offsetX2d = var1.offsetX2d; + this.offsetY2d = var1.offsetY2d; + this.recolorFrom = var1.recolorFrom; + this.recolorTo = var1.recolorTo; + this.retextureFrom = var1.retextureFrom; + this.retextureTo = var1.retextureTo; + this.isStackable = var1.isStackable; + this.name = var2.name; + this.price = 0; + this.isMembersOnly = false; + this.isTradable = false; + } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Lga;", - garbageValue = "-76" + descriptor = "(IB)Lgz;", + garbageValue = "74" ) @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) { + int var2 = -1; - 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) { + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 298 - return class250.ItemDefinition_get(var2).getModelData(1); + if (var2 != -1) { + return KeyHandler.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, this.model, 0); // L: 300 - if (var4 == null) { // L: 301 + ModelData var4 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, this.model, 0); + if (var4 == null) { 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) { 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) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); } } - 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) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); } } - return var4; // L: 313 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)Lgd;", - garbageValue = "12" - ) - @Export("getModel") - public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { // L: 317 - int var2 = -1; // L: 318 - - for (int var3 = 0; var3 < 10; ++var3) { // L: 319 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320 - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { // L: 322 - return class250.ItemDefinition_get(var2).getModel(1); - } - } - - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324 - if (var5 != null) { // L: 325 - return var5; - } else { - ModelData var6 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, this.model, 0); // L: 326 - if (var6 == null) { // L: 327 - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328 - var6.resize(this.resizeX, this.resizeY, this.resizeZ); - } - - int var4; - if (this.recolorFrom != null) { // L: 329 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 330 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331 - } - } - - if (this.retextureFrom != null) { // L: 334 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 336 - } - } - - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339 - var5.isSingleTile = true; // L: 340 - ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 341 - return var5; // L: 342 - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)Lef;", - garbageValue = "1042392759" - ) - @Export("getCountObj") - public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { // L: 346 - int var2 = -1; // L: 347 - - for (int var3 = 0; var3 < 10; ++var3) { // L: 348 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; // L: 349 - } - } - - if (var2 != -1) { // L: 351 - return class250.ItemDefinition_get(var2); - } - } - - return this; // L: 353 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "1790528710" - ) - @Export("hasNoValidModel") - public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; // L: 431 - int var3 = this.maleModel1; // L: 432 - int var4 = this.maleModel2; // L: 433 - if (var1) { // L: 434 - var2 = this.femaleModel; // L: 435 - var3 = this.femaleModel1; // L: 436 - var4 = this.femaleModel2; // L: 437 - } - - if (var2 == -1) { // L: 439 - return true; - } else { - boolean var5 = true; // L: 440 - if (!SoundCache.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 441 - var5 = false; - } - - if (var3 != -1 && !SoundCache.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 442 - var5 = false; - } - - if (var4 != -1 && !SoundCache.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 443 - var5 = false; - } - - return var5; // L: 444 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ZI)Lga;", - garbageValue = "-1389763858" - ) - public final ModelData method3070(boolean var1) { - int var2 = this.maleModel; // L: 448 - int var3 = this.maleModel1; // L: 449 - int var4 = this.maleModel2; // L: 450 - if (var1) { // L: 451 - var2 = this.femaleModel; // L: 452 - var3 = this.femaleModel1; // L: 453 - var4 = this.femaleModel2; // L: 454 - } - - if (var2 == -1) { // L: 456 - return null; - } else { - ModelData var5 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var2, 0); // L: 457 - if (var3 != -1) { // L: 458 - ModelData var6 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var3, 0); // L: 459 - if (var4 != -1) { // L: 460 - ModelData var7 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var4, 0); // L: 461 - ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 462 - var5 = new ModelData(var8, 3); // L: 463 - } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 466 - var5 = new ModelData(var10, 2); // L: 467 - } - } - - if (!var1 && this.maleOffset != 0) { // L: 470 - var5.changeOffset(0, this.maleOffset, 0); - } - - if (var1 && this.femaleOffset != 0) { // L: 471 - var5.changeOffset(0, this.femaleOffset, 0); - } - - int var9; - if (this.recolorFrom != null) { // L: 472 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 473 - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 474 - } - } - - if (this.retextureFrom != null) { // L: 477 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 478 - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 479 - } - } - - return var5; // L: 482 - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "2105188267" - ) - public final boolean method3102(boolean var1) { - int var2 = this.maleHeadModel; // L: 486 - int var3 = this.maleHeadModel2; // L: 487 - if (var1) { // L: 488 - var2 = this.femaleHeadModel; // L: 489 - var3 = this.femaleHeadModel2; // L: 490 - } - - if (var2 == -1) { // L: 492 - return true; - } else { - boolean var4 = true; // L: 493 - if (!SoundCache.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 494 - var4 = false; - } - - if (var3 != -1 && !SoundCache.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 495 - var4 = false; - } - - return var4; // L: 496 - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ZI)Lga;", - garbageValue = "-838789106" - ) - public final ModelData method3082(boolean var1) { - int var2 = this.maleHeadModel; // L: 500 - int var3 = this.maleHeadModel2; // L: 501 - if (var1) { // L: 502 - var2 = this.femaleHeadModel; // L: 503 - var3 = this.femaleHeadModel2; // L: 504 - } - - if (var2 == -1) { // L: 506 - return null; - } else { - ModelData var4 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var2, 0); // L: 507 - if (var3 != -1) { // L: 508 - ModelData var5 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var3, 0); // L: 509 - ModelData[] var6 = new ModelData[]{var4, var5}; // L: 510 - var4 = new ModelData(var6, 2); // L: 511 - } - - int var7; - if (this.recolorFrom != null) { // L: 513 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 514 - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 515 - } - } - - if (this.retextureFrom != null) { // L: 518 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 519 - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 520 - } - } - - return var4; // L: 523 + return var4; } } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-201410584" + descriptor = "(IB)Lgl;", + garbageValue = "0" ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 528 - int var3; - if (var4 == null) { // L: 530 - var3 = var2; // L: 531 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 534 - if (var5 == null) { // L: 535 - var3 = var2; // L: 536 - } else { - var3 = var5.integer; // L: 539 + @Export("getModel") + public final Model getModel(int var1) { + if (this.countobj != null && var1 > 1) { + int var2 = -1; + + for (int var3 = 0; var3 < 10; ++var3) { + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { + return KeyHandler.ItemDefinition_get(var2).getModel(1); } } - return var3; // L: 541 + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); + if (var5 != null) { + return var5; + } else { + ModelData var6 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, this.model, 0); + if (var6 == null) { + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + var6.resize(this.resizeX, this.resizeY, this.resizeZ); + } + + int var4; + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + } + } + + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + } + } + + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var5.isSingleTile = true; + ItemDefinition_cachedModels.put(var5, (long)this.id); + return var5; + } + } } - @ObfuscatedName("u") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1584498919" + descriptor = "(II)Lfh;", + garbageValue = "-1818978048" ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return WorldMapElement.method2742(this.params, var1, var2); // L: 545 + @Export("getCountObj") + public ItemComposition getCountObj(int var1) { + if (this.countobj != null && var1 > 1) { + int var2 = -1; + + for (int var3 = 0; var3 < 10; ++var3) { + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { + return KeyHandler.ItemDefinition_get(var2); + } + } + + return this; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "1201493366" + ) + @Export("hasNoValidModel") + public final boolean hasNoValidModel(boolean var1) { + int var2 = this.maleModel; + int var3 = this.maleModel1; + int var4 = this.maleModel2; + if (var1) { + var2 = this.femaleModel; + var3 = this.femaleModel1; + var4 = this.femaleModel2; + } + + if (var2 == -1) { + return true; + } else { + boolean var5 = true; + if (!class339.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var5 = false; + } + + if (var3 != -1 && !class339.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + var5 = false; + } + + if (var4 != -1 && !class339.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + var5 = false; + } + + return var5; + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ZI)Lgz;", + garbageValue = "-1054437018" + ) + public final ModelData method3058(boolean var1) { + int var2 = this.maleModel; + int var3 = this.maleModel1; + int var4 = this.maleModel2; + if (var1) { + var2 = this.femaleModel; + var3 = this.femaleModel1; + var4 = this.femaleModel2; + } + + if (var2 == -1) { + return null; + } else { + ModelData var5 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var6 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var3, 0); + if (var4 != -1) { + ModelData var7 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var4, 0); + ModelData[] var8 = new ModelData[]{var5, var6, var7}; + var5 = new ModelData(var8, 3); + } else { + ModelData[] var10 = new ModelData[]{var5, var6}; + var5 = new ModelData(var10, 2); + } + } + + if (!var1 && this.maleOffset != 0) { + var5.changeOffset(0, this.maleOffset, 0); + } + + if (var1 && this.femaleOffset != 0) { + var5.changeOffset(0, this.femaleOffset, 0); + } + + int var9; + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + } + } + + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + } + } + + return var5; + } } @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ZB)Z", + garbageValue = "-41" + ) + public final boolean method3059(boolean var1) { + int var2 = this.maleHeadModel; + int var3 = this.maleHeadModel2; + if (var1) { + var2 = this.femaleHeadModel; + var3 = this.femaleHeadModel2; + } + + if (var2 == -1) { + return true; + } else { + boolean var4 = true; + if (!class339.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var4 = false; + } + + if (var3 != -1 && !class339.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + var4 = false; + } + + return var4; + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ZB)Lgz;", + garbageValue = "-30" + ) + public final ModelData method3047(boolean var1) { + int var2 = this.maleHeadModel; + int var3 = this.maleHeadModel2; + if (var1) { + var2 = this.femaleHeadModel; + var3 = this.femaleHeadModel2; + } + + if (var2 == -1) { + return null; + } else { + ModelData var4 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var5 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var3, 0); + ModelData[] var6 = new ModelData[]{var4, var5}; + var4 = new ModelData(var6, 2); + } + + int var7; + if (this.recolorFrom != null) { + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + } + } + + if (this.retextureFrom != null) { + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + } + } + + return var4; + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-648124403" + ) + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + IterableNodeHashTable var4 = this.params; + int var3; + if (var4 == null) { + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } + } + + return var3; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "1" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = (String)var5.obj; + } + } + + return var3; + } + + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "138320975" + garbageValue = "-234390667" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 549 - if (this.shiftClickIndex >= 0) { // L: 550 - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -53430605 * -1740445573 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { + if (this.shiftClickIndex >= 0) { + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1737830199 * -953529991 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 551 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } } else { return -1; } } - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1120346347" + garbageValue = "2142576424" ) - boolean method3086() { - return this.recolorTo != null; // L: 561 + boolean method3064() { + return this.recolorTo != null; } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-30" + garbageValue = "-54" ) - boolean method3139() { - return this.retextureTo != null; // L: 565 + boolean method3065() { + return this.retextureTo != null; } - @ObfuscatedName("ip") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-604596177" + descriptor = "(Lio;I[B[BI)V", + garbageValue = "239689110" ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = class17.getWidgetChild(var0, var1); // L: 8780 - if (var4 != null && var4.onTargetEnter != null) { // L: 8781 - ScriptEvent var5 = new ScriptEvent(); // L: 8782 - var5.widget = var4; // L: 8783 - var5.args = var4.onTargetEnter; // L: 8784 - WorldMapSection1.runScriptEvent(var5); // L: 8785 + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2987 == null) { + if (var2 == null) { + return; + } + + var0.field2987 = new byte[11][]; + var0.field3033 = new byte[11][]; + var0.field2993 = new int[11]; + var0.field3035 = new int[11]; } - Client.field634 = var3; // L: 8787 - Client.isSpellSelected = true; // L: 8788 - class15.selectedSpellWidget = var0; // L: 8789 - Client.selectedSpellChildIndex = var1; // L: 8790 - LoginPacket.selectedSpellFlags = var2; // L: 8791 - Script.invalidateWidget(var4); // L: 8792 - } // L: 8793 + var0.field2987[var1] = var2; + if (var2 != null) { + var0.field3031 = true; + } else { + var0.field3031 = false; + + for (int var4 = 0; var4 < var0.field2987.length; ++var4) { + if (var0.field2987[var4] != null) { + var0.field3031 = true; + break; + } + } + } + + var0.field3033[var1] = var3; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lag;B)V", + garbageValue = "0" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + FloorUnderlayDefinition.method2892(var0.isMembersOnly()); + } + + if (var0.properties != Client.worldProperties) { + Archive var1 = class270.archive8; + int var2 = var0.properties; + if ((var2 & 536870912) != 0) { + UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((var2 & 1073741824) != 0) { + UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else { + UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + } + + Varps.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + WorldMapManager.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + class4.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; + class290.currentPort = WorldMapManager.worldPort; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-1053773732" + ) + static int method3095(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + Interpreter.Interpreter_intStackSize -= 2; + Client.field660 = (short)GrandExchangeOfferAgeComparator.method5132(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + if (Client.field660 <= 0) { + Client.field660 = 256; + } + + Client.field631 = (short)GrandExchangeOfferAgeComparator.method5132(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + if (Client.field631 <= 0) { + Client.field631 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + Interpreter.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + Interpreter.Interpreter_intStackSize -= 4; + Client.field472 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (Client.field472 <= 0) { + Client.field472 = 1; + } + + Client.field542 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (Client.field542 <= 0) { + Client.field542 = 32767; + } else if (Client.field542 < Client.field472) { + Client.field542 = Client.field472; + } + + Client.field666 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (Client.field666 <= 0) { + Client.field666 = 1; + } + + Client.field667 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + if (Client.field667 <= 0) { + Client.field667 = 32767; + } else if (Client.field667 < Client.field666) { + Client.field667 = Client.field666; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + Interpreter.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPCComposition.method2847(Client.field660); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPCComposition.method2847(Client.field631); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.canvasHeight; + return 1; + } else { + return 2; + } + } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index f9b9b6cecc..e5e01b41d2 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,18 +1,27 @@ +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("cy") +@ObfuscatedName("bu") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("e") + @ObfuscatedName("hz") + @ObfuscatedGetter( + intValue = -1760343017 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("t") @Export("ids") int[] ids; @ObfuscatedName("v") @@ -20,100 +29,208 @@ public class ItemContainer extends Node { int[] quantities; static { - itemContainers = new NodeHashTable(32); // L: 7 + itemContainers = new NodeHashTable(32); } ItemContainer() { - this.ids = new int[]{-1}; // L: 8 - this.quantities = new int[]{0}; // L: 9 - } // L: 11 + this.ids = new int[]{-1}; + this.quantities = new int[]{0}; + } - @ObfuscatedName("v") + @ObfuscatedName("s") + public static String method1792(long var0) { + Calendar.Calendar_calendar.setTime(new Date(var0)); + int var2 = Calendar.Calendar_calendar.get(7); + int var3 = Calendar.Calendar_calendar.get(5); + int var4 = Calendar.Calendar_calendar.get(2); + int var5 = Calendar.Calendar_calendar.get(1); + int var6 = Calendar.Calendar_calendar.get(11); + int var7 = Calendar.Calendar_calendar.get(12); + int var8 = Calendar.Calendar_calendar.get(13); + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; + } + + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "0" + descriptor = "(ILbd;ZB)I", + garbageValue = "8" ) - public static boolean method2181(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 61 - return true; + static int method1785(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); } else { - if (var0 != 0) { // L: 62 - char[] var1 = class302.cp1252AsciiExtension; // L: 64 + var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + } - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 65 - char var3 = var1[var2]; // L: 66 - if (var0 == var3) { // L: 68 - return true; // L: 69 + AttackOption.invalidateWidget(var3); + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = MouseHandler.localPlayer.appearance.getChatHeadId(); + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemComposition var6 = KeyHandler.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; + } + + if (var3.field3012 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field3012; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1974764293" + ) + public static final void method1783() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "4" + ) + static final void method1793() { + for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { + if (var0.plane == GrandExchangeEvent.Client_plane && Client.cycle <= var0.cycleEnd) { + if (Client.cycle >= var0.cycleStart) { + if (var0.targetIndex > 0) { + NPC var1 = Client.npcs[var0.targetIndex - 1]; + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { + var0.setDestination(var1.x, var1.y, class122.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); + } } + + if (var0.targetIndex < 0) { + int var2 = -var0.targetIndex - 1; + Player var3; + if (var2 == Client.localPlayerIndex) { + var3 = MouseHandler.localPlayer; + } else { + var3 = Client.players[var2]; + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.setDestination(var3.x, var3.y, class122.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + var0.advance(Client.field555); + WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); + } + } else { + var0.remove(); + } + } + + } + + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIII)V", + garbageValue = "868741263" + ) + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + PendingSpawn var9 = null; + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { + var9 = var10; + break; + } + } + + if (var9 == null) { + var9 = new PendingSpawn(); + var9.plane = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; + Messages.method2094(var9); + Client.pendingSpawns.addFirst(var9); + } + + var9.id = var4; + var9.field1016 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(Lio;III)V", + garbageValue = "1354989071" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null) { + Widget var4 = class122.method2505(var0); + if (var4 == null) { + var4 = var0.parent; + } + + if (var4 != null) { + Client.clickedWidget = var0; + var4 = class122.method2505(var0); + if (var4 == null) { + var4 = var0.parent; + } + + Client.clickedWidgetParent = var4; + Client.widgetClickX = var1; + Client.widgetClickY = var2; + class106.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var5 = CollisionMap.method3204(); + if (var5 != -1) { + ClanChannelMember.tempMenuAction = new MenuAction(); + ClanChannelMember.tempMenuAction.param0 = Client.menuArguments1[var5]; + ClanChannelMember.tempMenuAction.param1 = Client.menuArguments2[var5]; + ClanChannelMember.tempMenuAction.opcode = Client.menuOpcodes[var5]; + ClanChannelMember.tempMenuAction.identifier = Client.menuIdentifiers[var5]; + ClanChannelMember.tempMenuAction.action = Client.menuActions[var5]; + } + + return; } } - return false; // L: 75 } } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II)I", - garbageValue = "-1214579938" - ) - public static int method2183(CharSequence var0, int var1) { - return class8.method105(var0, var1, true); // L: 80 - } - - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "2" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 5461 - int var4 = var1 >> 7; // L: 5462 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5463 - int var5 = var2; // L: 5464 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5465 - var5 = var2 + 1; - } - - int var6 = var0 & 127; // L: 5466 - int var7 = var1 & 127; // L: 5467 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 5468 - int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5469 - return var8 * (128 - var7) + var7 * var9 >> 7; // L: 5470 - } else { - return 0; - } - } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Liv;I)Ljava/lang/String;", - garbageValue = "2065897018" - ) - static String method2184(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 9883 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 9884 - while (true) { - int var3 = var0.indexOf("%" + var2); // L: 9886 - if (var3 == -1) { // L: 9887 - break; - } - - String var4 = var0.substring(0, var3); // L: 9888 - int var6 = class27.method355(var1, var2 - 1); // L: 9890 - String var5; - if (var6 < 999999999) { // L: 9892 - var5 = Integer.toString(var6); // L: 9893 - } else { - var5 = "*"; // L: 9896 - } - - var0 = var4 + var5 + var0.substring(var3 + 2); // L: 9898 - } - } - } - - return var0; // L: 9902 - } } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index ebe9f1fa0d..fe6241abf8 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -4,152 +4,125 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gc") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("bq") - @Export("otp") - static String otp; - @ObfuscatedName("f") + @ObfuscatedName("rp") @ObfuscatedGetter( - intValue = -193076461 + intValue = 750514091 + ) + static int field2147; + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive2") + static Archive archive2; + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive14") + static Archive archive14; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1258904937 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 314356507 + intValue = 1834078105 ) @Export("x") int x; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -695126527 + intValue = -903792953 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("first") Renderable first; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("second") Renderable second; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("third") Renderable third; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = 5487494310770586269L + longValue = -4106970907068788613L ) @Export("tag") long tag; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 400175677 + intValue = -366968213 ) @Export("height") int height; ItemLayer() { - } // L: 13 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljp;Lie;B)Z", - garbageValue = "0" - ) - public static boolean method3860(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class233.musicPatchesArchive = var0; // L: 26 - class233.musicSamplesArchive = var1; // L: 27 - class230.soundEffectsArchive = var2; // L: 28 - class233.midiPcmStream = var3; // L: 29 - return true; // L: 30 } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-395066972" + descriptor = "(IS)I", + garbageValue = "5000" ) - public static boolean method3861(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 - if (var0 != 0) { // L: 46 - char[] var1 = class302.cp1252AsciiExtension; + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; + } - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; // L: 50 - if (var0 == var3) { - return true; // L: 52 - } - } - } + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; + } - return false; // L: 57 + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; + } + + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; + } + + if (var0 >= 1) { + var0 >>>= 1; + ++var1; + } + + return var0 + var1; + } + + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1741190967" + ) + static final int method3791() { + if (Decimator.clientPreferences.roofsHidden) { + return GrandExchangeEvent.Client_plane; } else { - return true; + int var0 = class122.getTileHeight(ItemContainer.cameraX, WorldMapArchiveLoader.cameraZ, GrandExchangeEvent.Client_plane); + return var0 - Bounds.cameraY < 800 && (Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][ItemContainer.cameraX >> 7][WorldMapArchiveLoader.cameraZ >> 7] & 4) != 0 ? GrandExchangeEvent.Client_plane : 3; } } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "([BII)I", - garbageValue = "-1419386207" - ) - public static int method3863(byte[] var0, int var1) { - int var3 = -1; // L: 47 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 48 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 - } - - var3 = ~var3; // L: 51 - return var3; // L: 54 - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "(Liv;III)V", - garbageValue = "-1678262366" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10899 - if (var0 != null) { // L: 10901 - Widget var4 = PlayerComposition.method4851(var0); // L: 10904 - if (var4 == null) { // L: 10905 - var4 = var0.parent; - } - - if (var4 != null) { // L: 10908 - Client.clickedWidget = var0; // L: 10912 - var4 = PlayerComposition.method4851(var0); // L: 10915 - if (var4 == null) { - var4 = var0.parent; // L: 10916 - } - - Client.clickedWidgetParent = var4; // L: 10919 - Client.widgetClickX = var1; // L: 10920 - Client.widgetClickY = var2; // L: 10921 - UserComparator7.widgetDragDuration = 0; // L: 10922 - Client.isDraggingWidget = false; // L: 10923 - int var5 = HealthBarUpdate.method2283(); // L: 10924 - if (var5 != -1) { // L: 10925 - WorldMapIcon_1.method3305(var5); - } - - return; // L: 10926 - } - } - - } - } // L: 10910 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 79206a4c20..178176b5e1 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,132 +4,132 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kc") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("head") DualNode head; public IterableDualNodeQueue() { - this.sentinel = new DualNode(); // L: 7 - this.sentinel.previousDual = this.sentinel; // L: 11 - this.sentinel.nextDual = this.sentinel; // L: 12 - } // L: 13 + this.sentinel = new DualNode(); + this.sentinel.previousDual = this.sentinel; + this.sentinel.nextDual = this.sentinel; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("clear") public void clear() { - while (this.sentinel.previousDual != this.sentinel) { // L: 16 - this.sentinel.previousDual.removeDual(); // L: 17 + while (this.sentinel.previousDual != this.sentinel) { + this.sentinel.previousDual.removeDual(); } - } // L: 19 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lmm;)V" + descriptor = "(Lmw;)V" ) @Export("add") public void add(DualNode var1) { - if (var1.nextDual != null) { // L: 22 + if (var1.nextDual != null) { var1.removeDual(); } - var1.nextDual = this.sentinel.nextDual; // L: 23 - var1.previousDual = this.sentinel; // L: 24 - var1.nextDual.previousDual = var1; // L: 25 - var1.previousDual.nextDual = var1; // L: 26 - } // L: 27 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "()Lmm;" - ) - @Export("removeLast") - public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; // L: 38 - if (var1 == this.sentinel) { - return null; // L: 39 - } else { - var1.removeDual(); // L: 40 - return var1; // L: 41 - } + var1.nextDual = this.sentinel.nextDual; + var1.previousDual = this.sentinel; + var1.nextDual.previousDual = var1; + var1.previousDual.nextDual = var1; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lmm;" + descriptor = "()Lmw;" + ) + @Export("removeLast") + public DualNode removeLast() { + DualNode var1 = this.sentinel.previousDual; + if (var1 == this.sentinel) { + return null; + } else { + var1.removeDual(); + return var1; + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "()Lmw;" ) @Export("last") public DualNode last() { - return this.previousOrLast((DualNode)null); // L: 45 + return this.previousOrLast((DualNode)null); } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmm;)Lmm;" + descriptor = "(Lmw;)Lmw;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; - if (var1 == null) { // L: 50 + if (var1 == null) { var2 = this.sentinel.previousDual; } else { - var2 = var1; // L: 51 + var2 = var1; } - if (var2 == this.sentinel) { // L: 52 - this.head = null; // L: 53 - return null; // L: 54 + if (var2 == this.sentinel) { + this.head = null; + return null; } else { - this.head = var2.previousDual; // L: 56 - return var2; // L: 57 + this.head = var2.previousDual; + return var2; } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lmm;" + descriptor = "()Lmw;" ) @Export("previous") public DualNode previous() { - DualNode var1 = this.head; // L: 61 - if (var1 == this.sentinel) { // L: 62 - this.head = null; // L: 63 - return null; // L: 64 + DualNode var1 = this.head; + if (var1 == this.sentinel) { + this.head = null; + return null; } else { - this.head = var1.previousDual; // L: 66 - return var1; // L: 67 + this.head = var1.previousDual; + return var1; } } public Iterator iterator() { - return new IterableDualNodeQueueIterator(this); // L: 71 + return new IterableDualNodeQueueIterator(this); } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmm;Lmm;)V" + descriptor = "(Lmw;Lmw;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { - if (var0.nextDual != null) { // L: 30 + if (var0.nextDual != null) { var0.removeDual(); } - var0.nextDual = var1; // L: 31 - var0.previousDual = var1.previousDual; // L: 32 - var0.nextDual.previousDual = var0; // L: 33 - var0.previousDual.nextDual = var0; // L: 34 - } // L: 35 + var0.nextDual = var1; + var0.previousDual = var1.previousDual; + var0.nextDual.previousDual = var0; + var0.previousDual.nextDual = var0; + } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 015e10b2e1..4163ae2d7c 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,61 +4,61 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("kh") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkc;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("head") DualNode head; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lks;)V" + descriptor = "(Lkc;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { - this.last = null; // L: 9 - this.queue = var1; // L: 12 - this.head = this.queue.sentinel.previousDual; // L: 13 - this.last = null; // L: 14 - } // L: 15 - - public void remove() { - if (this.last == null) { // L: 33 - throw new IllegalStateException(); - } else { - this.last.removeDual(); // L: 34 - this.last = null; // L: 35 - } - } // L: 36 - - public boolean hasNext() { - return this.queue.sentinel != this.head; // L: 29 + this.last = null; + this.queue = var1; + this.head = this.queue.sentinel.previousDual; + this.last = null; } public Object next() { - DualNode var1 = this.head; // L: 18 - if (var1 == this.queue.sentinel) { // L: 19 - var1 = null; // L: 20 - this.head = null; // L: 21 + DualNode var1 = this.head; + if (var1 == this.queue.sentinel) { + var1 = null; + this.head = null; } else { - this.head = var1.previousDual; // L: 23 + this.head = var1.previousDual; } - this.last = var1; // L: 24 - return var1; // L: 25 + this.last = var1; + return var1; + } + + public boolean hasNext() { + return this.queue.sentinel != this.head; + } + + public void remove() { + if (this.last == null) { + throw new IllegalStateException(); + } else { + this.last.removeDual(); + this.last = null; + } } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 3a207d6ff9..73d4810676 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,233 +5,233 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("kk") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) - Node field3712; + Node field3723; public IterableNodeDeque() { - this.sentinel = new Node(); // L: 7 - this.sentinel.previous = this.sentinel; // L: 11 - this.sentinel.next = this.sentinel; // L: 12 - } // L: 13 + this.sentinel = new Node(); + this.sentinel.previous = this.sentinel; + this.sentinel.next = this.sentinel; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("rsClear") public void rsClear() { - while (this.sentinel.previous != this.sentinel) { // L: 16 - this.sentinel.previous.remove(); // L: 17 + while (this.sentinel.previous != this.sentinel) { + this.sentinel.previous.remove(); } - } // L: 19 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lml;)V" ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { // L: 22 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel.next; // L: 23 - var1.previous = this.sentinel; // L: 24 - var1.next.previous = var1; // L: 25 - var1.previous.next = var1; // L: 26 - } // L: 27 + var1.next = this.sentinel.next; + var1.previous = this.sentinel; + var1.next.previous = var1; + var1.previous.next = var1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lml;)V" ) @Export("addLast") public void addLast(Node var1) { - if (var1.next != null) { // L: 30 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel; // L: 31 - var1.previous = this.sentinel.previous; // L: 32 - var1.next.previous = var1; // L: 33 - var1.previous.next = var1; // L: 34 - } // L: 35 + var1.next = this.sentinel; + var1.previous = this.sentinel.previous; + var1.next.previous = var1; + var1.previous.next = var1; + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" ) @Export("last") public Node last() { - return this.method5361((Node)null); // L: 46 + return this.method5321((Node)null); } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmf;)Lmf;" + descriptor = "(Lml;)Lml;" ) - Node method5361(Node var1) { + Node method5321(Node var1) { Node var2; - if (var1 == null) { // L: 51 + if (var1 == null) { var2 = this.sentinel.previous; } else { - var2 = var1; // L: 52 + var2 = var1; } - if (var2 == this.sentinel) { // L: 53 - this.field3712 = null; // L: 54 - return null; // L: 55 + if (var2 == this.sentinel) { + this.field3723 = null; + return null; } else { - this.field3712 = var2.previous; // L: 57 - return var2; // L: 58 + this.field3723 = var2.previous; + return var2; } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" ) @Export("previous") public Node previous() { - Node var1 = this.field3712; // L: 62 - if (var1 == this.sentinel) { // L: 63 - this.field3712 = null; // L: 64 - return null; // L: 65 + Node var1 = this.field3723; + if (var1 == this.sentinel) { + this.field3723 = null; + return null; } else { - this.field3712 = var1.previous; // L: 67 - return var1; // L: 68 + this.field3723 = var1.previous; + return var1; } } + @ObfuscatedName("f") + int method5329() { + int var1 = 0; + + for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { + ++var1; + } + + return var1; + } + + @ObfuscatedName("o") + public boolean method5383() { + return this.sentinel.previous == this.sentinel; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "()[Lml;" + ) + Node[] method5325() { + Node[] var1 = new Node[this.method5329()]; + int var2 = 0; + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { + var1[var2++] = var3; + } + + return var1; + } + @ObfuscatedName("r") - int method5363() { - int var1 = 0; // L: 72 - - for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 - ++var1; // L: 75 - } - - return var1; // L: 78 - } - - @ObfuscatedName("h") - public boolean method5364() { - return this.sentinel.previous == this.sentinel; // L: 82 - } - - @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()[Lmf;" + descriptor = "(Lml;)Z" ) - Node[] method5370() { - Node[] var1 = new Node[this.method5363()]; // L: 86 - int var2 = 0; // L: 87 - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 - var1[var2++] = var3; // L: 90 - } - - return var1; // L: 93 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lmf;)Z" - ) - boolean method5384(Node var1) { - this.addFirst(var1); // L: 127 - return true; // L: 128 + boolean method5328(Node var1) { + this.addFirst(var1); + return true; } public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); // L: 97 - } - - public boolean contains(Object var1) { - throw new RuntimeException(); // L: 109 - } - - public boolean isEmpty() { - return this.method5364(); // L: 105 - } - - public Object[] toArray(Object[] var1) { - int var2 = 0; // L: 117 - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121 - var1[var2++] = var3; // L: 120 - } - - return var1; // L: 123 - } - - public void clear() { - this.rsClear(); // L: 152 - } // L: 153 - - public boolean remove(Object var1) { - throw new RuntimeException(); // L: 132 - } - - public boolean containsAll(Collection var1) { - throw new RuntimeException(); // L: 136 - } - - public boolean addAll(Collection var1) { - throw new RuntimeException(); // L: 140 - } - - public boolean equals(Object var1) { - return super.equals(var1); // L: 160 - } - - public int hashCode() { - return super.hashCode(); // L: 164 - } - - public boolean removeAll(Collection var1) { - throw new RuntimeException(); // L: 144 - } - - public Object[] toArray() { - return this.method5370(); // L: 113 + return new IterableNodeDequeDescendingIterator(this); } public int size() { - return this.method5363(); // L: 101 + return this.method5329(); } - public boolean add(Object var1) { - return this.method5384((Node)var1); // L: 156 + public boolean contains(Object var1) { + throw new RuntimeException(); + } + + public Object[] toArray(Object[] var1) { + int var2 = 0; + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { + var1[var2++] = var3; + } + + return var1; + } + + public boolean remove(Object var1) { + throw new RuntimeException(); + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean addAll(Collection var1) { + throw new RuntimeException(); + } + + public void clear() { + this.rsClear(); } public boolean retainAll(Collection var1) { - throw new RuntimeException(); // L: 148 + throw new RuntimeException(); } - @ObfuscatedName("y") + public boolean add(Object var1) { + return this.method5328((Node)var1); + } + + public boolean equals(Object var1) { + return super.equals(var1); + } + + public int hashCode() { + return super.hashCode(); + } + + public boolean isEmpty() { + return this.method5383(); + } + + public Object[] toArray() { + return this.method5325(); + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); + } + + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lmf;Lmf;)V" + descriptor = "(Lml;Lml;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { // L: 38 + if (var0.next != null) { var0.remove(); } - var0.next = var1; // L: 39 - var0.previous = var1.previous; // L: 40 - var0.next.previous = var0; // L: 41 - var0.previous.next = var0; // L: 42 - } // L: 43 + var0.next = var1; + var0.previous = var1.previous; + var0.next.previous = var0; + var0.previous.next = var0; + } } diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 6e87aca7f4..7db1819883 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,71 +4,71 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("kd") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lkk;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) - Node field3711; + Node field3720; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lkz;)V" + descriptor = "(Lkk;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { - this.last = null; // L: 9 - this.setDeque(var1); // L: 12 - } // L: 13 + this.last = null; + this.setDeque(var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkz;)V" + descriptor = "(Lkk;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { - this.deque = var1; // L: 16 - this.start(); // L: 17 - } // L: 18 - - @ObfuscatedName("e") - @Export("start") - void start() { - this.field3711 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 - this.last = null; // L: 22 - } // L: 23 - - public Object next() { - Node var1 = this.field3711; // L: 26 - if (var1 == this.deque.sentinel) { // L: 27 - var1 = null; // L: 28 - this.field3711 = null; // L: 29 - } else { - this.field3711 = var1.previous; // L: 31 - } - - this.last = var1; // L: 32 - return var1; // L: 33 + this.deque = var1; + this.start(); } - public boolean hasNext() { - return this.deque.sentinel != this.field3711; // L: 37 + @ObfuscatedName("t") + @Export("start") + void start() { + this.field3720 = this.deque != null ? this.deque.sentinel.previous : null; + this.last = null; + } + + public Object next() { + Node var1 = this.field3720; + if (var1 == this.deque.sentinel) { + var1 = null; + this.field3720 = null; + } else { + this.field3720 = var1.previous; + } + + this.last = var1; + return var1; } public void remove() { - this.last.remove(); // L: 42 - this.last = null; // L: 43 - } // L: 44 + this.last.remove(); + this.last = null; + } + + public boolean hasNext() { + return this.deque.sentinel != this.field3720 && this.field3720 != null; + } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 66ebcdb0f9..c94bd9d10c 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,141 +4,141 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mc") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("size") int size; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lmf;" + descriptor = "[Lml;" ) @Export("buckets") Node[] buckets; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("current") Node current; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("index") int index; public IterableNodeHashTable(int var1) { - this.index = 0; // L: 11 - this.size = var1; // L: 14 - this.buckets = new Node[var1]; // L: 15 + this.index = 0; + this.size = var1; + this.buckets = new Node[var1]; - for (int var2 = 0; var2 < var1; ++var2) { // L: 16 - Node var3 = this.buckets[var2] = new Node(); // L: 17 - var3.previous = var3; // L: 18 - var3.next = var3; // L: 19 + for (int var2 = 0; var2 < var1; ++var2) { + Node var3 = this.buckets[var2] = new Node(); + var3.previous = var3; + var3.next = var3; } - } // L: 21 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(J)Lmf;" + descriptor = "(J)Lml;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24 + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; - for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 25 26 32 - if (this.currentGet.key == var1) { // L: 27 - Node var4 = this.currentGet; // L: 28 - this.currentGet = this.currentGet.previous; // L: 29 - return var4; // L: 30 + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { + if (this.currentGet.key == var1) { + Node var4 = this.currentGet; + this.currentGet = this.currentGet.previous; + return var4; } } - this.currentGet = null; // L: 34 - return null; // L: 35 + this.currentGet = null; + return null; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lmf;J)V" + descriptor = "(Lml;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { // L: 39 + if (var1.next != null) { var1.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 40 - var1.next = var4.next; // L: 41 - var1.previous = var4; // L: 42 - var1.next.previous = var1; // L: 43 - var1.previous.next = var1; // L: 44 - var1.key = var2; // L: 45 - } // L: 46 + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; + var1.next = var4.next; + var1.previous = var4; + var1.next.previous = var1; + var1.previous.next = var1; + var1.key = var2; + } @ObfuscatedName("v") @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 - Node var2 = this.buckets[var1]; // L: 50 + for (int var1 = 0; var1 < this.size; ++var1) { + Node var2 = this.buckets[var1]; while (true) { - Node var3 = var2.previous; // L: 52 - if (var3 == var2) { // L: 53 + Node var3 = var2.previous; + if (var3 == var2) { break; } - var3.remove(); // L: 54 + var3.remove(); } } - this.currentGet = null; // L: 57 - this.current = null; // L: 58 - } // L: 59 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "()Lmf;" - ) - @Export("first") - public Node first() { - this.index = 0; // L: 62 - return this.next(); // L: 63 + this.currentGet = null; + this.current = null; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" + ) + @Export("first") + public Node first() { + this.index = 0; + return this.next(); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "()Lml;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67 - var1 = this.current; // L: 68 - this.current = var1.previous; // L: 69 - return var1; // L: 70 + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { + var1 = this.current; + this.current = var1.previous; + return var1; } else { do { - if (this.index >= this.size) { // L: 72 - return null; // L: 79 + if (this.index >= this.size) { + return null; } - var1 = this.buckets[this.index++].previous; // L: 73 - } while(var1 == this.buckets[this.index - 1]); // L: 74 + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); - this.current = var1.previous; // L: 75 - return var1; // L: 76 + this.current = var1.previous; + return var1; } } public Iterator iterator() { - return new IterableNodeHashTableIterator(this); // L: 83 + return new IterableNodeHashTableIterator(this); } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 5dae5b2933..76fa509e47 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,93 +4,93 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("mx") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("head") Node head; @ObfuscatedName("v") @Export("index") int index; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lmo;)V" + descriptor = "(Lmc;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { - this.last = null; // L: 10 - this.hashTable = var1; // L: 13 - this.start(); // L: 14 - } // L: 15 + this.last = null; + this.hashTable = var1; + this.start(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("start") void start() { - this.head = this.hashTable.buckets[0].previous; // L: 18 - this.index = 1; // L: 19 - this.last = null; // L: 20 - } // L: 21 + this.head = this.hashTable.buckets[0].previous; + this.index = 1; + this.last = null; + } public Object next() { Node var1; - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 - var1 = this.head; // L: 25 - this.head = var1.previous; // L: 26 - this.last = var1; // L: 27 - return var1; // L: 28 + if (this.hashTable.buckets[this.index - 1] != this.head) { + var1 = this.head; + this.head = var1.previous; + this.last = var1; + return var1; } else { do { - if (this.index >= this.hashTable.size) { // L: 30 - return null; // L: 38 + if (this.index >= this.hashTable.size) { + return null; } - var1 = this.hashTable.buckets[this.index++].previous; // L: 31 - } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 + var1 = this.hashTable.buckets[this.index++].previous; + } while(var1 == this.hashTable.buckets[this.index - 1]); - this.head = var1.previous; // L: 33 - this.last = var1; // L: 34 - return var1; // L: 35 + this.head = var1.previous; + this.last = var1; + return var1; + } + } + + public boolean hasNext() { + if (this.hashTable.buckets[this.index - 1] != this.head) { + return true; + } else { + while (this.index < this.hashTable.size) { + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { + this.head = this.hashTable.buckets[this.index - 1].previous; + return true; + } + + this.head = this.hashTable.buckets[this.index - 1]; + } + + return false; } } public void remove() { - if (this.last == null) { // L: 56 + if (this.last == null) { throw new IllegalStateException(); } else { - this.last.remove(); // L: 57 - this.last = null; // L: 58 - } - } // L: 59 - - public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 - return true; - } else { - while (this.index < this.hashTable.size) { // L: 43 - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44 - this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45 - return true; // L: 46 - } - - this.head = this.hashTable.buckets[this.index - 1]; // L: 49 - } - - return false; // L: 52 + this.last.remove(); + this.last = null; } } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index c33c9553d4..7370a3a743 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,103 +1,203 @@ +import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("eu") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("b") + @ObfuscatedName("j") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("l") + @Export("cacheDir") + static File cacheDir; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lna;" + descriptor = "Lnh;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lna;" + descriptor = "Lnh;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lna;" + descriptor = "Lnh;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("u") - @Export("cacheSubPaths") - public static String[] cacheSubPaths; - @ObfuscatedName("n") - @Export("userHomeDirectory") - public static String userHomeDirectory; - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive10") - static Archive archive10; static { - JagexCache_randomDat = null; // L: 22 - JagexCache_dat2File = null; // L: 23 - JagexCache_idx255File = null; // L: 24 + JagexCache_randomDat = null; + JagexCache_dat2File = null; + JagexCache_idx255File = null; } - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "-1038546340" - ) - static final void method2637(int var0, int var1, int var2, boolean var3) { - if (class20.loadInterface(var0)) { // L: 9946 - DynamicObject.resizeInterface(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 9947 - } - } // L: 9948 - @ObfuscatedName("jz") @ObfuscatedSignature( - descriptor = "([Liv;II)V", - garbageValue = "1856599832" + descriptor = "(Lio;II)I", + garbageValue = "-711013706" ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10869 - Widget var3 = var0[var2]; // L: 10870 - if (var3 != null) { // L: 10871 - if (var3.type == 0) { // L: 10872 - if (var3.children != null) { // L: 10873 - runComponentCloseListeners(var3.children, var1); + static final int method2617(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + try { + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; + + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; } - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10874 - if (var4 != null) { // L: 10875 - class8.runIntfCloseListeners(var4.group, var1); + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; } - } - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 10877 - var5 = new ScriptEvent(); // L: 10878 - var5.widget = var3; // L: 10879 - var5.args = var3.onDialogAbort; // L: 10880 - WorldMapSection1.runScriptEvent(var5); // L: 10881 - } + if (var6 == 2) { + var7 = Client.levels[var2[var4++]]; + } - if (var1 == 1 && var3.onSubChange != null) { // L: 10883 - if (var3.childIndex >= 0) { // L: 10884 - Widget var6 = WorldMapData_1.getWidget(var3.id); // L: 10885 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10886 - continue; + if (var6 == 3) { + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = UrlRequester.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!KeyHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 += var10.itemQuantities[var12]; + } + } } } - var5 = new ScriptEvent(); // L: 10890 - var5.widget = var3; // L: 10891 - var5.args = var3.onSubChange; // L: 10892 - WorldMapSection1.runScriptEvent(var5); // L: 10893 - } - } - } + if (var6 == 5) { + var7 = Varps.Varps_main[var2[var4++]]; + } - } // L: 10896 + if (var6 == 6) { + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { + var7 = MouseHandler.localPlayer.combatLevel; + } + + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = UrlRequester.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!KeyHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 = 999999999; + break; + } + } + } + } + + if (var6 == 11) { + var7 = Client.runEnergy; + } + + if (var6 == 12) { + var7 = Client.weight; + } + + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; + } + + if (var6 == 14) { + var9 = var2[var4++]; + var7 = WorldMapSection0.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; + } + + if (var6 == 19) { + var7 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } + } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 3ab052ae98..802b257540 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -8,94 +8,106 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("r") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lr;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cb") + @ObfuscatedName("cd") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cg") - public static boolean[] field264; - @ObfuscatedName("ca") - public static boolean[] field265; - @ObfuscatedName("cy") - public static int[] field283; - @ObfuscatedName("ct") - @ObfuscatedGetter( - intValue = 2097317257 - ) - public static int field267; - @ObfuscatedName("ci") - @ObfuscatedGetter( - intValue = -1162064339 - ) - public static int field268; - @ObfuscatedName("cs") - static char[] field269; @ObfuscatedName("co") - static int[] field270; - @ObfuscatedName("cj") - public static int[] field257; - @ObfuscatedName("cr") + public static boolean[] field46; + @ObfuscatedName("cm") + public static boolean[] field38; + @ObfuscatedName("cy") + public static int[] field48; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 1885523729 + intValue = 563780521 ) - public static int field271; - @ObfuscatedName("cl") - public static int[] field273; - @ObfuscatedName("cw") + public static int field49; + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 227302155 + intValue = 1125438521 ) - public static int field274; + public static int field50; + @ObfuscatedName("cv") + static char[] field51; + @ObfuscatedName("cg") + static int[] field54; + @ObfuscatedName("cu") + public static int[] field53; @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 490430437 + intValue = 2026317619 ) - public static int field276; - @ObfuscatedName("cn") + public static int field35; + @ObfuscatedName("cz") + public static int[] field55; + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 1780430541 + intValue = 1116786775 ) - public static int field255; - @ObfuscatedName("ch") + public static int field64; + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -35185769 + intValue = -148325769 ) - public static int field277; - @ObfuscatedName("du") + public static int field57; + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -1652881761 + intValue = 2143754103 + ) + public static int field52; + @ObfuscatedName("cc") + @ObfuscatedGetter( + intValue = -1631007479 + ) + public static int field59; + @ObfuscatedName("dk") + @ObfuscatedGetter( + intValue = -1607582359 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("db") + @ObfuscatedName("df") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; + @ObfuscatedName("if") + @ObfuscatedGetter( + intValue = -2077496347 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("mm") + @ObfuscatedGetter( + intValue = -1125858877 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; static { - KeyHandler_instance = new KeyHandler(); // L: 14 - KeyHandler_pressedKeys = new boolean[112]; // L: 101 - field264 = new boolean[112]; // L: 102 - field265 = new boolean[112]; // L: 103 - field283 = new int[128]; // L: 106 - field267 = 0; // L: 107 - field268 = 0; // L: 108 - field269 = new char[128]; // L: 109 - field270 = new int[128]; // L: 110 - field257 = new int[128]; - field271 = 0; - field273 = new int[128]; - field274 = 0; - field276 = 0; - field255 = 0; - field277 = 0; + KeyHandler_instance = new KeyHandler(); + KeyHandler_pressedKeys = new boolean[112]; + field46 = new boolean[112]; + field38 = new boolean[112]; + field48 = new int[128]; + field49 = 0; + field50 = 0; + field51 = new char[128]; + field54 = new int[128]; + field53 = new int[128]; + field35 = 0; + field55 = new int[128]; + field64 = 0; + field57 = 0; + field52 = 0; + field59 = 0; KeyHandler_idleCycles = 0; KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } @@ -103,6 +115,13 @@ public final class KeyHandler implements KeyListener, FocusListener { KeyHandler() { } + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { + field50 = -1; + } + + } + public final synchronized void keyPressed(KeyEvent var1) { if (KeyHandler_instance != null) { int var2 = var1.getKeyCode(); @@ -112,24 +131,24 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } } else { - var2 = -1; // L: 183 + var2 = -1; } - if (field268 >= 0 && var2 >= 0) { - field283[field268] = var2; - field268 = field268 + 1 & 127; - if (field268 == field267) { - field268 = -1; + if (field50 >= 0 && var2 >= 0) { + field48[field50] = var2; + field50 = field50 + 1 & 127; + if (field49 == field50) { + field50 = -1; } } int var3; - if (var2 >= 0) { // L: 189 - var3 = field255 + 1 & 127; - if (var3 != field276) { - field270[field255] = var2; - field269[field255] = 0; - field255 = var3; + if (var2 >= 0) { + var3 = field52 + 1 & 127; + if (var3 != field57) { + field54[field52] = var2; + field51[field52] = 0; + field52 = var3; } } @@ -139,7 +158,7 @@ public final class KeyHandler implements KeyListener, FocusListener { } } - } // L: 202 + } public final synchronized void keyReleased(KeyEvent var1) { if (KeyHandler_instance != null) { @@ -150,27 +169,11 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field268 >= 0 && var2 >= 0) { // L: 209 - field283[field268] = ~var2; - field268 = field268 + 1 & 127; - if (field268 == field267) { - field268 = -1; - } - } - } - - var1.consume(); // L: 215 - } - - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { - char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != '\uffff' && ItemLayer.method3861(var2)) { - int var3 = field255 + 1 & 127; // L: 222 - if (var3 != field276) { - field270[field255] = -1; - field269[field255] = var2; - field255 = var3; + if (field50 >= 0 && var2 >= 0) { + field48[field50] = ~var2; + field50 = field50 + 1 & 127; + if (field50 == field49) { + field50 = -1; } } } @@ -179,353 +182,223 @@ public final class KeyHandler implements KeyListener, FocusListener { } public final void focusGained(FocusEvent var1) { - } // L: 264 + } - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 267 - field268 = -1; // L: 268 + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { + char var2 = var1.getKeyChar(); + if (var2 != 0 && var2 != '\uffff' && WallDecoration.method4339(var2)) { + int var3 = field52 + 1 & 127; + if (var3 != field57) { + field54[field52] = -1; + field51[field52] = var2; + field52 = var3; + } + } } - } // L: 270 + var1.consume(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIILfv;Lfl;B)Z", - garbageValue = "30" + descriptor = "(II)Lfh;", + garbageValue = "1153605408" ) - public static final boolean method475(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; // L: 111 - int var6 = var1; // L: 112 - byte var7 = 64; // L: 113 - byte var8 = 64; // L: 114 - int var9 = var0 - var7; // L: 115 - int var10 = var1 - var8; // L: 116 - class160.directions[var7][var8] = 99; // L: 117 - class160.distances[var7][var8] = 0; // L: 118 - byte var11 = 0; // L: 119 - int var12 = 0; // L: 120 - class160.bufferX[var11] = var0; // L: 121 - int var20 = var11 + 1; - class160.bufferY[var11] = var1; // L: 122 - int[][] var13 = var4.flags; // L: 123 + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SoundSystem.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - while (true) { - label307: - while (true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label284: - do { - if (var20 == var12) { // L: 124 - Login.field1033 = var5; // L: 243 - GrandExchangeOfferOwnWorldComparator.field608 = var6; // L: 244 - return false; // L: 245 - } + var1.post(); + if (var1.noteTemplate != -1) { + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } - var5 = class160.bufferX[var12]; // L: 125 - var6 = class160.bufferY[var12]; // L: 126 - var12 = var12 + 1 & 4095; // L: 127 - var18 = var5 - var9; // L: 128 - var19 = var6 - var10; // L: 129 - var14 = var5 - var4.xInset; // L: 130 - var15 = var6 - var4.yInset; // L: 131 - if (var3.hasArrived(var2, var5, var6, var4)) { // L: 132 - Login.field1033 = var5; // L: 133 - GrandExchangeOfferOwnWorldComparator.field608 = var6; // L: 134 - return true; // L: 135 - } + if (var1.notedId != -1) { + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } - var16 = class160.distances[var18][var19] + 1; // L: 137 - if (var18 > 0 && class160.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 138 139 140 141 - var17 = 1; + if (var1.placeholderTemplate != -1) { + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } - while (true) { - if (var17 >= var2 - 1) { - class160.bufferX[var20] = var5 - 1; // L: 145 - class160.bufferY[var20] = var6; // L: 146 - var20 = var20 + 1 & 4095; // L: 147 - class160.directions[var18 - 1][var19] = 2; // L: 148 - class160.distances[var18 - 1][var19] = var16; // L: 149 - break; - } + if (!class144.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + var1.name = "Members object"; + var1.isTradable = false; - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 143 - break; - } + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { + var1.groundActions[var3] = null; + } - ++var17; // L: 142 - } - } - - if (var18 < 128 - var2 && class160.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 151 152 153 154 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class160.bufferX[var20] = var5 + 1; // L: 158 - class160.bufferY[var20] = var6; // L: 159 - var20 = var20 + 1 & 4095; // L: 160 - class160.directions[var18 + 1][var19] = 8; // L: 161 - class160.distances[var18 + 1][var19] = var16; // L: 162 - break; - } - - if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 156 - break; - } - - ++var17; // L: 155 - } - } - - if (var19 > 0 && class160.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 164 165 166 167 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class160.bufferX[var20] = var5; // L: 171 - class160.bufferY[var20] = var6 - 1; // L: 172 - var20 = var20 + 1 & 4095; // L: 173 - class160.directions[var18][var19 - 1] = 1; // L: 174 - class160.distances[var18][var19 - 1] = var16; // L: 175 - break; - } - - if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 169 - break; - } - - ++var17; // L: 168 - } - } - - if (var19 < 128 - var2 && class160.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 177 178 179 180 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class160.bufferX[var20] = var5; // L: 184 - class160.bufferY[var20] = var6 + 1; // L: 185 - var20 = var20 + 1 & 4095; // L: 186 - class160.directions[var18][var19 + 1] = 4; // L: 187 - class160.distances[var18][var19 + 1] = var16; // L: 188 - break; - } - - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { // L: 182 - break; - } - - ++var17; // L: 181 - } - } - - if (var18 > 0 && var19 > 0 && class160.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 190 191 192 - var17 = 1; - - while (true) { - if (var17 >= var2) { - class160.bufferX[var20] = var5 - 1; // L: 197 - class160.bufferY[var20] = var6 - 1; // L: 198 - var20 = var20 + 1 & 4095; // L: 199 - class160.directions[var18 - 1][var19 - 1] = 3; // L: 200 - class160.distances[var18 - 1][var19 - 1] = var16; // L: 201 - break; - } - - if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 194 195 - break; - } - - ++var17; // L: 193 - } - } - - if (var18 < 128 - var2 && var19 > 0 && class160.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 203 204 205 - var17 = 1; - - while (true) { - if (var17 >= var2) { - class160.bufferX[var20] = var5 + 1; // L: 210 - class160.bufferY[var20] = var6 - 1; // L: 211 - var20 = var20 + 1 & 4095; // L: 212 - class160.directions[var18 + 1][var19 - 1] = 9; // L: 213 - class160.distances[var18 + 1][var19 - 1] = var16; // L: 214 - break; - } - - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 207 208 - break; - } - - ++var17; // L: 206 - } - } - - if (var18 > 0 && var19 < 128 - var2 && class160.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 216 217 218 - for (var17 = 1; var17 < var2; ++var17) { // L: 219 - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 220 221 - continue label284; - } - } - - class160.bufferX[var20] = var5 - 1; // L: 223 - class160.bufferY[var20] = var6 + 1; // L: 224 - var20 = var20 + 1 & 4095; // L: 225 - class160.directions[var18 - 1][var19 + 1] = 6; // L: 226 - class160.distances[var18 - 1][var19 + 1] = var16; // L: 227 - } - } while(var18 >= 128 - var2); // L: 229 - } while(var19 >= 128 - var2); - } while(class160.directions[var18 + 1][var19 + 1] != 0); // L: 230 - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 231 - - for (var17 = 1; var17 < var2; ++var17) { // L: 232 - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var15 + var17] & 19136995) != 0) { // L: 233 234 - continue label307; + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { + if (var3 != 4) { + var1.inventoryActions[var3] = null; } } - class160.bufferX[var20] = var5 + 1; // L: 236 - class160.bufferY[var20] = var6 + 1; // L: 237 - var20 = var20 + 1 & 4095; // L: 238 - class160.directions[var18 + 1][var19 + 1] = 12; // L: 239 - class160.distances[var18 + 1][var19 + 1] = var16; // L: 240 + var1.shiftClickIndex = -2; + var1.team = 0; + if (var1.params != null) { + boolean var6 = false; + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamComposition var5 = PacketBuffer.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var6 = true; + } + } + + if (!var6) { + var1.params = null; + } + } } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("hx") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ZLns;I)V", - garbageValue = "-739552124" + descriptor = "(IILfg;Lfy;B)Z", + garbageValue = "-127" ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 5526 - int var2; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { // L: 5527 - var2 = var1.method6651(); // L: 5528 - int var3 = var1.readUnsignedShort(); // L: 5529 - var4 = var1.readUnsignedShort(); // L: 5530 - class7.xteaKeys = new int[var4][4]; // L: 5531 + static final boolean method107(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class161.directions[var6][var7] = 99; + class161.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class161.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class161.bufferY[var10001] = var1; + int[][] var12 = var3.flags; - for (var5 = 0; var5 < var4; ++var5) { // L: 5532 - for (var6 = 0; var6 < 4; ++var6) { // L: 5533 - class7.xteaKeys[var5][var6] = var1.readInt(); // L: 5534 - } + while (var18 != var11) { + var4 = class161.bufferX[var11]; + var5 = class161.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(2, var4, var5, var3)) { + SoundSystem.field219 = var4; + class161.field1896 = var5; + return true; } - UserComparator4.regions = new int[var4]; // L: 5537 - UrlRequester.regionMapArchiveIds = new int[var4]; // L: 5538 - class286.regionLandArchiveIds = new int[var4]; // L: 5539 - UrlRequest.regionLandArchives = new byte[var4][]; // L: 5540 - WorldMapDecorationType.regionMapArchives = new byte[var4][]; // L: 5541 - boolean var16 = false; // L: 5542 - if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5543 - var16 = true; + int var15 = class161.distances[var16][var17] + 1; + if (var16 > 0 && class161.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { + class161.bufferX[var18] = var4 - 1; + class161.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class161.directions[var16 - 1][var17] = 2; + class161.distances[var16 - 1][var17] = var15; } - if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5544 - var16 = true; + if (var16 < 126 && class161.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { + class161.bufferX[var18] = var4 + 1; + class161.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class161.directions[var16 + 1][var17] = 8; + class161.distances[var16 + 1][var17] = var15; } - var4 = 0; // L: 5545 - - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5546 - for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5547 - var8 = var7 + (var6 << 8); // L: 5548 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5549 - UserComparator4.regions[var4] = var8; // L: 5550 - UrlRequester.regionMapArchiveIds[var4] = class4.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5551 - class286.regionLandArchiveIds[var4] = class4.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5552 - ++var4; // L: 5553 - } - } + if (var17 > 0 && class161.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { + class161.bufferX[var18] = var4; + class161.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class161.directions[var16][var17 - 1] = 1; + class161.distances[var16][var17 - 1] = var15; } - class265.method4984(var2, var3, true); // L: 5556 - } else { - var2 = var1.method6651(); // L: 5559 - boolean var15 = var1.readUnsignedByte() == 1; // L: 5560 - var4 = var1.method6651(); // L: 5561 - var5 = var1.readUnsignedShort(); // L: 5562 - var1.importIndex(); // L: 5563 - - int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 5564 - for (var7 = 0; var7 < 13; ++var7) { // L: 5565 - for (var8 = 0; var8 < 13; ++var8) { // L: 5566 - var9 = var1.readBits(1); // L: 5567 - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5568 - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5569 - } - } - } + if (var17 < 126 && class161.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { + class161.bufferX[var18] = var4; + class161.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class161.directions[var16][var17 + 1] = 4; + class161.distances[var16][var17 + 1] = var15; } - var1.exportIndex(); // L: 5573 - class7.xteaKeys = new int[var5][4]; // L: 5574 - - for (var6 = 0; var6 < var5; ++var6) { // L: 5575 - for (var7 = 0; var7 < 4; ++var7) { // L: 5576 - class7.xteaKeys[var6][var7] = var1.readInt(); // L: 5577 - } + if (var16 > 0 && var17 > 0 && class161.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) { + class161.bufferX[var18] = var4 - 1; + class161.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 - 1][var17 - 1] = 3; + class161.distances[var16 - 1][var17 - 1] = var15; } - UserComparator4.regions = new int[var5]; // L: 5580 - UrlRequester.regionMapArchiveIds = new int[var5]; // L: 5581 - class286.regionLandArchiveIds = new int[var5]; // L: 5582 - UrlRequest.regionLandArchives = new byte[var5][]; // L: 5583 - WorldMapDecorationType.regionMapArchives = new byte[var5][]; // L: 5584 - var5 = 0; // L: 5585 - - for (var6 = 0; var6 < 4; ++var6) { // L: 5586 - for (var7 = 0; var7 < 13; ++var7) { // L: 5587 - for (var8 = 0; var8 < 13; ++var8) { // L: 5588 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5589 - if (var9 != -1) { // L: 5590 - int var10 = var9 >> 14 & 1023; // L: 5591 - int var11 = var9 >> 3 & 2047; // L: 5592 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5593 - - int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 5594 - if (UserComparator4.regions[var13] == var12) { - var12 = -1; // L: 5595 - break; // L: 5596 - } - } - - if (var12 != -1) { // L: 5598 - UserComparator4.regions[var5] = var12; // L: 5599 - var13 = var12 >> 8 & 255; // L: 5600 - int var14 = var12 & 255; // L: 5601 - UrlRequester.regionMapArchiveIds[var5] = class4.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5602 - class286.regionLandArchiveIds[var5] = class4.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5603 - ++var5; // L: 5604 - } - } - } - } + if (var16 < 126 && var17 > 0 && class161.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) { + class161.bufferX[var18] = var4 + 1; + class161.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 + 1][var17 - 1] = 9; + class161.distances[var16 + 1][var17 - 1] = var15; } - class265.method4984(var4, var2, !var15); // L: 5610 + if (var16 > 0 && var17 < 126 && class161.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) { + class161.bufferX[var18] = var4 - 1; + class161.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 - 1][var17 + 1] = 6; + class161.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 126 && var17 < 126 && class161.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) { + class161.bufferX[var18] = var4 + 1; + class161.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 + 1][var17 + 1] = 12; + class161.distances[var16 + 1][var17 + 1] = var15; + } } - } // L: 5612 + SoundSystem.field219 = var4; + class161.field1896 = var5; + return false; + } + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-685939623" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + class115.method2431(); + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; + } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-193289736" + ) + static final String method83(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; + } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 9ebff1279b..b3b768f06b 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,246 +4,257 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("ea") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljp;" + @ObfuscatedName("ru") + @ObfuscatedGetter( + intValue = -1314899877 ) - @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("y") + static int field1577; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Ljy;" + ) + @Export("KitDefinition_archive") + public static AbstractArchive KitDefinition_archive; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1154669029 + ) + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhw;" ) @Export("KitDefinition_cached") static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("do") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lan;" ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("j") + @Export("soundCache") + public static SoundCache soundCache; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1389060673 + intValue = 39726043 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("models2") int[] models2; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("models") int[] models; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("nonSelectable") public boolean nonSelectable; static { - KitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 + KitDefinition_cached = new EvictingDualNodeHashTable(64); } KitDefinition() { - this.bodypartID = -1; // L: 15 - this.models = new int[]{-1, -1, -1, -1, -1}; // L: 21 - this.nonSelectable = false; // L: 22 - } // L: 24 + this.bodypartID = -1; + this.models = new int[]{-1, -1, -1, -1, -1}; + this.nonSelectable = false; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;B)V", - garbageValue = "82" + descriptor = "(Lnv;I)V", + garbageValue = "124384670" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 38 - if (var2 == 0) { // L: 39 - return; // L: 42 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 40 + this.decodeNext(var1, var2); } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-1096590760" + descriptor = "(Lnv;II)V", + garbageValue = "398663361" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 45 + if (var2 == 1) { this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { // L: 46 - var3 = var1.readUnsignedByte(); // L: 47 - this.models2 = new int[var3]; // L: 48 + if (var2 == 2) { + var3 = var1.readUnsignedByte(); + this.models2 = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 49 + for (var4 = 0; var4 < var3; ++var4) { this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { // L: 51 + } else if (var2 == 3) { this.nonSelectable = true; - } 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 + } else if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 56 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58 + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } 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 + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 65 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67 + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 >= 60 && var2 < 70) { // L: 70 + } else if (var2 >= 60 && var2 < 70) { this.models[var2 - 60] = var1.readUnsignedShort(); } } - } // L: 72 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "31141" - ) - @Export("ready") - public boolean ready() { - if (this.models2 == null) { // L: 75 - return true; - } else { - boolean var1 = true; // L: 76 - - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77 - if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { - var1 = false; - } - } - - return var1; // L: 78 - } } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)Lga;", - garbageValue = "-55" + descriptor = "(B)Z", + garbageValue = "59" ) - @Export("getModelData") - public ModelData getModelData() { - if (this.models2 == null) { // L: 82 - return null; + @Export("ready") + public boolean ready() { + if (this.models2 == null) { + return true; } else { - ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 + boolean var1 = true; - 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: 86 - var4 = var1[0]; - } else { - var4 = new ModelData(var1, var1.length); // L: 87 - } - - int var3; - 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 + for (int var2 = 0; var2 < this.models2.length; ++var2) { + if (!ClientPreferences.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + var1 = false; } } - 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: 98 + return var1; } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Lgz;", + garbageValue = "1367076195" ) - public boolean method2754() { - boolean var1 = true; // L: 102 + @Export("getModelData") + public ModelData getModelData() { + if (this.models2 == null) { + return null; + } else { + ModelData[] var1 = new ModelData[this.models2.length]; - for (int var2 = 0; var2 < 5; ++var2) { // L: 103 - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 + for (int var2 = 0; var2 < this.models2.length; ++var2) { + var1[var2] = ModelData.ModelData_get(ClientPreferences.KitDefinition_modelsArchive, this.models2[var2], 0); + } + + ModelData var4; + if (var1.length == 1) { + var4 = var1[0]; + } else { + var4 = new ModelData(var1, var1.length); + } + + int var3; + if (this.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + } + } + + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + } + } + + return var4; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1263323868" + ) + public boolean method2755() { + boolean var1 = true; + + for (int var2 = 0; var2 < 5; ++var2) { + if (this.models[var2] != -1 && !ClientPreferences.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { var1 = false; } } - return var1; // L: 106 + return var1; } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(S)Lga;", - garbageValue = "4207" + descriptor = "(I)Lgz;", + garbageValue = "891138364" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; // L: 110 - int var2 = 0; // L: 111 + ModelData[] var1 = new ModelData[5]; + int var2 = 0; - 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); + for (int var3 = 0; var3 < 5; ++var3) { + if (this.models[var3] != -1) { + var1[var2++] = ModelData.ModelData_get(ClientPreferences.KitDefinition_modelsArchive, this.models[var3], 0); } } - ModelData var5 = new ModelData(var1, var2); // L: 115 + ModelData var5 = new ModelData(var1, var2); int var4; - 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.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - 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 + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - return var5; // L: 126 + return var5; } - @ObfuscatedName("m") + @ObfuscatedName("lg") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "383487932" + descriptor = "(I)Z", + garbageValue = "-1879039073" ) - public static boolean method2778(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field265[var0] : false; // L: 244 245 + public static boolean method2779() { + return Client.staffModLevel >= 2; } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 804ffd9c86..277477d567 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,147 +5,265 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("kq") @Implements("Language") -public class Language implements Enumerated -{ - @ObfuscatedName("f") +public class Language implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkq;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkq;" ) @Export("Language_DE") static final Language Language_DE; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkq;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkq;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkq;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkq;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkq;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lkn;" + descriptor = "[Lkq;" ) @Export("Language_valuesOrdered") static final Language[] Language_valuesOrdered; - @ObfuscatedName("r") - final String field3679; - @ObfuscatedName("h") + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("gf") + @ObfuscatedGetter( + intValue = 1092752765 + ) + static int field3694; + @ObfuscatedName("f") + final String field3687; + @ObfuscatedName("o") @Export("language") final String language; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -569331417 + intValue = 789493505 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3701, 0, "GB"); // L: 10 - Language_DE = new Language("DE", "de", "German", ModeWhere.field3701, 1, "DE"); // L: 11 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3701, 2, "FR"); // L: 12 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3701, 3, "BR"); // L: 13 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3692, 4, "NL"); // L: 14 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3692, 5, "ES"); // L: 15 - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3701, 6, "MX"); // L: 16 - Language[] var0 = new Language[]{Language_EN, Language_ES, Language_ES_MX, Language_PT, Language_FR, Language_DE, Language_NL}; // L: 25 - Language_valuesOrdered = new Language[var0.length]; // L: 28 - Language[] var2 = var0; // L: 30 + Language_EN = new Language("EN", "en", "English", ModeWhere.field3715, 0, "GB"); + Language_DE = new Language("DE", "de", "German", ModeWhere.field3715, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3715, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3715, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3700, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3700, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3715, 6, "MX"); + Language[] var0 = method5217(); + Language_valuesOrdered = new Language[var0.length]; + Language[] var1 = var0; - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 - Language var4 = var2[var3]; // L: 32 - if (Language_valuesOrdered[var4.id] != null) { // L: 34 - throw new IllegalStateException(); // L: 35 + for (int var2 = 0; var2 < var1.length; ++var2) { + Language var3 = var1[var2]; + if (Language_valuesOrdered[var3.id] != null) { + throw new IllegalStateException(); } - Language_valuesOrdered[var4.id] = var4; // L: 37 + Language_valuesOrdered[var3.id] = var3; } - } // L: 41 + } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkg;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkj;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3679 = var1; // L: 44 - this.language = var2; // L: 45 - this.id = var5; // L: 46 - if (var6 != null) { // L: 47 - new Locale(var2.substring(0, 2), var6); // L: 48 + this.field3687 = var1; + this.language = var2; + this.id = var5; + if (var6 != null) { + new Locale(var2.substring(0, 2), var6); } else { - new Locale(var2.substring(0, 2)); // L: 51 + new Locale(var2.substring(0, 2)); } - } // L: 53 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 60 + return this.id; } - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "536714658" + garbageValue = "722138687" ) @Export("getLanguage") String getLanguage() { - return this.language; // L: 56 + return this.language; } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69 + return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lkn;", - garbageValue = "727376217" + descriptor = "([Ljava/lang/String;[SIIB)V", + garbageValue = "90" ) - public static Language method5269(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); + } + } - @ObfuscatedName("ib") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "42" + descriptor = "(III)V", + garbageValue = "238505543" ) - static void method5270() { - GrandExchangeEvent.method5222(UserComparator3.menuWidth / 2 + StructComposition.menuX, class143.menuY); // L: 7906 - } // L: 7907 + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; + int[] var3 = new int[4]; + var2[0] = var0; + var3[0] = var1; + int var4 = 1; + + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; + } + } + + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + Varcs.sortWorlds(class15.World_worlds, 0, class15.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1104134531" + ) + static final void method5236(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { + for (int var4 = 0; var4 < 8; ++var4) { + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } + } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[Lkq;", + garbageValue = "-2080569263" + ) + static Language[] method5217() { + return new Language[]{Language_PT, Language_FR, Language_DE, Language_ES, Language_EN, Language_ES_MX, Language_NL}; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[Lce;", + garbageValue = "543100719" + ) + static AttackOption[] method5233() { + return new AttackOption[]{AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1157, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1156, AttackOption.AttackOption_hidden}; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lkq;", + garbageValue = "-774900747" + ) + public static Language method5215(int var0) { + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; + } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 6e6e7f92f3..88138677c0 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,30 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("mf") @Implements("Link") public class Link { - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmf;" ) @Export("previous") public Link previous; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmf;" ) @Export("next") public Link next; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("remove") public void remove() { - if (this.next != null) { // L: 8 - this.next.previous = this.previous; // L: 9 - this.previous.next = this.next; // L: 10 - this.previous = null; // L: 11 - this.next = null; // L: 12 + if (this.next != null) { + this.next.previous = this.previous; + this.previous.next = this.next; + this.previous = null; + this.next = null; } - } // L: 13 + } } diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 957c1fe904..6fe51d7063 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,73 +3,73 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("ko") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmf;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmf;" ) @Export("current") Link current; public LinkDeque() { - this.sentinel = new Link(); // L: 6 - this.sentinel.previous = this.sentinel; // L: 10 - this.sentinel.next = this.sentinel; // L: 11 - } // L: 12 + this.sentinel = new Link(); + this.sentinel.previous = this.sentinel; + this.sentinel.next = this.sentinel; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lmr;)V" + descriptor = "(Lmf;)V" ) @Export("addFirst") public void addFirst(Link var1) { - if (var1.next != null) { // L: 15 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel.next; // L: 16 - var1.previous = this.sentinel; // L: 17 - var1.next.previous = var1; // L: 18 - var1.previous.next = var1; // L: 19 - } // L: 20 + var1.next = this.sentinel.next; + var1.previous = this.sentinel; + var1.next.previous = var1; + var1.previous.next = var1; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lmr;" + descriptor = "()Lmf;" ) @Export("last") public Link last() { - Link var1 = this.sentinel.previous; // L: 23 - if (var1 == this.sentinel) { // L: 24 - this.current = null; // L: 25 - return null; // L: 26 + Link var1 = this.sentinel.previous; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.previous; // L: 28 - return var1; // L: 29 + this.current = var1.previous; + return var1; } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Lmr;" + descriptor = "()Lmf;" ) @Export("previous") public Link previous() { - Link var1 = this.current; // L: 33 - if (var1 == this.sentinel) { // L: 34 - this.current = null; // L: 35 - return null; // L: 36 + Link var1 = this.current; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.previous; // L: 38 - return var1; // L: 39 + this.current = var1.previous; + return var1; } } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index f1e245a616..faab98e92b 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,178 +5,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("by") @Implements("Login") public class Login { - @ObfuscatedName("e") - @Export("localPlayerName") - public static String localPlayerName; + @ObfuscatedName("t") + @Export("clearLoginScreen") + static boolean clearLoginScreen; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1349734719 + intValue = -193523491 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "[Lof;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1462370461 - ) - public static int field1033; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lbi;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lof;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("k") + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Lom;" ) - static IndexedSprite field1005; - @ObfuscatedName("s") + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -49273179 + intValue = -1620372095 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1645328707 + intValue = -487781845 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1442132519 + intValue = 511787825 ) - static int field1011; - @ObfuscatedName("ap") + static int field804; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1846708661 + intValue = 758198765 ) - static int field1012; - @ObfuscatedName("ae") + static int field809; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1473378055 + intValue = -759003325 ) @Export("loginIndex") static int loginIndex; @ObfuscatedName("ao") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("an") + @ObfuscatedName("az") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("Login_response2") static String Login_response2; @ObfuscatedName("aj") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("Login_username") static String Login_username; - @ObfuscatedName("as") + @ObfuscatedName("af") @Export("Login_password") static String Login_password; - @ObfuscatedName("ax") - static boolean field1006; - @ObfuscatedName("ar") - static boolean field1021; - @ObfuscatedName("bx") - static boolean field1022; - @ObfuscatedName("bi") + @ObfuscatedName("ad") + static boolean field829; + @ObfuscatedName("ac") + static boolean field819; + @ObfuscatedName("bk") + static boolean field820; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1921798817 + intValue = 1864245365 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bg") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1331628685 + intValue = -912713995 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 1559013153 + intValue = -24412783 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bj") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1727886511 + intValue = 649815561 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bn") + @ObfuscatedName("bs") @ObfuscatedGetter( - longValue = -504065340158642831L + longValue = 2466470242955211503L ) - static long field1019; - @ObfuscatedName("bu") + static long field828; + @ObfuscatedName("bx") @ObfuscatedGetter( - longValue = -731103145365599943L + longValue = -8165033679019885075L ) - static long field1031; - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - static Widget field1034; + static long field812; static { - xPadding = 0; // L: 38 - loginBoxX = xPadding + 202; // L: 55 - Login_loadingPercent = 10; // L: 57 - Login_loadingText = ""; // L: 58 - field1011 = -1; // L: 65 - field1012 = 1; // L: 68 - loginIndex = 0; // L: 72 - Login_response0 = ""; // L: 73 - Login_response1 = ""; // L: 74 - Login_response2 = ""; // L: 75 - Login_response3 = ""; // L: 76 - Login_username = ""; // L: 77 - Login_password = ""; // L: 78 - field1006 = false; // L: 85 - field1021 = false; // L: 86 - field1022 = true; // L: 89 - currentLoginField = 0; // L: 90 - worldSelectOpen = false; // L: 94 - hoveredWorldIndex = -1; // L: 102 - worldSelectPage = 0; // L: 103 - worldSelectPagesCount = 0; // L: 104 - new DecimalFormat("##0.00"); // L: 107 - new class125(); - field1019 = -1L; // L: 115 - field1031 = -1L; // L: 116 + xPadding = 0; + loginBoxX = xPadding + 202; + Login_loadingPercent = 10; + Login_loadingText = ""; + field804 = -1; + field809 = 1; + loginIndex = 0; + Login_response0 = ""; + Login_response1 = ""; + Login_response2 = ""; + Login_response3 = ""; + Login_username = ""; + Login_password = ""; + field829 = false; + field819 = false; + field820 = true; + currentLoginField = 0; + worldSelectOpen = false; + hoveredWorldIndex = -1; + worldSelectPage = 0; + worldSelectPagesCount = 0; + new DecimalFormat("##0.00"); + new class98(); + field828 = -1L; + field812 = -1L; } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-461506193" + descriptor = "(III)I", + garbageValue = "1564253317" ) - public static boolean method2058(int var0) { - return var0 >= WorldMapDecorationType.field3160.id && var0 <= WorldMapDecorationType.field3170.id || var0 == WorldMapDecorationType.field3150.id; // L: 42 + public static int method1658(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; + } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1194021090" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 2f66af0152..391421a210 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,93 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hb") @Implements("LoginPacket") -public class LoginPacket implements class224 { - @ObfuscatedName("te") +public class LoginPacket implements class225 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lhb;" ) - public static class286 field2800; - @ObfuscatedName("f") + public static final LoginPacket field2791; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhb;" ) - public static final LoginPacket field2806; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - static final LoginPacket field2801; + static final LoginPacket field2796; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhb;" ) - public static final LoginPacket field2802; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - public static final LoginPacket field2803; + public static final LoginPacket field2789; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhb;" ) - public static final LoginPacket field2804; - @ObfuscatedName("o") + public static final LoginPacket field2792; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhb;" ) - static final LoginPacket field2809; - @ObfuscatedName("r") + public static final LoginPacket field2793; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lhl;" + descriptor = "Lhb;" + ) + static final LoginPacket field2790; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "[Lhb;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("mr") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 159099217 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1348026381 + intValue = -2039924665 ) @Export("id") public final int id; static { - field2806 = new LoginPacket(14, 0); // L: 5 - field2801 = new LoginPacket(15, 4); // L: 6 - field2802 = new LoginPacket(16, -2); // L: 7 - field2803 = new LoginPacket(18, -2); // L: 8 - field2804 = new LoginPacket(19, -2); // L: 9 - field2809 = new LoginPacket(27, 0); // L: 10 - LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 - LoginPacket[] var0 = class23.method318(); + field2791 = new LoginPacket(14, 0); + field2796 = new LoginPacket(15, 4); + field2789 = new LoginPacket(16, -2); + field2792 = new LoginPacket(18, -2); + field2793 = new LoginPacket(19, -2); + field2790 = new LoginPacket(27, 0); + LoginPacket_indexedValues = new LoginPacket[32]; + LoginPacket[] var0 = WorldMap.method6366(); - for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 - LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17 + for (int var1 = 0; var1 < var0.length; ++var1) { + LoginPacket_indexedValues[var0[var1].id] = var0[var1]; } - } // L: 19 + } @ObfuscatedSignature( descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { - this.id = var1; // L: 26 - } // L: 27 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(S)[Ljo;", - garbageValue = "3316" - ) - public static class269[] method4510() { - return new class269[]{class269.field3532, class269.field3533, class269.field3535, class269.field3534}; // L: 15 + this.id = var1; } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 04b84d97f0..3ddc595d82 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -3,889 +3,471 @@ 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("ck") +@ObfuscatedName("bi") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "[Lof;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("m") - int[] field1300; + @ObfuscatedName("w") + int[] field1091; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -58252943 + ) + int field1092; + @ObfuscatedName("o") + int[] field1101; + @ObfuscatedName("x") + int[] field1094; @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1518059987 - ) - int field1304; + int[] field1095; + @ObfuscatedName("p") + int[] field1102; @ObfuscatedName("h") - int[] field1294; - @ObfuscatedName("d") - int[] field1295; - @ObfuscatedName("z") - int[] field1296; - @ObfuscatedName("b") - int[] field1297; - @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1626037151 + intValue = -373755775 ) - int field1298; + int field1097; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -970523767 + intValue = -1720993539 ) - int field1299; - @ObfuscatedName("g") - int[] field1305; - @ObfuscatedName("t") - int[] field1301; - @ObfuscatedName("x") - int[] field1302; - @ObfuscatedName("u") - int[] field1303; + int field1098; + @ObfuscatedName("a") + int[] field1099; @ObfuscatedName("q") + int[] field1100; + @ObfuscatedName("u") + int[] field1104; + @ObfuscatedName("e") + int[] field1086; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1812898479 + intValue = -535955847 ) - int field1290; - @ObfuscatedName("s") + int field1093; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1570701257 + intValue = 1553047481 ) - int field1309; - @ObfuscatedName("p") + int field1087; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1310128613 + intValue = 485898743 ) - int field1306; + int field1105; @ObfuscatedSignature( descriptor = "([Lof;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1300 = new int[256]; // L: 13 - this.field1304 = 0; // L: 14 - this.field1298 = 0; // L: 19 - this.field1299 = 0; // L: 20 - this.field1290 = 0; // L: 25 - this.field1309 = 0; // L: 26 - this.field1306 = 0; // L: 27 - this.sprites = var1; // L: 30 - this.initColors(); // L: 31 - } // L: 32 + this.field1091 = new int[256]; + this.field1092 = 0; + this.field1097 = 0; + this.field1098 = 0; + this.field1093 = 0; + this.field1087 = 0; + this.field1105 = 0; + this.sprites = var1; + this.initColors(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "73" + descriptor = "(I)V", + garbageValue = "1509815811" ) @Export("initColors") void initColors() { - this.field1295 = new int[256]; // L: 35 + this.field1094 = new int[256]; int var1; - for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1295[var1] = var1 * 262144; - } - - for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1295[var1 + 64] = var1 * 1024 + 16711680; - } - - for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1295[var1 + 128] = var1 * 4 + 16776960; - } - - for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1295[var1 + 192] = 16777215; - } - - this.field1296 = new int[256]; // L: 40 - - for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1296[var1] = var1 * 1024; - } - - for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1296[var1 + 64] = var1 * 4 + 65280; - } - - for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1296[var1 + 128] = var1 * 262144 + 65535; - } - - for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1296[var1 + 192] = 16777215; - } - - this.field1297 = new int[256]; // L: 45 - for (var1 = 0; var1 < 64; ++var1) { - this.field1297[var1] = var1 * 4; + this.field1094[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1297[var1 + 64] = var1 * 262144 + 255; + this.field1094[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1297[var1 + 128] = var1 * 1024 + 16711935; + this.field1094[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1297[var1 + 192] = 16777215; + this.field1094[var1 + 192] = 16777215; } - this.field1294 = new int[256]; // L: 50 - this.field1290 = 0; // L: 51 - this.field1302 = new int[32768]; // L: 52 - this.field1303 = new int[32768]; // L: 53 - this.method2294((IndexedSprite)null); // L: 54 - this.field1305 = new int[32768]; // L: 55 - this.field1301 = new int[32768]; // L: 56 - } // L: 57 + this.field1095 = new int[256]; - @ObfuscatedName("e") + for (var1 = 0; var1 < 64; ++var1) { + this.field1095[var1] = var1 * 1024; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1095[var1 + 64] = var1 * 4 + 65280; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1095[var1 + 128] = var1 * 262144 + 65535; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1095[var1 + 192] = 16777215; + } + + this.field1102 = new int[256]; + + for (var1 = 0; var1 < 64; ++var1) { + this.field1102[var1] = var1 * 4; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1102[var1 + 64] = var1 * 262144 + 255; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1102[var1 + 128] = var1 * 1024 + 16711935; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1102[var1 + 192] = 16777215; + } + + this.field1101 = new int[256]; + this.field1093 = 0; + this.field1104 = new int[32768]; + this.field1086 = new int[32768]; + this.method1904((IndexedSprite)null); + this.field1099 = new int[32768]; + this.field1100 = new int[32768]; + } + + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1890255909" + garbageValue = "-729695541" ) - void method2296() { - this.field1295 = null; // L: 60 - this.field1296 = null; // L: 61 - this.field1297 = null; // L: 62 - this.field1294 = null; // L: 63 - this.field1302 = null; // L: 64 - this.field1303 = null; // L: 65 - this.field1305 = null; // L: 66 - this.field1301 = null; // L: 67 - this.field1290 = 0; // L: 68 - this.field1309 = 0; // L: 69 - } // L: 70 + void method1917() { + this.field1094 = null; + this.field1095 = null; + this.field1102 = null; + this.field1101 = null; + this.field1104 = null; + this.field1086 = null; + this.field1099 = null; + this.field1100 = null; + this.field1093 = 0; + this.field1087 = 0; + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "657526565" + garbageValue = "-981209872" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1305 == null) { // L: 73 - this.initColors(); // L: 74 + if (this.field1099 == null) { + this.initColors(); } - if (this.field1306 == 0) { // L: 76 - this.field1306 = var2; // L: 77 + if (this.field1105 == 0) { + this.field1105 = var2; } - int var3 = var2 - this.field1306; // L: 79 - if (var3 >= 256) { // L: 80 + int var3 = var2 - this.field1105; + if (var3 >= 256) { var3 = 0; } - this.field1306 = var2; // L: 81 - if (var3 > 0) { // L: 82 - this.method2293(var3); // L: 83 + this.field1105 = var2; + if (var3 > 0) { + this.method1899(var3); } - this.method2290(var1); // L: 85 - } // L: 86 + this.method1901(var1); + } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-960429455" + garbageValue = "1945363897" ) - final void method2293(int var1) { - this.field1290 += var1 * 128; // L: 89 + final void method1899(int var1) { + this.field1093 += var1 * 128; int var2; - if (this.field1290 > this.field1302.length) { // L: 90 - this.field1290 -= this.field1302.length; // L: 91 - var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method2294(this.sprites[var2]); // L: 93 + if (this.field1093 > this.field1104.length) { + this.field1093 -= this.field1104.length; + var2 = (int)(Math.random() * 12.0D); + this.method1904(this.sprites[var2]); } - var2 = 0; // L: 95 - int var3 = var1 * 128; // L: 96 - int var4 = (256 - var1) * 128; // L: 97 + var2 = 0; + int var3 = var1 * 128; + int var4 = (256 - var1) * 128; int var6; - for (int var5 = 0; var5 < var4; ++var5) { // L: 98 - var6 = this.field1305[var2 + var3] - this.field1302[var2 + this.field1290 & this.field1302.length - 1] * var1 / 6; // L: 99 - if (var6 < 0) { // L: 100 + for (int var5 = 0; var5 < var4; ++var5) { + var6 = this.field1099[var3 + var2] - this.field1104[var2 + this.field1093 & this.field1104.length - 1] * var1 / 6; + if (var6 < 0) { var6 = 0; } - this.field1305[var2++] = var6; // L: 101 + this.field1099[var2++] = var6; } - byte var15 = 10; // L: 103 - var6 = 128 - var15; // L: 104 + byte var15 = 10; + var6 = 128 - var15; int var7; int var10; - for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 105 - int var8 = var7 * 128; // L: 106 + for (var7 = 256 - var1; var7 < 256; ++var7) { + int var8 = var7 * 128; - 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.field1305[var9 + var8] = 255; + for (int var9 = 0; var9 < 128; ++var9) { + var10 = (int)(Math.random() * 100.0D); + if (var10 < 50 && var9 > var15 && var9 < var6) { + this.field1099[var9 + var8] = 255; } else { - this.field1305[var8 + var9] = 0; // L: 110 + this.field1099[var9 + var8] = 0; } } } - if (this.field1298 > 0) { // L: 113 - this.field1298 -= var1 * 4; + if (this.field1097 > 0) { + this.field1097 -= var1 * 4; } - if (this.field1299 > 0) { // L: 114 - this.field1299 -= var1 * 4; + if (this.field1098 > 0) { + this.field1098 -= var1 * 4; } - if (this.field1298 == 0 && this.field1299 == 0) { // L: 115 - var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 - if (var7 == 0) { // L: 117 - this.field1298 = 1024; + if (this.field1097 == 0 && this.field1098 == 0) { + var7 = (int)(Math.random() * (double)(2000 / var1)); + if (var7 == 0) { + this.field1097 = 1024; } - if (var7 == 1) { // L: 118 - this.field1299 = 1024; + if (var7 == 1) { + this.field1098 = 1024; } } - for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 - this.field1300[var7] = this.field1300[var7 + var1]; + for (var7 = 0; var7 < 256 - var1; ++var7) { + this.field1091[var7] = this.field1091[var7 + var1]; } - for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 - this.field1300[var7] = (int)(Math.sin((double)this.field1304 / 14.0D) * 16.0D + Math.sin((double)this.field1304 / 15.0D) * 14.0D + Math.sin((double)this.field1304 / 16.0D) * 12.0D); // L: 122 - ++this.field1304; // L: 123 + for (var7 = 256 - var1; var7 < 256; ++var7) { + this.field1091[var7] = (int)(Math.sin((double)this.field1092 / 14.0D) * 16.0D + Math.sin((double)this.field1092 / 15.0D) * 14.0D + Math.sin((double)this.field1092 / 16.0D) * 12.0D); + ++this.field1092; } - this.field1309 += var1; // L: 125 - var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 - if (var7 > 0) { // L: 127 - short var16 = 128; // L: 128 - byte var17 = 2; // L: 129 - var10 = 128 - var17 - var17; // L: 130 + this.field1087 += var1; + var7 = ((Client.cycle & 1) + var1) / 2; + if (var7 > 0) { + short var16 = 128; + byte var17 = 2; + var10 = 128 - var17 - var17; int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1309 * 100; ++var11) { // L: 131 - var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 - var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1305[var12 + (var13 << 7)] = 192; // L: 134 + for (var11 = 0; var11 < this.field1087 * 100; ++var11) { + var12 = (int)(Math.random() * (double)var10) + var17; + var13 = (int)(Math.random() * (double)var16) + var16; + this.field1099[var12 + (var13 << 7)] = 192; } - this.field1309 = 0; // L: 136 + this.field1087 = 0; int var14; - for (var11 = 0; var11 < 256; ++var11) { // L: 137 - var12 = 0; // L: 138 - var13 = var11 * 128; // L: 139 + for (var11 = 0; var11 < 256; ++var11) { + var12 = 0; + var13 = var11 * 128; - for (var14 = -var7; var14 < 128; ++var14) { // L: 140 - if (var14 + var7 < 128) { // L: 141 - var12 += this.field1305[var7 + var14 + var13]; + for (var14 = -var7; var14 < 128; ++var14) { + if (var14 + var7 < 128) { + var12 += this.field1099[var14 + var13 + var7]; } - if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1305[var14 + var13 - (var7 + 1)]; + if (var14 - (var7 + 1) >= 0) { + var12 -= this.field1099[var13 + var14 - (var7 + 1)]; } - if (var14 >= 0) { // L: 143 - this.field1301[var13 + var14] = var12 / (var7 * 2 + 1); + if (var14 >= 0) { + this.field1100[var13 + var14] = var12 / (var7 * 2 + 1); } } } - for (var11 = 0; var11 < 128; ++var11) { // L: 146 - var12 = 0; // L: 147 + for (var11 = 0; var11 < 128; ++var11) { + var12 = 0; - for (var13 = -var7; var13 < 256; ++var13) { // L: 148 - var14 = var13 * 128; // L: 149 - if (var7 + var13 < 256) { // L: 150 - var12 += this.field1301[var11 + var14 + var7 * 128]; + for (var13 = -var7; var13 < 256; ++var13) { + var14 = var13 * 128; + if (var7 + var13 < 256) { + var12 += this.field1100[var11 + var14 + var7 * 128]; } - if (var13 - (var7 + 1) >= 0) { // L: 151 - var12 -= this.field1301[var11 + var14 - (var7 + 1) * 128]; + if (var13 - (var7 + 1) >= 0) { + var12 -= this.field1100[var11 + var14 - (var7 + 1) * 128]; } - if (var13 >= 0) { // L: 152 - this.field1305[var14 + var11] = var12 / (var7 * 2 + 1); + if (var13 >= 0) { + this.field1099[var11 + var14] = var12 / (var7 * 2 + 1); } } } } - } // L: 156 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "-1318648994" + garbageValue = "-2051749409" ) - final int method2297(int var1, int var2, int var3) { - int var4 = 256 - var3; // L: 159 - return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160 + final int method1900(int var1, int var2, int var3) { + int var4 = 256 - var3; + return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) >> 8; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "965888559" + ) + final void method1901(int var1) { + int var2 = this.field1101.length; + if (this.field1097 > 0) { + this.method1902(this.field1097, this.field1095); + } else if (this.field1098 > 0) { + this.method1902(this.field1098, this.field1102); + } else { + for (int var3 = 0; var3 < var2; ++var3) { + this.field1101[var3] = this.field1094[var3]; + } + } + + this.method1921(var1); + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I[IS)V", + garbageValue = "9599" + ) + final void method1902(int var1, int[] var2) { + int var3 = this.field1101.length; + + for (int var4 = 0; var4 < var3; ++var4) { + if (var1 > 768) { + this.field1101[var4] = this.method1900(this.field1094[var4], var2[var4], 1024 - var1); + } else if (var1 > 256) { + this.field1101[var4] = var2[var4]; + } else { + this.field1101[var4] = this.method1900(var2[var4], this.field1094[var4], 256 - var1); + } + } + + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1615497602" + ) + final void method1921(int var1) { + int var2 = 0; + + for (int var3 = 1; var3 < 255; ++var3) { + int var4 = (256 - var3) * this.field1091[var3] / 256; + int var5 = var4 + var1; + int var6 = 0; + int var7 = 128; + if (var5 < 0) { + var6 = -var5; + var5 = 0; + } + + if (var5 + 128 >= class263.rasterProvider.width) { + var7 = class263.rasterProvider.width - var5; + } + + int var8 = var5 + (var3 + 8) * class263.rasterProvider.width; + var2 += var6; + + for (int var9 = var6; var9 < var7; ++var9) { + int var10 = this.field1099[var2++]; + int var11 = var8 % Rasterizer2D.Rasterizer2D_width; + if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { + int var12 = var10; + int var13 = 256 - var10; + var10 = this.field1101[var10]; + int var14 = class263.rasterProvider.pixels[var8]; + class263.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; + } else { + ++var8; + } + } + + var2 += 128 - var7; + } + } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-739412709" + descriptor = "(Lof;I)V", + garbageValue = "-2013414147" ) - final void method2290(int var1) { - int var2 = this.field1294.length; // L: 164 - if (this.field1298 > 0) { // L: 165 - this.method2291(this.field1298, this.field1296); // L: 166 - } else if (this.field1299 > 0) { // L: 168 - this.method2291(this.field1299, this.field1297); // L: 169 - } else { - for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1294[var3] = this.field1295[var3]; - } - } - - this.method2292(var1); // L: 174 - } // L: 175 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I[II)V", - garbageValue = "-1814814478" - ) - final void method2291(int var1, int[] var2) { - int var3 = this.field1294.length; // L: 178 - - for (int var4 = 0; var4 < var3; ++var4) { // L: 179 - if (var1 > 768) { // L: 180 - this.field1294[var4] = this.method2297(this.field1295[var4], var2[var4], 1024 - var1); - } else if (var1 > 256) { - this.field1294[var4] = var2[var4]; // L: 181 - } else { - this.field1294[var4] = this.method2297(var2[var4], this.field1295[var4], 256 - var1); // L: 182 - } - } - - } // L: 184 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "16" - ) - final void method2292(int var1) { - int var2 = 0; // L: 187 - - for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1300[var3] / 256; // L: 189 - int var5 = var4 + var1; // L: 190 - int var6 = 0; // L: 191 - int var7 = 128; // L: 192 - if (var5 < 0) { // L: 193 - var6 = -var5; // L: 194 - var5 = 0; // L: 195 - } - - if (var5 + 128 >= AbstractWorldMapData.rasterProvider.width) { // L: 197 - var7 = AbstractWorldMapData.rasterProvider.width - var5; // L: 198 - } - - int var8 = var5 + (var3 + 8) * AbstractWorldMapData.rasterProvider.width; // L: 200 - var2 += var6; // L: 201 - - for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1305[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.field1294[var10]; // L: 208 - int var14 = AbstractWorldMapData.rasterProvider.pixels[var8]; // L: 209 - AbstractWorldMapData.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; // L: 210 - } else { - ++var8; // L: 212 - } - } - - var2 += 128 - var7; // L: 214 - } - - } // L: 216 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lof;B)V", - garbageValue = "-36" - ) - final void method2294(IndexedSprite var1) { + final void method1904(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1302.length; ++var2) { // L: 219 - this.field1302[var2] = 0; + for (var2 = 0; var2 < this.field1104.length; ++var2) { + this.field1104[var2] = 0; } int var3; - for (var2 = 0; var2 < 5000; ++var2) { // L: 220 - var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1302[var3] = (int)(Math.random() * 256.0D); // L: 222 + for (var2 = 0; var2 < 5000; ++var2) { + var3 = (int)(Math.random() * 128.0D * 256.0D); + this.field1104[var3] = (int)(Math.random() * 256.0D); } int var4; int var5; - 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.field1303[var5] = (this.field1302[var5 + 1] + this.field1302[var5 + 128] + this.field1302[var5 - 128] + this.field1302[var5 - 1]) / 4; // L: 228 + for (var2 = 0; var2 < 20; ++var2) { + for (var3 = 1; var3 < 255; ++var3) { + for (var4 = 1; var4 < 127; ++var4) { + var5 = var4 + (var3 << 7); + this.field1086[var5] = (this.field1104[var5 - 128] + this.field1104[var5 + 1] + this.field1104[var5 + 128] + this.field1104[var5 - 1]) / 4; } } - int[] var8 = this.field1302; // L: 231 - this.field1302 = this.field1303; // L: 232 - this.field1303 = var8; // L: 233 + int[] var8 = this.field1104; + this.field1104 = this.field1086; + this.field1086 = var8; } - if (var1 != null) { // L: 235 - var2 = 0; // L: 236 + if (var1 != null) { + var2 = 0; - for (var3 = 0; var3 < var1.subHeight; ++var3) { // L: 237 - for (var4 = 0; var4 < var1.subWidth; ++var4) { // L: 238 - if (var1.pixels[var2++] != 0) { // L: 239 - var5 = var4 + var1.xOffset + 16; // L: 240 - int var6 = var3 + var1.yOffset + 16; // L: 241 - int var7 = var5 + (var6 << 7); // L: 242 - this.field1302[var7] = 0; // L: 243 + for (var3 = 0; var3 < var1.subHeight; ++var3) { + for (var4 = 0; var4 < var1.subWidth; ++var4) { + if (var1.pixels[var2++] != 0) { + var5 = var4 + var1.xOffset + 16; + int var6 = var3 + var1.yOffset + 16; + int var7 = var5 + (var6 << 7); + this.field1104[var7] = 0; } } } } - } // L: 248 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljp;B)V", - garbageValue = "4" - ) - public static void method2312(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 - HitSplatDefinition.field1741 = var1; // L: 47 - HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; // L: 48 - } // L: 49 - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1215148892" - ) - static int method2314(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2086 - if (DevicePcmPlayerProvider.friendSystem.field928 == 0) { // L: 2087 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -2; - } else if (DevicePcmPlayerProvider.friendSystem.field928 == 1) { // L: 2088 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.friendsList.getSize(); // L: 2089 - } - - return 1; // L: 2090 - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2093 - if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.friendsList.getSize()) { // L: 2094 - Friend var8 = (Friend)DevicePcmPlayerProvider.friendSystem.friendsList.get(var3); // L: 2095 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2096 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2097 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2100 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2101 - } - - return 1; // L: 2103 - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2106 - if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.friendsList.getSize()) { // L: 2107 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.friendSystem.friendsList.get(var3)).world; // L: 2108 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2110 - } - - return 1; // L: 2111 - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2114 - if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.friendsList.getSize()) { // L: 2115 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.friendSystem.friendsList.get(var3)).rank; // L: 2116 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2118 - } - - return 1; // L: 2119 - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2122 - int var6 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2123 - class14.method229(var5, var6); // L: 2124 - return 1; // L: 2125 - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2128 - DevicePcmPlayerProvider.friendSystem.addFriend(var5); // L: 2129 - return 1; // L: 2130 - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2133 - DevicePcmPlayerProvider.friendSystem.removeFriend(var5); // L: 2134 - return 1; // L: 2135 - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2138 - DevicePcmPlayerProvider.friendSystem.addIgnore(var5); // L: 2139 - return 1; // L: 2140 - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2143 - DevicePcmPlayerProvider.friendSystem.removeIgnore(var5); // L: 2144 - return 1; // L: 2145 - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2148 - var5 = ScriptFrame.method1232(var5); // L: 2149 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.isFriended(new Username(var5, loginType), false) ? 1 : 0; // L: 2150 - return 1; // L: 2151 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (class289.friendsChat != null) { // L: 2154 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class289.friendsChat.name; // L: 2155 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2157 - } - - return 1; // L: 2158 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (class289.friendsChat != null) { // L: 2161 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class289.friendsChat.getSize(); // L: 2162 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2164 - } - - return 1; // L: 2165 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2168 - if (class289.friendsChat != null && var3 < class289.friendsChat.getSize()) { // L: 2169 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class289.friendsChat.get(var3).getUsername().getName(); // L: 2170 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2172 - } - - return 1; // L: 2173 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2176 - if (class289.friendsChat != null && var3 < class289.friendsChat.getSize()) { // L: 2177 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)class289.friendsChat.get(var3)).getWorld(); // L: 2178 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2180 - } - - return 1; // L: 2181 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2184 - if (class289.friendsChat != null && var3 < class289.friendsChat.getSize()) { // L: 2185 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)class289.friendsChat.get(var3)).rank; // L: 2186 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2188 - } - - return 1; // L: 2189 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class289.friendsChat != null ? class289.friendsChat.minKick : 0; // L: 2192 - return 1; // L: 2193 - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2196 - class1.clanKickUser(var5); // L: 2197 - return 1; // L: 2198 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class289.friendsChat != null ? class289.friendsChat.rank * 1745656179 * 1281242043 : 0; // L: 2201 - return 1; // L: 2202 - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2205 - Coord.Clan_joinChat(var5); // L: 2206 - return 1; // L: 2207 - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - WorldMapIcon_0.Clan_leaveChat(); // L: 2210 - return 1; // L: 2211 - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!DevicePcmPlayerProvider.friendSystem.method1804()) { // L: 2214 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.ignoreList.getSize(); // L: 2215 - } - - return 1; // L: 2216 - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2219 - if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.ignoreList.getSize()) { // L: 2220 - Ignored var4 = (Ignored)DevicePcmPlayerProvider.friendSystem.ignoreList.get(var3); // L: 2221 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2222 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2223 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2226 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2227 - } - - return 1; // L: 2229 - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2232 - var5 = ScriptFrame.method1232(var5); // L: 2233 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var5, loginType)) ? 1 : 0; // L: 2234 - return 1; // L: 2235 - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2238 - if (class289.friendsChat != null && var3 < class289.friendsChat.getSize() && class289.friendsChat.get(var3).getUsername().equals(class262.localPlayer.username)) { // L: 2239 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2240 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2242 - } - - return 1; // L: 2243 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (class289.friendsChat != null && class289.friendsChat.owner != null) { // L: 2246 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class289.friendsChat.owner; // L: 2247 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2249 - } - - return 1; // L: 2250 - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2253 - if (class289.friendsChat != null && var3 < class289.friendsChat.getSize() && ((ClanMate)class289.friendsChat.get(var3)).isFriend()) { // L: 2254 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2255 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2257 - } - - return 1; // L: 2258 - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - DevicePcmPlayerProvider.friendSystem.friendsList.removeComparator(); // L: 2269 - return 1; // L: 2270 - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2273 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2274 - return 1; // L: 2275 - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2278 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2279 - return 1; // L: 2280 - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2283 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2284 - return 1; // L: 2285 - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2288 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2289 - return 1; // L: 2290 - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2293 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2294 - return 1; // L: 2295 - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2298 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2299 - return 1; // L: 2300 - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2303 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2304 - return 1; // L: 2305 - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2308 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2309 - return 1; // L: 2310 - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2313 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2314 - return 1; // L: 2315 - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2318 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2319 - return 1; // L: 2320 - } else if (var0 == 3639) { - DevicePcmPlayerProvider.friendSystem.friendsList.sort(); // L: 2323 - return 1; // L: 2324 - } else if (var0 == 3640) { - DevicePcmPlayerProvider.friendSystem.ignoreList.removeComparator(); // L: 2327 - return 1; // L: 2328 - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2331 - DevicePcmPlayerProvider.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2332 - return 1; // L: 2333 - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2336 - DevicePcmPlayerProvider.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2337 - return 1; // L: 2338 - } else if (var0 == 3643) { - DevicePcmPlayerProvider.friendSystem.ignoreList.sort(); // L: 2341 - return 1; // L: 2342 - } else if (var0 == 3644) { - if (class289.friendsChat != null) { // L: 2345 - class289.friendsChat.removeComparator(); // L: 2346 - } - - return 1; // L: 2348 - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2351 - if (class289.friendsChat != null) { // L: 2352 - class289.friendsChat.addComparator(new UserComparator1(var7)); // L: 2353 - } - - return 1; // L: 2355 - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2358 - if (class289.friendsChat != null) { // L: 2359 - class289.friendsChat.addComparator(new UserComparator2(var7)); // L: 2360 - } - - return 1; // L: 2362 - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2365 - if (class289.friendsChat != null) { // L: 2366 - class289.friendsChat.addComparator(new UserComparator3(var7)); // L: 2367 - } - - return 1; // L: 2369 - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2372 - if (class289.friendsChat != null) { // L: 2373 - class289.friendsChat.addComparator(new UserComparator4(var7)); // L: 2374 - } - - return 1; // L: 2376 - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2379 - if (class289.friendsChat != null) { // L: 2380 - class289.friendsChat.addComparator(new UserComparator5(var7)); // L: 2381 - } - - return 1; // L: 2383 - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2386 - if (class289.friendsChat != null) { // L: 2387 - class289.friendsChat.addComparator(new UserComparator6(var7)); // L: 2388 - } - - return 1; // L: 2390 - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2393 - if (class289.friendsChat != null) { // L: 2394 - class289.friendsChat.addComparator(new UserComparator7(var7)); // L: 2395 - } - - return 1; // L: 2397 - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2400 - if (class289.friendsChat != null) { // L: 2401 - class289.friendsChat.addComparator(new UserComparator8(var7)); // L: 2402 - } - - return 1; // L: 2404 - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2407 - if (class289.friendsChat != null) { // L: 2408 - class289.friendsChat.addComparator(new UserComparator9(var7)); // L: 2409 - } - - return 1; // L: 2411 - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2414 - if (class289.friendsChat != null) { // L: 2415 - class289.friendsChat.addComparator(new UserComparator10(var7)); // L: 2416 - } - - return 1; // L: 2418 - } else if (var0 == 3655) { - if (class289.friendsChat != null) { // L: 2421 - class289.friendsChat.sort(); // L: 2422 - } - - return 1; // L: 2424 - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2427 - DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2428 - return 1; // L: 2429 - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2432 - if (class289.friendsChat != null) { // L: 2433 - class289.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2434 - } - - return 1; // L: 2436 - } else { - return 2; // L: 2438 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2261 - if (class289.friendsChat != null && var3 < class289.friendsChat.getSize() && ((ClanMate)class289.friendsChat.get(var3)).isIgnored()) { // L: 2262 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2263 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2265 - } - - return 1; // L: 2266 - } - } - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1312324085" - ) - static int method2285(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3515 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3516 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3517 - int var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3518 - if (!Client.isCameraLocked) { // L: 3519 - Client.camAngleX = var3; // L: 3520 - Client.camAngleY = var4; // L: 3521 - } - - return 1; // L: 3523 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3525 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3526 - return 1; // L: 3527 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3529 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3530 - return 1; // L: 3531 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3533 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3534 - if (var3 < 0) { // L: 3535 - var3 = 0; - } - - Client.camFollowHeight = var3; // L: 3536 - return 1; // L: 3537 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3539 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3540 - return 1; // L: 3541 - } else { - return 2; // L: 3543 - } } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index e89bdac941..674f063f58 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nb") +@ObfuscatedName("nf") @Implements("LoginType") public class LoginType { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) - static final LoginType field4088; + static final LoginType field4114; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) - static final LoginType field4083; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - static final LoginType field4084; + static final LoginType field4115; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) - static final LoginType field4082; + static final LoginType field4116; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + static final LoginType field4117; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + static final LoginType field4118; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + static final LoginType field4120; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + static final LoginType field4119; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnf;" ) - static final LoginType field4086; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - static final LoginType field4087; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - static final LoginType field4081; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lnb;" - ) - public static final LoginType field4089; - @ObfuscatedName("d") + public static final LoginType field4121; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -695543887 + intValue = 29529207 ) - final int field4090; - @ObfuscatedName("z") - final String field4091; + final int field4113; + @ObfuscatedName("r") + final String field4123; static { - oldscape = new LoginType(6, 0, "", ""); // L: 5 - field4088 = new LoginType(1, 1, "", ""); // L: 6 - field4083 = new LoginType(3, 2, "", ""); // L: 7 - field4084 = new LoginType(5, 3, "", ""); // L: 8 - field4082 = new LoginType(8, 4, "", ""); // L: 9 - field4086 = new LoginType(7, 5, "", ""); // L: 10 - field4087 = new LoginType(0, 6, "", ""); // L: 11 - field4081 = new LoginType(2, 7, "", ""); // L: 12 - field4089 = new LoginType(4, -1, "", "", true, new LoginType[]{oldscape, field4088, field4083, field4082, field4084}); // L: 13 + oldscape = new LoginType(7, 0, "", ""); + field4114 = new LoginType(2, 1, "", ""); + field4115 = new LoginType(4, 2, "", ""); + field4116 = new LoginType(8, 3, "", ""); + field4117 = new LoginType(1, 4, "", ""); + field4118 = new LoginType(0, 5, "", ""); + field4120 = new LoginType(5, 6, "", ""); + field4119 = new LoginType(6, 7, "", ""); + field4121 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4114, field4115, field4117, field4116}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4090 = var1; // L: 18 - this.field4091 = var4; // L: 19 - } // L: 20 + this.field4113 = var1; + this.field4123 = var4; + } @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnb;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnf;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4090 = var1; // L: 23 - this.field4091 = var4; // L: 24 - } // L: 25 + this.field4113 = var1; + this.field4123 = var4; + } public String toString() { - return this.field4091; // L: 28 + return this.field4123; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 4274cb77cd..4c90ac0b3a 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -3,747 +3,123 @@ 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("cz") +@ObfuscatedName("bk") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("f") + @ObfuscatedName("x") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1773344917 + intValue = -566541451 ) @Export("param0") int param0; - @ObfuscatedName("e") + @ObfuscatedName("t") + @Export("action") + String action; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2064070335 + intValue = -1361985837 ) @Export("param1") int param1; - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 519860607 + intValue = 693495175 ) @Export("opcode") int opcode; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1059226483 + intValue = 110049687 ) @Export("identifier") int identifier; - @ObfuscatedName("j") - @Export("action") - String action; MenuAction() { - } // L: 11738 + } @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ILnt;S)Let;", - garbageValue = "256" - ) - public static class136 method2027(int var0, Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 24 - boolean var3 = (var2 & 1) != 0; // L: 25 - boolean var4 = (var2 & 2) != 0; // L: 26 - class136 var5 = new class136(var0); // L: 27 - int var6; - int[] var7; - boolean var8; - int var9; - short var10; - if (var3) { // L: 28 - var6 = var1.readUnsignedByte(); // L: 29 - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32 - var8 = var5.field1542 != null && var7.length == var5.field1542.length; // L: 33 - - for (var9 = 0; var9 < 2; ++var9) { // L: 34 - if (var7[var9] != 15) { // L: 35 - var10 = (short)var1.readUnsignedShort(); // L: 36 - if (var8) { // L: 37 - var5.field1542[var7[var9]] = var10; // L: 38 - } - } - } - } - - if (var4) { // L: 43 - var6 = var1.readUnsignedByte(); // L: 44 - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 - var8 = var5.field1541 != null && var7.length == var5.field1541.length; // L: 48 - - for (var9 = 0; var9 < 2; ++var9) { // L: 49 - if (var7[var9] != 15) { // L: 50 - var10 = (short)var1.readUnsignedShort(); // L: 51 - if (var8) { // L: 52 - var5.field1541[var7[var9]] = var10; // L: 53 - } - } - } - } - - return var5; // L: 58 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljf;IIIBZI)V", - garbageValue = "-1474960108" - ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 110 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 111 - if (var8 == null) { // L: 112 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 113 - if (var8 == null) { // L: 114 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 115 - if (var8 != null) { // L: 116 - if (var5) { // L: 117 - var8.removeDual(); // L: 118 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 119 - --NetCache.NetCache_pendingWritesCount; // L: 120 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 121 - } - - } else { - if (!var5) { // L: 125 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 126 - if (var8 != null) { // L: 127 - return; - } - } - - var8 = new NetFileRequest(); // L: 129 - var8.archive = var0; // L: 130 - var8.crc = var3; // L: 131 - var8.padding = var4; // L: 132 - if (var5) { // L: 133 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 134 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 135 - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 138 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 139 - ++NetCache.NetCache_pendingWritesCount; // L: 140 - } - - } - } - } - } // L: 142 - - @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1466042172" + garbageValue = "-2021329416" ) - public static void method2028() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123 - } // L: 124 + public static void method1655() { + KitDefinition.KitDefinition_cached.clear(); + } - @ObfuscatedName("b") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "871195420" + descriptor = "(ILbd;ZI)I", + garbageValue = "834288948" ) - static final String method2026(int var0) { - if (var0 < 100000) { // L: 425 - return "" + var0 + ""; + static int method1656(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; + } else if (var0 != 5631 && var0 != 5633) { + if (var0 == 5632) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 26; + return 1; + } else { + return 2; + } } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 426 427 + class1.Interpreter_stringStackSize -= 2; + return 1; } } - @ObfuscatedName("je") + @ObfuscatedName("ff") @ObfuscatedSignature( - descriptor = "([Liv;IIIIIIII)V", - garbageValue = "1325285933" + descriptor = "(Lio;III)V", + garbageValue = "-1350136695" ) - @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: 10371 - Widget var9 = var0[var8]; // L: 10372 - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class22.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10373 10374 10375 - if (var9.isIf3) { // L: 10376 - if (class35.isComponentHidden(var9)) { // L: 10377 - continue; - } - } else if (var9.type == 0 && var9 != MusicPatchNode.mousedOverWidgetIf1 && class35.isComponentHidden(var9)) { // L: 10380 - continue; + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { + return; } - int var10 = var9.x + var6; // L: 10382 - int var11 = var7 + var9.y; // L: 10383 - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { // L: 10388 - var12 = var2; // L: 10389 - var13 = var3; // L: 10390 - var14 = var4; // L: 10391 - var15 = var5; // L: 10392 - } else { - int var16; - if (var9.type == 9) { // L: 10394 - var16 = var10; // L: 10395 - var17 = var11; // L: 10396 - var18 = var10 + var9.width; // L: 10397 - int var19 = var11 + var9.height; // L: 10398 - if (var18 < var10) { // L: 10399 - var16 = var18; // L: 10401 - var18 = var10; // L: 10402 - } - - if (var19 < var11) { // L: 10404 - var17 = var19; // L: 10406 - var19 = var11; // L: 10407 - } - - ++var18; // L: 10409 - ++var19; // L: 10410 - var12 = var16 > var2 ? var16 : var2; // L: 10411 - var13 = var17 > var3 ? var17 : var3; // L: 10412 - var14 = var18 < var4 ? var18 : var4; // L: 10413 - var15 = var19 < var5 ? var19 : var5; // L: 10414 - } else { - var16 = var10 + var9.width; // L: 10417 - var17 = var11 + var9.height; // L: 10418 - var12 = var10 > var2 ? var10 : var2; // L: 10419 - var13 = var11 > var3 ? var11 : var3; // L: 10420 - var14 = var16 < var4 ? var16 : var4; // L: 10421 - var15 = var17 < var5 ? var17 : var5; // L: 10422 - } - } - - if (var9 == Client.clickedWidget) { // L: 10424 - Client.field731 = true; // L: 10425 - Client.field804 = var10; // L: 10426 - Client.field805 = var11; // L: 10427 - } - - boolean var33 = false; // L: 10429 - if (var9.field3034) { // L: 10430 - switch(Client.field784) { // L: 10431 - case 0: - var33 = true; // L: 10433 - case 1: - default: - break; - case 2: - if (Client.field694 == var9.id >>> 16) { // L: 10441 - var33 = true; // L: 10442 - } - break; - case 3: - if (var9.id == Client.field694) { // L: 10436 - var33 = true; // L: 10437 - } - } - } - - if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10447 - if (var9.isIf3) { // L: 10448 - ScriptEvent var26; - if (var9.noClickThrough) { // L: 10449 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10450 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10451 - if (var26.isMouseInputEvent) { // L: 10452 - var26.remove(); // L: 10453 - var26.widget.containsMouse = false; // L: 10454 - } - } - - if (UserComparator7.widgetDragDuration == 0) { // L: 10457 - Client.clickedWidget = null; // L: 10458 - Client.clickedWidgetParent = null; // L: 10459 - } - - if (!Client.isMenuOpen) { // L: 10461 - Script.addCancelMenuEntry(); // L: 10462 - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10466 10467 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10468 - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10469 - var26.remove(); // L: 10470 - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; // L: 10476 - var18 = MouseHandler.MouseHandler_y; // L: 10477 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10478 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10479 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10480 - } - - boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10482 - if (var9.contentType == 1337) { // L: 10483 - if (!Client.isLoading && !Client.isMenuOpen && var34) { // L: 10484 - class391.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { // L: 10487 - AbstractWorldMapIcon.checkIfMinimapClicked(var9, var10, var11); // L: 10488 - } else { - if (var9.contentType == 1400) { // L: 10491 - class80.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); // L: 10492 - } - - if (!Client.isMenuOpen && var34) { // L: 10494 - if (var9.contentType == 1400) { // L: 10495 - class80.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10496 - } else { - class261.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10499 - } - } - - boolean var21; - int var23; - if (var33) { // L: 10502 - for (int var20 = 0; var20 < var9.field3035.length; ++var20) { // L: 10503 - var21 = false; // L: 10504 - boolean var27 = false; // L: 10505 - if (!var21 && var9.field3035[var20] != null) { // L: 10506 - for (var23 = 0; var23 < var9.field3035[var20].length; ++var23) { // L: 10507 - boolean var24 = false; // L: 10508 - if (var9.field3104 != null) { // L: 10509 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3035[var20][var23]]; // L: 10510 - } - - if (class22.method314(var9.field3035[var20][var23]) || var24) { // L: 10512 - var21 = true; // L: 10513 - if (var9.field3104 != null && var9.field3104[var20] > Client.cycle) { // L: 10514 - break; - } - - byte var32 = var9.field3036[var20][var23]; // L: 10515 - 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: 10516 10517 10518 10519 10520 - var27 = true; // L: 10522 - break; - } - } - } - } - - if (var27) { // L: 10528 - if (var20 < 10) { // L: 10529 - MouseHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 10530 - class20.Widget_runOnTargetLeave(); // L: 10531 - ItemComposition.selectSpell(var9.id, var9.childIndex, ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var9)), var9.itemId); // L: 10532 - Client.selectedSpellActionName = SecureRandomCallable.Widget_getSpellActionName(var9); // L: 10533 - if (Client.selectedSpellActionName == null) { // L: 10534 - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + SecureRandomFuture.colorStartTag(16777215); // L: 10535 - } - - var23 = var9.field3037[var20]; // L: 10537 - if (var9.field3104 == null) { // L: 10538 - var9.field3104 = new int[var9.field3035.length]; - } - - if (var9.field3038 == null) { // L: 10539 - var9.field3038 = new int[var9.field3035.length]; - } - - if (var23 != 0) { // L: 10540 - if (var9.field3104[var20] == 0) { // L: 10541 - var9.field3104[var20] = var23 + Client.cycle + var9.field3038[var20]; - } else { - var9.field3104[var20] = var23 + Client.cycle; // L: 10542 - } - } else { - var9.field3104[var20] = Integer.MAX_VALUE; // L: 10544 - } - } - - if (!var21 && var9.field3104 != null) { // L: 10546 10547 - var9.field3104[var20] = 0; - } - } - } - - if (var9.isIf3) { // L: 10551 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10552 - var34 = true; - } else { - var34 = false; // L: 10553 - } - - boolean var35 = false; // L: 10554 - if ((MouseHandler.MouseHandler_currentButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { // L: 10555 - var35 = true; - } - - var21 = false; // L: 10556 - if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10557 - var21 = true; - } - - if (var21) { // L: 10558 - ItemLayer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { // L: 10559 - class80.worldMap.method6133(var17, var18, var34 & var35, var34 & var21); // L: 10560 - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class5.method73(class22.getWidgetFlags(var9))) { // L: 10562 - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { // L: 10563 - Client.field821 = true; // L: 10564 - Client.field801 = var10; // L: 10565 - Client.field802 = var11; // L: 10566 - } - - if (var9.hasListener) { // L: 10568 - ScriptEvent var22; - if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10569 - var22 = new ScriptEvent(); // L: 10570 - var22.isMouseInputEvent = true; // L: 10571 - var22.widget = var9; // L: 10572 - var22.mouseY = Client.mouseWheelRotation; // L: 10573 - var22.args = var9.onScroll; // L: 10574 - Client.scriptEvents.addFirst(var22); // L: 10575 - } - - if (Client.clickedWidget != null || VerticalAlignment.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10577 - var21 = false; // L: 10578 - var35 = false; // L: 10579 - var34 = false; // L: 10580 - } - - if (!var9.isClicked && var21) { // L: 10582 - var9.isClicked = true; // L: 10583 - if (var9.onClick != null) { // L: 10584 - var22 = new ScriptEvent(); // L: 10585 - var22.isMouseInputEvent = true; // L: 10586 - var22.widget = var9; // L: 10587 - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10588 - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10589 - var22.args = var9.onClick; // L: 10590 - Client.scriptEvents.addFirst(var22); // L: 10591 - } - } - - if (var9.isClicked && var35 && var9.onClickRepeat != null) { // L: 10594 10595 - var22 = new ScriptEvent(); // L: 10596 - var22.isMouseInputEvent = true; // L: 10597 - var22.widget = var9; // L: 10598 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10599 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10600 - var22.args = var9.onClickRepeat; // L: 10601 - Client.scriptEvents.addFirst(var22); // L: 10602 - } - - if (var9.isClicked && !var35) { // L: 10605 - var9.isClicked = false; // L: 10606 - if (var9.onRelease != null) { // L: 10607 - var22 = new ScriptEvent(); // L: 10608 - var22.isMouseInputEvent = true; // L: 10609 - var22.widget = var9; // L: 10610 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10611 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10612 - var22.args = var9.onRelease; // L: 10613 - Client.field860.addFirst(var22); // L: 10614 - } - } - - if (var35 && var9.onHold != null) { // L: 10617 10618 - var22 = new ScriptEvent(); // L: 10619 - var22.isMouseInputEvent = true; // L: 10620 - var22.widget = var9; // L: 10621 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10622 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10623 - var22.args = var9.onHold; // L: 10624 - Client.scriptEvents.addFirst(var22); // L: 10625 - } - - if (!var9.containsMouse && var34) { // L: 10628 - var9.containsMouse = true; // L: 10629 - if (var9.onMouseOver != null) { // L: 10630 - var22 = new ScriptEvent(); // L: 10631 - var22.isMouseInputEvent = true; // L: 10632 - var22.widget = var9; // L: 10633 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10634 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10635 - var22.args = var9.onMouseOver; // L: 10636 - Client.scriptEvents.addFirst(var22); // L: 10637 - } - } - - if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { // L: 10640 10641 - var22 = new ScriptEvent(); // L: 10642 - var22.isMouseInputEvent = true; // L: 10643 - var22.widget = var9; // L: 10644 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10645 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10646 - var22.args = var9.onMouseRepeat; // L: 10647 - Client.scriptEvents.addFirst(var22); // L: 10648 - } - - if (var9.containsMouse && !var34) { // L: 10651 - var9.containsMouse = false; // L: 10652 - if (var9.onMouseLeave != null) { // L: 10653 - var22 = new ScriptEvent(); // L: 10654 - var22.isMouseInputEvent = true; // L: 10655 - var22.widget = var9; // L: 10656 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10657 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10658 - var22.args = var9.onMouseLeave; // L: 10659 - Client.field860.addFirst(var22); // L: 10660 - } - } - - if (var9.onTimer != null) { // L: 10663 - var22 = new ScriptEvent(); // L: 10664 - var22.widget = var9; // L: 10665 - var22.args = var9.onTimer; // L: 10666 - Client.field812.addFirst(var22); // L: 10667 - } - - ScriptEvent var25; - int var36; - int var37; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3089) { // L: 10669 - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3089 <= 32) { // L: 10670 - label809: - for (var37 = var9.field3089; var37 < Client.changedVarpCount; ++var37) { // L: 10677 - var23 = Client.changedVarps[var37 & 31]; // L: 10678 - - for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { // L: 10679 - if (var23 == var9.varTransmitTriggers[var36]) { // L: 10680 - var25 = new ScriptEvent(); // L: 10681 - var25.widget = var9; // L: 10682 - var25.args = var9.onVarTransmit; // L: 10683 - Client.scriptEvents.addFirst(var25); // L: 10684 - break label809; // L: 10685 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10671 - var22.widget = var9; // L: 10672 - var22.args = var9.onVarTransmit; // L: 10673 - Client.scriptEvents.addFirst(var22); // L: 10674 - } - - var9.field3089 = Client.changedVarpCount; // L: 10690 - } - - if (var9.onInvTransmit != null && Client.field711 > var9.field3100) { // L: 10692 - if (var9.invTransmitTriggers != null && Client.field711 - var9.field3100 <= 32) { // L: 10693 - label785: - for (var37 = var9.field3100; var37 < Client.field711; ++var37) { // L: 10700 - var23 = Client.changedItemContainers[var37 & 31]; // L: 10701 - - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { // L: 10702 - if (var23 == var9.invTransmitTriggers[var36]) { // L: 10703 - var25 = new ScriptEvent(); // L: 10704 - var25.widget = var9; // L: 10705 - var25.args = var9.onInvTransmit; // L: 10706 - Client.scriptEvents.addFirst(var25); // L: 10707 - break label785; // L: 10708 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10694 - var22.widget = var9; // L: 10695 - var22.args = var9.onInvTransmit; // L: 10696 - Client.scriptEvents.addFirst(var22); // L: 10697 - } - - var9.field3100 = Client.field711; // L: 10713 - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2971) { // L: 10715 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2971 <= 32) { // L: 10716 - label761: - for (var37 = var9.field2971; var37 < Client.changedSkillsCount; ++var37) { // L: 10723 - var23 = Client.changedSkills[var37 & 31]; // L: 10724 - - for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { // L: 10725 - if (var23 == var9.statTransmitTriggers[var36]) { // L: 10726 - var25 = new ScriptEvent(); // L: 10727 - var25.widget = var9; // L: 10728 - var25.args = var9.onStatTransmit; // L: 10729 - Client.scriptEvents.addFirst(var25); // L: 10730 - break label761; // L: 10731 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10717 - var22.widget = var9; // L: 10718 - var22.args = var9.onStatTransmit; // L: 10719 - Client.scriptEvents.addFirst(var22); // L: 10720 - } - - var9.field2971 = Client.changedSkillsCount; // L: 10736 - } - - if (Client.chatCycle > var9.field3098 && var9.onChatTransmit != null) { // L: 10738 - var22 = new ScriptEvent(); // L: 10739 - var22.widget = var9; // L: 10740 - var22.args = var9.onChatTransmit; // L: 10741 - Client.scriptEvents.addFirst(var22); // L: 10742 - } - - if (Client.field817 > var9.field3098 && var9.onFriendTransmit != null) { // L: 10744 - var22 = new ScriptEvent(); // L: 10745 - var22.widget = var9; // L: 10746 - var22.args = var9.onFriendTransmit; // L: 10747 - Client.scriptEvents.addFirst(var22); // L: 10748 - } - - if (Client.field882 > var9.field3098 && var9.onClanTransmit != null) { // L: 10750 - var22 = new ScriptEvent(); // L: 10751 - var22.widget = var9; // L: 10752 - var22.args = var9.onClanTransmit; // L: 10753 - Client.scriptEvents.addFirst(var22); // L: 10754 - } - - if (Client.field819 > var9.field3098 && var9.field3075 != null) { // L: 10756 - var22 = new ScriptEvent(); // L: 10757 - var22.widget = var9; // L: 10758 - var22.args = var9.field3075; // L: 10759 - Client.scriptEvents.addFirst(var22); // L: 10760 - } - - if (Client.field820 > var9.field3098 && var9.field3076 != null) { // L: 10762 - var22 = new ScriptEvent(); // L: 10763 - var22.widget = var9; // L: 10764 - var22.args = var9.field3076; // L: 10765 - Client.scriptEvents.addFirst(var22); // L: 10766 - } - - if (Client.field827 > var9.field3098 && var9.onStockTransmit != null) { // L: 10768 - var22 = new ScriptEvent(); // L: 10769 - var22.widget = var9; // L: 10770 - var22.args = var9.onStockTransmit; // L: 10771 - Client.scriptEvents.addFirst(var22); // L: 10772 - } - - if (Client.field822 > var9.field3098 && var9.field3082 != null) { // L: 10774 - var22 = new ScriptEvent(); // L: 10775 - var22.widget = var9; // L: 10776 - var22.args = var9.field3082; // L: 10777 - Client.scriptEvents.addFirst(var22); // L: 10778 - } - - if (Client.field823 > var9.field3098 && var9.onMiscTransmit != null) { // L: 10780 - var22 = new ScriptEvent(); // L: 10781 - var22.widget = var9; // L: 10782 - var22.args = var9.onMiscTransmit; // L: 10783 - Client.scriptEvents.addFirst(var22); // L: 10784 - } - - var9.field3098 = Client.cycleCntr; // L: 10786 - if (var9.onKey != null) { // L: 10787 - for (var37 = 0; var37 < Client.field847; ++var37) { // L: 10788 - ScriptEvent var31 = new ScriptEvent(); // L: 10789 - var31.widget = var9; // L: 10790 - var31.keyTyped = Client.field786[var37]; // L: 10791 - var31.keyPressed = Client.field848[var37]; // L: 10792 - var31.args = var9.onKey; // L: 10793 - Client.scriptEvents.addFirst(var31); // L: 10794 - } - } - - ScriptEvent var30; - int[] var38; - if (var9.field3071 != null) { // L: 10797 - var38 = class171.method3615(); // L: 10798 - - for (var23 = 0; var23 < var38.length; ++var23) { // L: 10799 - var30 = new ScriptEvent(); // L: 10800 - var30.widget = var9; // L: 10801 - var30.keyTyped = var38[var23]; // L: 10802 - var30.args = var9.field3071; // L: 10803 - Client.scriptEvents.addFirst(var30); // L: 10804 - } - } - - if (var9.field3000 != null) { // L: 10807 - var38 = Tiles.method2154(); // L: 10808 - - for (var23 = 0; var23 < var38.length; ++var23) { // L: 10809 - var30 = new ScriptEvent(); // L: 10810 - var30.widget = var9; // L: 10811 - var30.keyTyped = var38[var23]; // L: 10812 - var30.args = var9.field3000; // L: 10813 - Client.scriptEvents.addFirst(var30); // L: 10814 - } - } - } - } - - if (!var9.isIf3) { // L: 10819 - if (Client.clickedWidget != null || VerticalAlignment.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10820 - 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: 10821 - if (var9.mouseOverRedirect >= 0) { // L: 10822 - MusicPatchNode.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - MusicPatchNode.mousedOverWidgetIf1 = var9; // L: 10823 - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10825 - class5.field42 = var9; // L: 10826 - } - - if (var9.scrollHeight > var9.height) { // L: 10828 - class18.method273(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { // L: 10830 - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10831 - if (var9.children != null) { // L: 10832 - 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: 10833 - if (var28 != null) { // L: 10834 - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10835 - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10836 - if (var29.isMouseInputEvent) { // L: 10837 - var29.remove(); // L: 10838 - var29.widget.containsMouse = false; // L: 10839 - } - } - - if (UserComparator7.widgetDragDuration == 0) { // L: 10842 - Client.clickedWidget = null; // L: 10843 - Client.clickedWidgetParent = null; // L: 10844 - } - - if (!Client.isMenuOpen) { // L: 10846 - Script.addCancelMenuEntry(); // L: 10847 - } - } - - PacketWriter.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10850 - } - } - } + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var7 * var5 + var4 * var8 >> 11; + int var10 = var5 * var8 - var7 * var4 >> 11; + int var11 = var9 + MouseHandler.localPlayer.x >> 7; + int var12 = MouseHandler.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2585, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.method6786(var11 + GrandExchangeOfferNameComparator.baseX); + var13.packetBuffer.writeShort(var12 + NPC.baseY); + var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(MouseHandler.localPlayer.x); + var13.packetBuffer.writeShort(MouseHandler.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; } } - } - } // L: 10854 + } + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 92f746a04e..f5a33cd65e 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,196 +4,220 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +@ObfuscatedName("ay") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("rf") - @ObfuscatedGetter( - intValue = -429339765 + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "[Lof;" ) - static int field602; - @ObfuscatedName("f") + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 705678755 + intValue = 1404682675 ) @Export("count") int count; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2052644927 + intValue = -1530522167 ) @Export("cycle") int cycle; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2003938681 + intValue = 254325393 ) @Export("type") int type; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("sender") String sender; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Loh;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("prefix") String prefix; - @ObfuscatedName("h") + @ObfuscatedName("o") @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.isFromFriend0 = TriBool.TriBool_unknown; + this.isFromIgnored0 = TriBool.TriBool_unknown; this.set(var1, var2, var3, var4); - } // L: 20 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "0" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1561850800" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; // L: 25 - this.count = var5; // L: 27 - this.cycle = Client.cycle; // L: 28 - this.type = var1; // L: 29 - this.sender = var2; // L: 30 - this.fillSenderUsername(); // L: 31 - this.prefix = var3; // L: 32 - this.text = var4; // L: 33 - this.clearIsFromFriend(); // L: 34 - this.clearIsFromIgnored(); // L: 35 - } // L: 36 + this.count = class303.method5561(); + this.cycle = Client.cycle; + this.type = var1; + this.sender = var2; + this.fillSenderUsername(); + this.prefix = var3; + this.text = var4; + this.clearIsFromFriend(); + this.clearIsFromIgnored(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "50" + descriptor = "(I)V", + garbageValue = "-735144549" ) @Export("clearIsFromFriend") void clearIsFromFriend() { - this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 - } // L: 40 + this.isFromFriend0 = TriBool.TriBool_unknown; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-30" + descriptor = "(I)Z", + garbageValue = "797420695" ) @Export("isFromFriend") final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 - this.fillIsFromFriend(); // L: 44 + if (this.isFromFriend0 == TriBool.TriBool_unknown) { + this.fillIsFromFriend(); } - return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 + return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-7" + garbageValue = "0" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = DevicePcmPlayerProvider.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 - } // L: 51 + this.isFromFriend0 = Canvas.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1442748456" + garbageValue = "-1898608622" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { - this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 - } // L: 55 + this.isFromIgnored0 = TriBool.TriBool_unknown; + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1545793879" + garbageValue = "-832326948" ) @Export("isFromIgnored") final boolean isFromIgnored() { - if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 58 - this.fillIsFromIgnored(); // L: 59 + if (this.isFromIgnored0 == TriBool.TriBool_unknown) { + this.fillIsFromIgnored(); } - return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 + return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1118682631" + garbageValue = "-889441578" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = DevicePcmPlayerProvider.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 - } // L: 66 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "118" - ) - @Export("fillSenderUsername") - final void fillSenderUsername() { - if (this.sender != null) { // L: 69 - this.senderUsername = new Username(ScriptFrame.method1232(this.sender), LoginScreenAnimation.loginType); - } else { - this.senderUsername = null; // L: 70 - } - - } // L: 71 + this.isFromIgnored0 = Canvas.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2061677388" + descriptor = "(I)V", + garbageValue = "97400477" ) - @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("j") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 64 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljp;IIB)Z", - garbageValue = "-2" - ) - public static boolean method1263(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 140 - if (var3 == null) { // L: 141 - return false; + @Export("fillSenderUsername") + final void fillSenderUsername() { + if (this.sender != null) { + this.senderUsername = new Username(class52.method1648(this.sender), GraphicsObject.loginType); } else { - class29.SpriteBuffer_decode(var3); // L: 142 - return true; // L: 143 + this.senderUsername = null; } + + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(Lbx;I)V", + garbageValue = "1115623564" + ) + static final void method878(Actor var0) { + if (var0.field1067 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > World.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + int var1 = var0.field1067 - var0.field1073; + int var2 = Client.cycle - var0.field1073; + int var3 = var0.field1023 * 64 + var0.field1062 * 128; + int var4 = var0.field1023 * 64 + var0.field1064 * 128; + int var5 = var0.field1023 * 64 + var0.field1063 * 128; + int var6 = var0.field1023 * 64 + var0.field1065 * 128; + var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; + var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; + } + + var0.field1078 = 0; + var0.orientation = var0.field1050; + var0.rotation = var0.orientation; + } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-49" + ) + static boolean method865() { + return (Client.drawPlayerNames & 8) != 0; + } + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2077375589" + ) + static void method879(String var0) { + SpotAnimationDefinition.field1660 = var0; + + try { + String var1 = Script.client.getParameter(Integer.toString(18)); + String var2 = Script.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + if (var0.length() == 0) { + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + var3 = var3 + "; Expires=" + ItemContainer.method1792(UrlRequester.method2125() + 94608000000L) + "; Max-Age=" + 94608000L; + } + + class14.method147(Script.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var4) { + } + } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 4e1581d9e7..377f5c7c08 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,58 +6,124 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("cq") @Implements("Messages") public class Messages { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkc;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -993232851 + intValue = -237431523 ) @Export("Messages_count") static int Messages_count; @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Lee;" ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("br") - static String field1397; + @Export("clock") + protected static Clock clock; + @ObfuscatedName("da") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; static { - Messages_channels = new HashMap(); // L: 9 - Messages_hashTable = new IterableNodeHashTable(1024); // L: 10 - Messages_queue = new IterableDualNodeQueue(); // L: 11 - Messages_count = 0; // L: 12 + Messages_channels = new HashMap(); + Messages_hashTable = new IterableNodeHashTable(1024); + Messages_queue = new IterableDualNodeQueue(); + Messages_count = 0; } - @ObfuscatedName("gg") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lcl;I)V", - garbageValue = "2067592428" + descriptor = "(III)I", + garbageValue = "460801171" ) - static final void method2461(Actor var0) { - int var1 = Math.max(1, var0.field1276 - Client.cycle); // L: 4172 - int var2 = var0.field1225 * 64 + var0.field1264 * 128; // L: 4173 - int var3 = var0.field1225 * 64 + var0.field1268 * 128; // L: 4174 - var0.x += (var2 - var0.x) / var1; // L: 4175 - var0.y += (var3 - var0.y) / var1; // L: 4176 - var0.field1242 = 0; // L: 4177 - var0.orientation = var0.field1270; // L: 4178 - } // L: 4179 + static int method2072(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 0) { + var1 = 0; + } else if (var1 > 127) { + var1 = 127; + } + + var1 = 127 - var1; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)[Ljh;", + garbageValue = "-120" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman, PlayerType.PlayerType_jagexModerator, PlayerType.field3540, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_playerModerator}; + } + + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(Lbs;B)V", + garbageValue = "3" + ) + static final void method2094(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { + var1 = WorldMapIcon_1.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = WorldMapIcon_1.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = WorldMapIcon_1.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (0L != var1) { + int var6 = WorldMapIcon_1.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = class78.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field1009 = var4; + var0.field1012 = var5; + } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 9c65b562d1..70c251d7de 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,260 +3,260 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("ic") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("d") - static final byte[] field2875; - @ObfuscatedName("f") + @ObfuscatedName("x") + static final byte[] field2858; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnv;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("division") int division; @ObfuscatedName("v") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("trackLengths") int[] trackLengths; + @ObfuscatedName("n") + int[] field2857; + @ObfuscatedName("w") + int field2852; @ObfuscatedName("o") - int[] field2870; - @ObfuscatedName("m") - int field2872; - @ObfuscatedName("h") - long field2874; + long field2861; static { - field2875 = 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 + field2858 = 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}; } MidiFileReader(byte[] var1) { this.buffer = new Buffer((byte[])null); - this.parse(var1); // L: 26 - } // L: 27 + this.parse(var1); + } MidiFileReader() { - this.buffer = new Buffer((byte[])null); // L: 8 - } // L: 23 + this.buffer = new Buffer((byte[])null); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @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.field2872 = 500000; // L: 37 - this.trackStarts = new int[var2]; // L: 38 + this.buffer.array = var1; + this.buffer.offset = 10; + int var2 = this.buffer.readUnsignedShort(); + this.division = this.buffer.readUnsignedShort(); + this.field2852 = 500000; + this.trackStarts = new int[var2]; Buffer var10000; int var3; int var5; - for (var3 = 0; var3 < var2; var10000.offset += var5) { // L: 39 - int var4 = this.buffer.readInt(); // L: 40 - var5 = this.buffer.readInt(); // L: 41 - if (var4 == 1297379947) { // L: 42 - this.trackStarts[var3] = this.buffer.offset; // L: 43 - ++var3; // L: 44 + for (var3 = 0; var3 < var2; var10000.offset += var5) { + int var4 = this.buffer.readInt(); + var5 = this.buffer.readInt(); + if (var4 == 1297379947) { + this.trackStarts[var3] = this.buffer.offset; + ++var3; } - var10000 = this.buffer; // L: 46 + var10000 = this.buffer; } - this.field2874 = 0L; // L: 48 - this.trackPositions = new int[var2]; // L: 49 + this.field2861 = 0L; + this.trackPositions = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 50 + for (var3 = 0; var3 < var2; ++var3) { this.trackPositions[var3] = this.trackStarts[var3]; } - this.trackLengths = new int[var2]; // L: 51 - this.field2870 = new int[var2]; // L: 52 - } // L: 53 + this.trackLengths = new int[var2]; + this.field2857 = new int[var2]; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @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.field2870 = null; // L: 60 - } // L: 61 + this.buffer.array = null; + this.trackStarts = null; + this.trackPositions = null; + this.trackLengths = null; + this.field2857 = null; + } @ObfuscatedName("v") @Export("isReady") boolean isReady() { - return this.buffer.array != null; // L: 64 - } - - @ObfuscatedName("y") - @Export("trackCount") - int trackCount() { - return this.trackPositions.length; // L: 68 + return this.buffer.array != null; } @ObfuscatedName("j") - @Export("gotoTrack") - void gotoTrack(int var1) { - this.buffer.offset = this.trackPositions[var1]; // L: 72 - } // L: 73 - - @ObfuscatedName("o") - @Export("markTrackPosition") - void markTrackPosition(int var1) { - this.trackPositions[var1] = this.buffer.offset; // L: 76 - } // L: 77 - - @ObfuscatedName("m") - @Export("setTrackDone") - void setTrackDone() { - this.buffer.offset = -1; // L: 80 - } // L: 81 - - @ObfuscatedName("r") - @Export("readTrackLength") - void readTrackLength(int var1) { - int var2 = this.buffer.readVarInt(); // L: 84 - int[] var10000 = this.trackLengths; - var10000[var1] += var2; // L: 85 - } // L: 86 - - @ObfuscatedName("h") - @Export("readMessage") - int readMessage(int var1) { - int var2 = this.readMessage0(var1); // L: 89 - return var2; // L: 90 + @Export("trackCount") + int trackCount() { + return this.trackPositions.length; } - @ObfuscatedName("d") + @ObfuscatedName("l") + @Export("gotoTrack") + void gotoTrack(int var1) { + this.buffer.offset = this.trackPositions[var1]; + } + + @ObfuscatedName("n") + @Export("markTrackPosition") + void markTrackPosition(int var1) { + this.trackPositions[var1] = this.buffer.offset; + } + + @ObfuscatedName("w") + @Export("setTrackDone") + void setTrackDone() { + this.buffer.offset = -1; + } + + @ObfuscatedName("f") + @Export("readTrackLength") + void readTrackLength(int var1) { + int var2 = this.buffer.readVarInt(); + int[] var10000 = this.trackLengths; + var10000[var1] += var2; + } + + @ObfuscatedName("o") + @Export("readMessage") + int readMessage(int var1) { + int var2 = this.readMessage0(var1); + return var2; + } + + @ObfuscatedName("x") @Export("readMessage0") int readMessage0(int var1) { - byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 + byte var2 = this.buffer.array[this.buffer.offset]; int var5; - if (var2 < 0) { // L: 95 - var5 = var2 & 255; // L: 96 - this.field2870[var1] = var5; // L: 97 - ++this.buffer.offset; // L: 98 + if (var2 < 0) { + var5 = var2 & 255; + this.field2857[var1] = var5; + ++this.buffer.offset; } else { - var5 = this.field2870[var1]; // L: 101 + var5 = this.field2857[var1]; } - if (var5 != 240 && var5 != 247) { // L: 103 - return this.method4713(var1, var5); // L: 116 + if (var5 != 240 && var5 != 247) { + return this.method4591(var1, var5); } 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.field2870[var1] = var4; // L: 109 - return this.method4713(var1, var4); // L: 110 + int var3 = this.buffer.readVarInt(); + if (var5 == 247 && var3 > 0) { + int var4 = this.buffer.array[this.buffer.offset] & 255; + if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { + ++this.buffer.offset; + this.field2857[var1] = var4; + return this.method4591(var1, var4); } } - Buffer var10000 = this.buffer; // L: 113 + Buffer var10000 = this.buffer; var10000.offset += var3; - return 0; // L: 114 + return 0; } } - @ObfuscatedName("z") - int method4713(int var1, int var2) { + @ObfuscatedName("r") + int method4591(int var1, int var2) { int var4; - if (var2 == 255) { // L: 120 - int var7 = this.buffer.readUnsignedByte(); // L: 121 - var4 = this.buffer.readVarInt(); // L: 122 + if (var2 == 255) { + int var7 = this.buffer.readUnsignedByte(); + var4 = this.buffer.readVarInt(); Buffer var10000; - if (var7 == 47) { // L: 123 - var10000 = this.buffer; // L: 124 + if (var7 == 47) { + var10000 = this.buffer; var10000.offset += var4; - return 1; // L: 125 - } else if (var7 == 81) { // L: 127 - int var5 = this.buffer.readMedium(); // L: 128 - var4 -= 3; // L: 129 - int var6 = this.trackLengths[var1]; // L: 130 - this.field2874 += (long)var6 * (long)(this.field2872 - var5); // L: 131 - this.field2872 = var5; // L: 132 - var10000 = this.buffer; // L: 133 + return 1; + } else if (var7 == 81) { + int var5 = this.buffer.readMedium(); + var4 -= 3; + int var6 = this.trackLengths[var1]; + this.field2861 += (long)var6 * (long)(this.field2852 - var5); + this.field2852 = var5; + var10000 = this.buffer; var10000.offset += var4; - return 2; // L: 134 + return 2; } else { - var10000 = this.buffer; // L: 136 + var10000 = this.buffer; var10000.offset += var4; - return 3; // L: 137 + return 3; } } else { - byte var3 = field2875[var2 - 128]; // L: 139 - var4 = var2; // L: 140 - if (var3 >= 1) { // L: 141 + byte var3 = field2858[var2 - 128]; + var4 = var2; + if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; } - if (var3 >= 2) { // L: 142 + if (var3 >= 2) { var4 |= this.buffer.readUnsignedByte() << 16; } - return var4; // L: 143 + return var4; } } - @ObfuscatedName("b") - long method4710(int var1) { - return this.field2874 + (long)var1 * (long)this.field2872; // L: 147 + @ObfuscatedName("p") + long method4590(int var1) { + return this.field2861 + (long)var1 * (long)this.field2852; } - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("getPrioritizedTrack") int getPrioritizedTrack() { - int var1 = this.trackPositions.length; // L: 151 - int var2 = -1; // L: 152 - int var3 = Integer.MAX_VALUE; // L: 153 + int var1 = this.trackPositions.length; + int var2 = -1; + int var3 = Integer.MAX_VALUE; - for (int var4 = 0; var4 < var1; ++var4) { // L: 154 - if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { // L: 155 156 - var2 = var4; // L: 157 - var3 = this.trackLengths[var4]; // L: 158 + for (int var4 = 0; var4 < var1; ++var4) { + if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { + var2 = var4; + var3 = this.trackLengths[var4]; } } - return var2; // L: 161 + return var2; } @ObfuscatedName("k") @Export("isDone") boolean isDone() { - int var1 = this.trackPositions.length; // L: 165 + int var1 = this.trackPositions.length; - for (int var2 = 0; var2 < var1; ++var2) { // L: 166 + for (int var2 = 0; var2 < var1; ++var2) { if (this.trackPositions[var2] >= 0) { return false; } } - return true; // L: 167 + return true; } - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("reset") void reset(long var1) { - this.field2874 = var1; // L: 171 - int var3 = this.trackPositions.length; // L: 172 + this.field2861 = var1; + int var3 = this.trackPositions.length; - for (int var4 = 0; var4 < var3; ++var4) { // L: 173 - this.trackLengths[var4] = 0; // L: 174 - this.field2870[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 + for (int var4 = 0; var4 < var3; ++var4) { + this.trackLengths[var4] = 0; + this.field2857[var4] = 0; + this.buffer.offset = this.trackStarts[var4]; + this.readTrackLength(var4); + this.trackPositions[var4] = this.buffer.offset; } - } // L: 180 + } } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 40a6fbfc31..2fb51caf6e 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,96 +4,101 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("iv") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("f") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lof;" + ) + static IndexedSprite field2846; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lmi;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1826648467 + intValue = 1177561295 ) - int field2840; + int field2826; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2141093893 + intValue = -1293445729 ) - int field2841; - @ObfuscatedName("y") - int[] field2842; + int field2824; @ObfuscatedName("j") - int[] field2846; - @ObfuscatedName("o") - int[] field2861; - @ObfuscatedName("m") - int[] field2847; - @ObfuscatedName("r") - int[] field2845; - @ObfuscatedName("h") - int[] field2844; - @ObfuscatedName("d") - int[] field2848; - @ObfuscatedName("z") - int[] field2849; - @ObfuscatedName("b") - int[] field2853; - @ObfuscatedName("s") int[] field2851; - @ObfuscatedName("p") - int[] field2852; - @ObfuscatedName("c") - int[] field2850; - @ObfuscatedName("n") - int[] field2854; @ObfuscatedName("l") - int[] field2855; - @ObfuscatedName("w") - int[] field2856; - @ObfuscatedName("a") + int[] field2825; + @ObfuscatedName("n") + int[] field2828; + @ObfuscatedName("f") + int[] field2823; + @ObfuscatedName("o") + int[] field2829; + @ObfuscatedName("x") + int[] field2831; + @ObfuscatedName("r") + int[] field2832; + @ObfuscatedName("p") + int[] field2833; + @ObfuscatedName("h") + int[] field2834; + @ObfuscatedName("i") + int[] field2830; + @ObfuscatedName("m") + int[] field2837; + @ObfuscatedName("b") + int[] field2838; + @ObfuscatedName("z") + int[] field2839; + @ObfuscatedName("d") + int[] field2840; + @ObfuscatedName("y") + int[] field2841; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[[Lib;" + descriptor = "[[Liu;" ) - MusicPatchNode[][] field2857; - @ObfuscatedName("aw") + MusicPatchNode[][] field2842; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[[Lib;" + descriptor = "[[Liu;" ) - MusicPatchNode[][] field2858; - @ObfuscatedName("ak") + MusicPatchNode[][] field2843; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lic;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("ad") - boolean field2839; - @ObfuscatedName("at") + @ObfuscatedName("am") + boolean field2845; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1423807839 + intValue = 1508934545 ) @Export("track") int track; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 414893157 + intValue = -1835964979 ) @Export("trackLength") int trackLength; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - longValue = 8042341810818492123L + longValue = -3749855752961411885L ) - long field2863; - @ObfuscatedName("ap") + long field2848; + @ObfuscatedName("ab") @ObfuscatedGetter( - longValue = 7751692967903643467L + longValue = -6294052222087762239L ) - long field2864; - @ObfuscatedName("ag") + long field2850; + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "Lit;" ) @@ -101,986 +106,978 @@ public class MidiPcmStream extends PcmStream { MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2840 = 256; // L: 14 - this.field2841 = 1000000; // L: 15 - this.field2842 = new int[16]; // L: 16 - this.field2846 = new int[16]; // L: 17 - this.field2861 = new int[16]; // L: 18 - this.field2847 = new int[16]; // L: 19 - this.field2845 = new int[16]; // L: 20 - this.field2844 = new int[16]; // L: 21 - this.field2848 = new int[16]; // L: 22 - this.field2849 = new int[16]; // L: 23 - this.field2853 = new int[16]; // L: 24 - this.field2851 = new int[16]; // L: 28 - this.field2852 = new int[16]; // L: 29 - this.field2850 = new int[16]; // L: 30 - this.field2854 = new int[16]; // L: 31 - this.field2855 = new int[16]; // L: 32 - this.field2856 = new int[16]; // L: 33 - this.field2857 = new MusicPatchNode[16][128]; // L: 34 - this.field2858 = 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.method4575(); // L: 46 - } // L: 47 + this.field2826 = 256; + this.field2824 = 1000000; + this.field2851 = new int[16]; + this.field2825 = new int[16]; + this.field2828 = new int[16]; + this.field2823 = new int[16]; + this.field2829 = new int[16]; + this.field2831 = new int[16]; + this.field2832 = new int[16]; + this.field2833 = new int[16]; + this.field2834 = new int[16]; + this.field2830 = new int[16]; + this.field2837 = new int[16]; + this.field2838 = new int[16]; + this.field2839 = new int[16]; + this.field2840 = new int[16]; + this.field2841 = new int[16]; + this.field2842 = new MusicPatchNode[16][128]; + this.field2843 = new MusicPatchNode[16][128]; + this.midiFile = new MidiFileReader(); + this.patchStream = new MusicPatchPcmStream(this); + this.musicPatches = new NodeHashTable(128); + this.method4493(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "56" + descriptor = "(II)V", + garbageValue = "-1040712049" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2840 = var1; // L: 50 - } // L: 51 + this.field2826 = var1; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "752900349" ) - int method4660() { - return this.field2840; // L: 54 + public int method4474() { + return this.field2826; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lio;Ljp;Lbz;II)Z", - garbageValue = "-673775951" + descriptor = "(Lil;Ljy;Lan;II)Z", + garbageValue = "-2103809971" ) @Export("loadMusicTrack") synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4771(); // L: 58 - boolean var5 = true; // L: 59 - int[] var6 = null; // L: 60 - if (var4 > 0) { // L: 61 + var1.method4672(); + boolean var5 = true; + int[] var6 = null; + if (var4 > 0) { var6 = new int[]{var4}; } - for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { // L: 62 - int var8 = (int)var7.key; // L: 63 - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); // L: 64 - if (var9 == null) { // L: 65 - byte[] var11 = var2.takeFileFlat(var8); // L: 68 - MusicPatch var10; - if (var11 == null) { // L: 69 - var10 = null; // L: 70 - } else { - var10 = new MusicPatch(var11); // L: 73 - } - - var9 = var10; // L: 75 - if (var10 == null) { // L: 76 - var5 = false; // L: 77 + for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { + int var8 = (int)var7.key; + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); + if (var9 == null) { + var9 = Varcs.method2062(var2, var8); + if (var9 == null) { + var5 = false; continue; } - this.musicPatches.put(var10, (long)var8); // L: 80 + this.musicPatches.put(var9, (long)var8); } - if (!var9.method4731(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method4635(var3, var7.byteArray, var6)) { var5 = false; } } - if (var5) { // L: 84 + if (var5) { var1.clear(); } - return var5; // L: 85 + return var5; } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1280921587" - ) - @Export("clearAll") - synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 - var1.clear(); - } - - } // L: 90 - @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "787769784" + garbageValue = "673008127" + ) + @Export("clearAll") + synchronized void clearAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { + var1.clear(); + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "80" ) @Export("removeAll") - synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 + public synchronized void removeAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } - } // L: 94 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { - return this.patchStream; // L: 469 + return this.patchStream; } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { - return null; // L: 473 + return null; } - @ObfuscatedName("r") - protected synchronized int vmethod4740() { - return 0; // L: 477 + @ObfuscatedName("f") + protected synchronized int vmethod4662() { + return 0; } - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { - if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field2841 / class341.field3921; // L: 482 + if (this.midiFile.isReady()) { + int var4 = this.midiFile.division * this.field2824 / GrandExchangeOfferAgeComparator.field3633; do { - long var5 = (long)var3 * (long)var4 + this.field2863; // L: 484 - if (this.field2864 - var5 >= 0L) { // L: 485 - this.field2863 = var5; // L: 486 + long var5 = (long)var4 * (long)var3 + this.field2848; + if (this.field2850 - var5 >= 0L) { + this.field2848 = var5; break; } - int var7 = (int)((this.field2864 - this.field2863 + (long)var4 - 1L) / (long)var4); // L: 489 - this.field2863 += (long)var4 * (long)var7; // L: 490 - this.patchStream.fill(var1, var2, var7); // L: 491 - var2 += var7; // L: 492 - var3 -= var7; // L: 493 - this.method4588(); // L: 494 - } while(this.midiFile.isReady()); // L: 495 + int var7 = (int)((this.field2850 - this.field2848 + (long)var4 - 1L) / (long)var4); + this.field2848 += (long)var7 * (long)var4; + this.patchStream.fill(var1, var2, var7); + var2 += var7; + var3 -= var7; + this.method4506(); + } while(this.midiFile.isReady()); } - this.patchStream.fill(var1, var2, var3); // L: 498 - } // L: 499 + this.patchStream.fill(var1, var2, var3); + } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lio;ZI)V", - garbageValue = "-2021811263" + descriptor = "(Lil;ZI)V", + garbageValue = "1079678406" ) @Export("setMusicTrack") synchronized void setMusicTrack(MusicTrack var1, boolean var2) { - this.clear(); // L: 97 - this.midiFile.parse(var1.midi); // L: 98 - this.field2839 = var2; // L: 99 - this.field2863 = 0L; // L: 100 - int var3 = this.midiFile.trackCount(); // L: 101 + this.clear(); + this.midiFile.parse(var1.midi); + this.field2845 = var2; + this.field2848 = 0L; + int var3 = this.midiFile.trackCount(); - 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 + for (int var4 = 0; var4 < var3; ++var4) { + this.midiFile.gotoTrack(var4); + this.midiFile.readTrackLength(var4); + this.midiFile.markTrackPosition(var4); } - this.track = this.midiFile.getPrioritizedTrack(); // L: 107 - this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 - this.field2864 = this.midiFile.method4710(this.trackLength); // L: 109 - } // L: 110 + this.track = this.midiFile.getPrioritizedTrack(); + this.trackLength = this.midiFile.trackLengths[this.track]; + this.field2850 = this.midiFile.method4590(this.trackLength); + } - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("skip") protected synchronized void skip(int var1) { - if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field2841 / class341.field3921; // L: 503 + if (this.midiFile.isReady()) { + int var2 = this.midiFile.division * this.field2824 / GrandExchangeOfferAgeComparator.field3633; do { - long var3 = (long)var1 * (long)var2 + this.field2863; // L: 505 - if (this.field2864 - var3 >= 0L) { // L: 506 - this.field2863 = var3; // L: 507 + long var3 = this.field2848 + (long)var2 * (long)var1; + if (this.field2850 - var3 >= 0L) { + this.field2848 = var3; break; } - int var5 = (int)(((long)var2 + (this.field2864 - this.field2863) - 1L) / (long)var2); // L: 510 - this.field2863 += (long)var2 * (long)var5; // L: 511 - this.patchStream.skip(var5); // L: 512 - var1 -= var5; // L: 513 - this.method4588(); // L: 514 - } while(this.midiFile.isReady()); // L: 515 + int var5 = (int)((this.field2850 - this.field2848 + (long)var2 - 1L) / (long)var2); + this.field2848 += (long)var2 * (long)var5; + this.patchStream.skip(var5); + var1 -= var5; + this.method4506(); + } while(this.midiFile.isReady()); } - this.patchStream.skip(var1); // L: 518 - } // L: 519 + this.patchStream.skip(var1); + } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "44" + descriptor = "(I)V", + garbageValue = "1981150962" ) @Export("clear") - synchronized void clear() { - this.midiFile.clear(); // L: 113 - this.method4575(); // L: 114 - } // L: 115 + public synchronized void clear() { + this.midiFile.clear(); + this.method4493(); + } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1843453272" + descriptor = "(B)Z", + garbageValue = "-81" ) @Export("isReady") - synchronized boolean isReady() { - return this.midiFile.isReady(); // L: 118 + public synchronized boolean isReady() { + return this.midiFile.isReady(); } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "42" + descriptor = "(IIS)V", + garbageValue = "-3598" ) - public synchronized void method4563(int var1, int var2) { - this.method4564(var1, var2); // L: 122 - } // L: 123 + public synchronized void method4481(int var1, int var2) { + this.method4482(var1, var2); + } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-70" - ) - void method4564(int var1, int var2) { - this.field2847[var1] = var2; // L: 126 - this.field2844[var1] = var2 & -128; // L: 127 - this.method4574(var1, var2); // L: 128 - } // L: 129 - - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1581669707" + garbageValue = "468747458" ) - void method4574(int var1, int var2) { - if (var2 != this.field2845[var1]) { // L: 132 - this.field2845[var1] = var2; // L: 133 - - for (int var3 = 0; var3 < 128; ++var3) { // L: 134 - this.field2858[var1][var3] = null; - } - } - - } // L: 136 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1801299833" - ) - void method4566(int var1, int var2, int var3) { - this.method4666(var1, var2, 64); // L: 139 - if ((this.field2851[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.field2898 == var1 && var4.field2903 < 0) { // L: 142 - this.field2857[var1][var4.field2910] = null; // L: 143 - this.field2857[var1][var2] = var4; // L: 144 - int var8 = (var4.field2914 * var4.field2901 >> 12) + var4.field2907; // L: 145 - var4.field2907 += var2 - var4.field2910 << 8; // L: 146 - var4.field2901 = var8 - var4.field2907; // L: 147 - var4.field2914 = 4096; // L: 148 - var4.field2910 = var2; // L: 149 - return; // L: 150 - } - } - } - - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2845[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.field2898 = var1; // L: 159 - var6.patch = var9; // L: 160 - var6.rawSound = var5; // L: 161 - var6.field2904 = var9.field2884[var2]; // L: 162 - var6.field2897 = var9.field2886[var2]; // L: 163 - var6.field2910 = var2; // L: 164 - var6.field2900 = var3 * var3 * var9.field2883[var2] * var9.field2885 + 1024 >> 11; // L: 165 - var6.field2902 = var9.field2880[var2] & 255; // L: 166 - var6.field2907 = (var2 << 8) - (var9.field2882[var2] & 32767); // L: 167 - var6.field2894 = 0; // L: 168 - var6.field2906 = 0; // L: 169 - var6.field2905 = 0; // L: 170 - var6.field2903 = -1; // L: 171 - var6.field2909 = 0; // L: 172 - if (this.field2854[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method937(var5, this.method4632(var6), this.method4581(var6), this.method4650(var6)); // L: 174 - } else { - var6.stream = RawPcmStream.method937(var5, this.method4632(var6), 0, this.method4650(var6)); // L: 177 - this.method4567(var6, var9.field2882[var2] < 0); // L: 178 - } - - if (var9.field2882[var2] < 0) { // L: 180 - var6.stream.setNumLoops(-1); - } - - if (var6.field2897 >= 0) { // L: 181 - MusicPatchNode var7 = this.field2858[var1][var6.field2897]; // L: 182 - if (var7 != null && var7.field2903 < 0) { // L: 183 - this.field2857[var1][var7.field2910] = null; // L: 184 - var7.field2903 = 0; // L: 185 - } - - this.field2858[var1][var6.field2897] = var6; // L: 187 - } - - this.patchStream.queue.addFirst(var6); // L: 189 - this.field2857[var1][var2] = var6; // L: 190 - } - } - } // L: 191 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lib;ZI)V", - garbageValue = "1606151244" - ) - void method4567(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; // L: 194 - int var4; - if (var2 && var1.rawSound.field380) { // L: 196 - int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)var5 * (long)this.field2854[var1.field2898] >> 6); // L: 198 - var3 <<= 8; // L: 199 - if (var4 >= var3) { // L: 200 - var4 = var3 + var3 - 1 - var4; // L: 201 - var1.stream.method941(); // L: 202 - } - } else { - var4 = (int)((long)var3 * (long)this.field2854[var1.field2898] >> 6); // L: 206 - } - - var1.stream.method950(var4); // L: 208 - } // L: 209 + void method4482(int var1, int var2) { + this.field2823[var1] = var2; + this.field2831[var1] = var2 & -128; + this.method4514(var1, var2); + } @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1927529539" + descriptor = "(IIB)V", + garbageValue = "50" ) - void method4666(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2857[var1][var2]; // L: 212 - if (var4 != null) { // L: 213 - this.field2857[var1][var2] = null; // L: 214 - if ((this.field2851[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.field2898 == var5.field2898 && var5.field2903 < 0 && var5 != var4) { // L: 217 - var4.field2903 = 0; // L: 218 - break; // L: 219 - } - } - } else { - var4.field2903 = 0; // L: 224 + void method4514(int var1, int var2) { + if (var2 != this.field2829[var1]) { + this.field2829[var1] = var2; + + for (int var3 = 0; var3 < 128; ++var3) { + this.field2843[var1][var3] = null; } - } - } // L: 226 - @ObfuscatedName("s") + } + + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "2002263313" + garbageValue = "-1749278569" ) - void method4569(int var1, int var2, int var3) { - } // L: 228 + void method4535(int var1, int var2, int var3) { + this.method4486(var1, var2, 64); + if ((this.field2830[var1] & 2) != 0) { + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { + if (var4.field2902 == var1 && var4.field2896 < 0) { + this.field2842[var1][var4.field2893] = null; + this.field2842[var1][var2] = var4; + int var8 = (var4.field2892 * var4.field2891 >> 12) + var4.field2882; + var4.field2882 += var2 - var4.field2893 << 8; + var4.field2891 = var8 - var4.field2882; + var4.field2892 = 4096; + var4.field2893 = var2; + return; + } + } + } - @ObfuscatedName("p") + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2829[var1]); + if (var9 != null) { + RawSound var5 = var9.rawSounds[var2]; + if (var5 != null) { + MusicPatchNode var6 = new MusicPatchNode(); + var6.field2902 = var1; + var6.patch = var9; + var6.rawSound = var5; + var6.field2885 = var9.field2871[var2]; + var6.field2887 = var9.field2872[var2]; + var6.field2893 = var2; + var6.field2888 = var3 * var3 * var9.field2873[var2] * var9.field2870 + 1024 >> 11; + var6.field2889 = var9.field2867[var2] & 255; + var6.field2882 = (var2 << 8) - (var9.field2868[var2] & 32767); + var6.field2883 = 0; + var6.field2899 = 0; + var6.field2895 = 0; + var6.field2896 = -1; + var6.field2897 = 0; + if (this.field2839[var1] == 0) { + var6.stream = RawPcmStream.method554(var5, this.method4575(var6), this.method4499(var6), this.method4500(var6)); + } else { + var6.stream = RawPcmStream.method554(var5, this.method4575(var6), 0, this.method4500(var6)); + this.method4472(var6, var9.field2868[var2] < 0); + } + + if (var9.field2868[var2] < 0) { + var6.stream.setNumLoops(-1); + } + + if (var6.field2887 >= 0) { + MusicPatchNode var7 = this.field2843[var1][var6.field2887]; + if (var7 != null && var7.field2896 < 0) { + this.field2842[var1][var7.field2893] = null; + var7.field2896 = 0; + } + + this.field2843[var1][var6.field2887] = var6; + } + + this.patchStream.queue.addFirst(var6); + this.field2842[var1][var2] = var6; + } + } + } + + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-459034632" + descriptor = "(Liu;ZI)V", + garbageValue = "-1769668358" ) - void method4568(int var1, int var2) { - } // L: 229 + void method4472(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; + int var4; + if (var2 && var1.rawSound.field167) { + int var5 = var3 + var3 - var1.rawSound.start; + var4 = (int)((long)this.field2839[var1.field2902] * (long)var5 >> 6); + var3 <<= 8; + if (var4 >= var3) { + var4 = var3 + var3 - 1 - var4; + var1.stream.method563(); + } + } else { + var4 = (int)((long)this.field2839[var1.field2902] * (long)var3 >> 6); + } + + var1.stream.method562(var4); + } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1249872896" + descriptor = "(IIIB)V", + garbageValue = "13" ) - void method4571(int var1, int var2) { - this.field2848[var1] = var2; // L: 232 - } // L: 233 + void method4486(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2842[var1][var2]; + if (var4 != null) { + this.field2842[var1][var2] = null; + if ((this.field2830[var1] & 2) != 0) { + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var4.field2902 == var5.field2902 && var5.field2896 < 0 && var5 != var4) { + var4.field2896 = 0; + break; + } + } + } else { + var4.field2896 = 0; + } - @ObfuscatedName("n") + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-87" + ) + void method4487(int var1, int var2, int var3) { + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1285167169" + ) + void method4488(int var1, int var2) { + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1392681408" + ) + void method4489(int var1, int var2) { + this.field2832[var1] = var2; + } + + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-353606321" + garbageValue = "1024903922" ) - void method4572(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field2898 == var1) { // L: 237 - if (var2.stream != null) { // L: 238 - var2.stream.method955(class341.field3921 / 100); // L: 239 - if (var2.stream.method959()) { // L: 240 + void method4490(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var1 < 0 || var2.field2902 == var1) { + if (var2.stream != null) { + var2.stream.method567(GrandExchangeOfferAgeComparator.field3633 / 100); + if (var2.stream.method571()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method4772(); // L: 241 + var2.method4686(); } - if (var2.field2903 < 0) { // L: 243 - this.field2857[var2.field2898][var2.field2910] = null; + if (var2.field2896 < 0) { + this.field2842[var2.field2902][var2.field2893] = null; } - var2.remove(); // L: 244 + var2.remove(); } } - } // L: 247 + } - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "905785527" + garbageValue = "672123891" ) - void method4573(int var1) { - if (var1 >= 0) { // L: 250 - this.field2842[var1] = 12800; // L: 254 - this.field2846[var1] = 8192; // L: 255 - this.field2861[var1] = 16383; // L: 256 - this.field2848[var1] = 8192; // L: 257 - this.field2849[var1] = 0; // L: 258 - this.field2853[var1] = 8192; // L: 259 - this.method4649(var1); // L: 260 - this.method4617(var1); // L: 261 - this.field2851[var1] = 0; // L: 262 - this.field2852[var1] = 32767; // L: 263 - this.field2850[var1] = 256; // L: 264 - this.field2854[var1] = 0; // L: 265 - this.method4579(var1, 8192); // L: 266 + void method4491(int var1) { + if (var1 >= 0) { + this.field2851[var1] = 12800; + this.field2825[var1] = 8192; + this.field2828[var1] = 16383; + this.field2832[var1] = 8192; + this.field2833[var1] = 0; + this.field2834[var1] = 8192; + this.method4494(var1); + this.method4565(var1); + this.field2830[var1] = 0; + this.field2837[var1] = 32767; + this.field2838[var1] = 256; + this.field2839[var1] = 0; + this.method4497(var1, 8192); } else { - for (var1 = 0; var1 < 16; ++var1) { // L: 251 - this.method4573(var1); + for (var1 = 0; var1 < 16; ++var1) { + this.method4491(var1); } } - } // L: 252 267 + } - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "133609518" + garbageValue = "-619318857" ) - void method4644(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field2898 == var1) && var2.field2903 < 0) { // L: 271 272 - this.field2857[var2.field2898][var2.field2910] = null; // L: 273 - var2.field2903 = 0; // L: 274 + void method4502(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if ((var1 < 0 || var2.field2902 == var1) && var2.field2896 < 0) { + this.field2842[var2.field2902][var2.field2893] = null; + var2.field2896 = 0; } } - } // L: 278 + } - @ObfuscatedName("ae") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2004654152" + garbageValue = "-2021520651" ) - void method4575() { - this.method4572(-1); // L: 281 - this.method4573(-1); // L: 282 + void method4493() { + this.method4490(-1); + this.method4491(-1); int var1; - for (var1 = 0; var1 < 16; ++var1) { // L: 283 - this.field2845[var1] = this.field2847[var1]; + for (var1 = 0; var1 < 16; ++var1) { + this.field2829[var1] = this.field2823[var1]; } - for (var1 = 0; var1 < 16; ++var1) { // L: 284 - this.field2844[var1] = this.field2847[var1] & -128; + for (var1 = 0; var1 < 16; ++var1) { + this.field2831[var1] = this.field2823[var1] & -128; } - } // L: 285 + } - @ObfuscatedName("ac") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2122126750" + garbageValue = "488596486" ) - void method4649(int var1) { - if ((this.field2851[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.field2898 == var1 && this.field2857[var1][var2.field2910] == null && var2.field2903 < 0) { // L: 290 291 - var2.field2903 = 0; + void method4494(int var1) { + if ((this.field2830[var1] & 2) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2902 == var1 && this.field2842[var1][var2.field2893] == null && var2.field2896 < 0) { + var2.field2896 = 0; } } } - } // L: 295 + } - @ObfuscatedName("as") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1304197009" + garbageValue = "1578740894" ) - void method4617(int var1) { - if ((this.field2851[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.field2898 == var1) { // L: 300 - var2.field2899 = 0; + void method4565(int var1) { + if ((this.field2830[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2902 == var1) { + var2.field2898 = 0; } } } - } // L: 303 + } - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1402753770" + descriptor = "(IB)V", + garbageValue = "-1" ) - void method4578(int var1) { - int var2 = var1 & 240; // L: 306 + void method4496(int var1) { + int var2 = var1 & 240; int var3; int var4; int var5; - if (var2 == 128) { // L: 307 - var3 = var1 & 15; // L: 308 - var4 = var1 >> 8 & 127; // L: 309 - var5 = var1 >> 16 & 127; // L: 310 - this.method4666(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.method4566(var3, var4, var5); + if (var2 == 128) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + this.method4486(var3, var4, var5); + } else if (var2 == 144) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + if (var5 > 0) { + this.method4535(var3, var4, var5); } else { - this.method4666(var3, var4, 64); // L: 319 + this.method4486(var3, var4, 64); } - } else if (var2 == 160) { // L: 322 - var3 = var1 & 15; // L: 323 - var4 = var1 >> 8 & 127; // L: 324 - var5 = var1 >> 16 & 127; // L: 325 - this.method4569(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.field2844[var3] = (var5 << 14) + (this.field2844[var3] & -2080769); + } else if (var2 == 160) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + this.method4487(var3, var4, var5); + } else if (var2 == 176) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + if (var4 == 0) { + this.field2831[var3] = (var5 << 14) + (this.field2831[var3] & -2080769); } - if (var4 == 32) { // L: 334 - this.field2844[var3] = (var5 << 7) + (this.field2844[var3] & -16257); + if (var4 == 32) { + this.field2831[var3] = (var5 << 7) + (this.field2831[var3] & -16257); } - if (var4 == 1) { // L: 335 - this.field2849[var3] = (var5 << 7) + (this.field2849[var3] & -16257); + if (var4 == 1) { + this.field2833[var3] = (var5 << 7) + (this.field2833[var3] & -16257); } - if (var4 == 33) { // L: 336 - this.field2849[var3] = var5 + (this.field2849[var3] & -128); + if (var4 == 33) { + this.field2833[var3] = var5 + (this.field2833[var3] & -128); } - if (var4 == 5) { // L: 337 - this.field2853[var3] = (var5 << 7) + (this.field2853[var3] & -16257); + if (var4 == 5) { + this.field2834[var3] = (var5 << 7) + (this.field2834[var3] & -16257); } - if (var4 == 37) { // L: 338 - this.field2853[var3] = var5 + (this.field2853[var3] & -128); + if (var4 == 37) { + this.field2834[var3] = var5 + (this.field2834[var3] & -128); } - if (var4 == 7) { // L: 339 - this.field2842[var3] = (var5 << 7) + (this.field2842[var3] & -16257); + if (var4 == 7) { + this.field2851[var3] = (var5 << 7) + (this.field2851[var3] & -16257); } - if (var4 == 39) { // L: 340 - this.field2842[var3] = var5 + (this.field2842[var3] & -128); + if (var4 == 39) { + this.field2851[var3] = var5 + (this.field2851[var3] & -128); } - if (var4 == 10) { // L: 341 - this.field2846[var3] = (var5 << 7) + (this.field2846[var3] & -16257); + if (var4 == 10) { + this.field2825[var3] = (var5 << 7) + (this.field2825[var3] & -16257); } - if (var4 == 42) { // L: 342 - this.field2846[var3] = var5 + (this.field2846[var3] & -128); + if (var4 == 42) { + this.field2825[var3] = var5 + (this.field2825[var3] & -128); } - if (var4 == 11) { // L: 343 - this.field2861[var3] = (var5 << 7) + (this.field2861[var3] & -16257); + if (var4 == 11) { + this.field2828[var3] = (var5 << 7) + (this.field2828[var3] & -16257); } - if (var4 == 43) { // L: 344 - this.field2861[var3] = var5 + (this.field2861[var3] & -128); + if (var4 == 43) { + this.field2828[var3] = var5 + (this.field2828[var3] & -128); } int[] var10000; - if (var4 == 64) { // L: 345 - if (var5 >= 64) { // L: 346 - var10000 = this.field2851; + if (var4 == 64) { + if (var5 >= 64) { + var10000 = this.field2830; var10000[var3] |= 1; } else { - var10000 = this.field2851; // L: 347 + var10000 = this.field2830; var10000[var3] &= -2; } } - if (var4 == 65) { // L: 349 - if (var5 >= 64) { // L: 350 - var10000 = this.field2851; + if (var4 == 65) { + if (var5 >= 64) { + var10000 = this.field2830; var10000[var3] |= 2; } else { - this.method4649(var3); // L: 352 - var10000 = this.field2851; // L: 353 + this.method4494(var3); + var10000 = this.field2830; var10000[var3] &= -3; } } - if (var4 == 99) { // L: 356 - this.field2852[var3] = (var5 << 7) + (this.field2852[var3] & 127); + if (var4 == 99) { + this.field2837[var3] = (var5 << 7) + (this.field2837[var3] & 127); } - if (var4 == 98) { // L: 357 - this.field2852[var3] = (this.field2852[var3] & 16256) + var5; + if (var4 == 98) { + this.field2837[var3] = (this.field2837[var3] & 16256) + var5; } - if (var4 == 101) { // L: 358 - this.field2852[var3] = (var5 << 7) + (this.field2852[var3] & 127) + 16384; + if (var4 == 101) { + this.field2837[var3] = (var5 << 7) + (this.field2837[var3] & 127) + 16384; } - if (var4 == 100) { // L: 359 - this.field2852[var3] = (this.field2852[var3] & 16256) + var5 + 16384; + if (var4 == 100) { + this.field2837[var3] = (this.field2837[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { // L: 360 - this.method4572(var3); + if (var4 == 120) { + this.method4490(var3); } - if (var4 == 121) { // L: 361 - this.method4573(var3); + if (var4 == 121) { + this.method4491(var3); } - if (var4 == 123) { // L: 362 - this.method4644(var3); + if (var4 == 123) { + this.method4502(var3); } int var6; - if (var4 == 6) { // L: 363 - var6 = this.field2852[var3]; // L: 364 - if (var6 == 16384) { // L: 365 - this.field2850[var3] = (var5 << 7) + (this.field2850[var3] & -16257); + if (var4 == 6) { + var6 = this.field2837[var3]; + if (var6 == 16384) { + this.field2838[var3] = (var5 << 7) + (this.field2838[var3] & -16257); } } - if (var4 == 38) { // L: 367 - var6 = this.field2852[var3]; // L: 368 - if (var6 == 16384) { // L: 369 - this.field2850[var3] = var5 + (this.field2850[var3] & -128); + if (var4 == 38) { + var6 = this.field2837[var3]; + if (var6 == 16384) { + this.field2838[var3] = var5 + (this.field2838[var3] & -128); } } - if (var4 == 16) { // L: 371 - this.field2854[var3] = (var5 << 7) + (this.field2854[var3] & -16257); + if (var4 == 16) { + this.field2839[var3] = (var5 << 7) + (this.field2839[var3] & -16257); } - if (var4 == 48) { // L: 372 - this.field2854[var3] = var5 + (this.field2854[var3] & -128); + if (var4 == 48) { + this.field2839[var3] = var5 + (this.field2839[var3] & -128); } - if (var4 == 81) { // L: 373 - if (var5 >= 64) { // L: 374 - var10000 = this.field2851; + if (var4 == 81) { + if (var5 >= 64) { + var10000 = this.field2830; var10000[var3] |= 4; } else { - this.method4617(var3); // L: 376 - var10000 = this.field2851; // L: 377 + this.method4565(var3); + var10000 = this.field2830; var10000[var3] &= -5; } } if (var4 == 17) { - this.method4579(var3, (var5 << 7) + (this.field2855[var3] & -16257)); // L: 380 + this.method4497(var3, (var5 << 7) + (this.field2840[var3] & -16257)); } - if (var4 == 49) { // L: 381 - this.method4579(var3, var5 + (this.field2855[var3] & -128)); + if (var4 == 49) { + this.method4497(var3, var5 + (this.field2840[var3] & -128)); } - } else if (var2 == 192) { // L: 384 - var3 = var1 & 15; // L: 385 - var4 = var1 >> 8 & 127; // L: 386 - this.method4574(var3, var4 + this.field2844[var3]); // L: 387 - } else if (var2 == 208) { // L: 390 - var3 = var1 & 15; // L: 391 - var4 = var1 >> 8 & 127; // L: 392 - this.method4568(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.method4571(var3, var4); // L: 399 + } else if (var2 == 192) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + this.method4514(var3, var4 + this.field2831[var3]); + } else if (var2 == 208) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + this.method4488(var3, var4); + } else if (var2 == 224) { + var3 = var1 & 15; + var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); + this.method4489(var3, var4); } else { - var2 = var1 & 255; // L: 402 - if (var2 == 255) { // L: 403 - this.method4575(); // L: 404 + var2 = var1 & 255; + if (var2 == 255) { + this.method4493(); } } - } // L: 312 320 327 382 388 394 400 405 407 - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-264828177" - ) - void method4579(int var1, int var2) { - this.field2855[var1] = var2; // L: 410 - this.field2856[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411 - } // L: 412 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Lib;I)I", - garbageValue = "627320861" - ) - int method4632(MusicPatchNode var1) { - int var2 = (var1.field2914 * var1.field2901 >> 12) + var1.field2907; // L: 415 - var2 += (this.field2848[var1.field2898] - 8192) * this.field2850[var1.field2898] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field2904; // L: 417 - int var4; - if (var3.field2827 > 0 && (var3.field2826 > 0 || this.field2849[var1.field2898] > 0)) { // L: 418 - var4 = var3.field2826 << 2; // L: 419 - int var5 = var3.field2829 << 1; // L: 420 - if (var1.field2908 < var5) { // L: 421 - var4 = var4 * var1.field2908 / var5; - } - - var4 += this.field2849[var1.field2898] >> 7; // L: 422 - double var6 = Math.sin((double)(var1.field2911 & 511) * 0.01227184630308513D); // L: 423 - var2 += (int)((double)var4 * var6); // L: 424 - } - - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)class341.field3921 + 0.5D); // L: 426 - return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("ai") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lib;I)I", - garbageValue = "-1286368221" + descriptor = "(III)V", + garbageValue = "512532396" ) - int method4581(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2904; // L: 431 - int var3 = this.field2842[var1.field2898] * this.field2861[var1.field2898] + 4096 >> 13; // L: 432 - var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field2900 + 16384 >> 15; // L: 434 - var3 = var3 * this.field2840 + 128 >> 8; // L: 435 - if (var2.field2823 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2823 * 1.953125E-5D * (double)var1.field2894) + 0.5D); // L: 437 + void method4497(int var1, int var2) { + this.field2840[var1] = var2; + this.field2841[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Liu;I)I", + garbageValue = "-1916551350" + ) + int method4575(MusicPatchNode var1) { + int var2 = (var1.field2892 * var1.field2891 >> 12) + var1.field2882; + var2 += (this.field2832[var1.field2902] - 8192) * this.field2838[var1.field2902] >> 12; + MusicPatchNode2 var3 = var1.field2885; + int var4; + if (var3.field2810 > 0 && (var3.field2804 > 0 || this.field2833[var1.field2902] > 0)) { + var4 = var3.field2804 << 2; + int var5 = var3.field2812 << 1; + if (var1.field2886 < var5) { + var4 = var4 * var1.field2886 / var5; + } + + var4 += this.field2833[var1.field2902] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2894 & 511)); + var2 += (int)(var6 * (double)var4); + } + + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)GrandExchangeOfferAgeComparator.field3633 + 0.5D); + return var4 < 1 ? 1 : var4; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(Liu;I)I", + garbageValue = "-2062962562" + ) + int method4499(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2885; + int var3 = this.field2851[var1.field2902] * this.field2828[var1.field2902] + 4096 >> 13; + var3 = var3 * var3 + 16384 >> 15; + var3 = var3 * var1.field2888 + 16384 >> 15; + var3 = var3 * this.field2826 + 128 >> 8; + if (var2.field2806 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2883 * (double)var2.field2806) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2821 != null) { // L: 439 - var4 = var1.field2906; // L: 440 - var5 = var2.field2821[var1.field2905 + 1]; // L: 441 - if (var1.field2905 < var2.field2821.length - 2) { // L: 442 - var6 = (var2.field2821[var1.field2905] & 255) << 8; // L: 443 - var7 = (var2.field2821[var1.field2905 + 2] & 255) << 8; // L: 444 - var5 += (var2.field2821[var1.field2905 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 + if (var2.field2808 != null) { + var4 = var1.field2899; + var5 = var2.field2808[var1.field2895 + 1]; + if (var1.field2895 < var2.field2808.length - 2) { + var6 = (var2.field2808[var1.field2895] & 255) << 8; + var7 = (var2.field2808[var1.field2895 + 2] & 255) << 8; + var5 += (var2.field2808[var1.field2895 + 3] - var5) * (var4 - var6) / (var7 - var6); } - var3 = var5 * var3 + 32 >> 6; // L: 447 + var3 = var5 * var3 + 32 >> 6; } - if (var1.field2903 > 0 && var2.field2828 != null) { // L: 449 - var4 = var1.field2903; // L: 450 - var5 = var2.field2828[var1.field2909 + 1]; // L: 451 - if (var1.field2909 < var2.field2828.length - 2) { // L: 452 - var6 = (var2.field2828[var1.field2909] & 255) << 8; // L: 453 - var7 = (var2.field2828[var1.field2909 + 2] & 255) << 8; // L: 454 - var5 += (var4 - var6) * (var2.field2828[var1.field2909 + 3] - var5) / (var7 - var6); // L: 455 + if (var1.field2896 > 0 && var2.field2811 != null) { + var4 = var1.field2896; + var5 = var2.field2811[var1.field2897 + 1]; + if (var1.field2897 < var2.field2811.length - 2) { + var6 = (var2.field2811[var1.field2897] & 255) << 8; + var7 = (var2.field2811[var1.field2897 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field2811[var1.field2897 + 3] - var5) / (var7 - var6); } - var3 = var5 * var3 + 32 >> 6; // L: 457 + var3 = var3 * var5 + 32 >> 6; } - return var3; // L: 459 + return var3; } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lib;I)I", - garbageValue = "2045479165" + descriptor = "(Liu;I)I", + garbageValue = "2093922412" ) - int method4650(MusicPatchNode var1) { - int var2 = this.field2846[var1.field2898]; // L: 463 - return var2 < 8192 ? var2 * var1.field2902 + 32 >> 6 : 16384 - ((128 - var1.field2902) * (16384 - var2) + 32 >> 6); // L: 464 465 + int method4500(MusicPatchNode var1) { + int var2 = this.field2825[var1.field2902]; + return var2 < 8192 ? var2 * var1.field2889 + 32 >> 6 : 16384 - ((128 - var1.field2889) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("ax") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-13" + garbageValue = "77" ) - void method4588() { - int var1 = this.track; // L: 522 - int var2 = this.trackLength; // L: 523 + void method4506() { + int var1 = this.track; + int var2 = this.trackLength; long var3; - for (var3 = this.field2864; var2 == this.trackLength; var3 = this.midiFile.method4710(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.field2839 || var2 == 0) { // L: 533 - this.method4575(); // L: 537 - this.midiFile.clear(); // L: 538 - return; // L: 539 + for (var3 = this.field2850; var2 == this.trackLength; var3 = this.midiFile.method4590(var2)) { + while (var2 == this.midiFile.trackLengths[var1]) { + this.midiFile.gotoTrack(var1); + int var5 = this.midiFile.readMessage(var1); + if (var5 == 1) { + this.midiFile.setTrackDone(); + this.midiFile.markTrackPosition(var1); + if (this.midiFile.isDone()) { + if (!this.field2845 || var2 == 0) { + this.method4493(); + this.midiFile.clear(); + return; } - this.midiFile.reset(var3); // L: 534 + this.midiFile.reset(var3); } break; } - if ((var5 & 128) != 0) { // L: 541 - this.method4578(var5); + if ((var5 & 128) != 0) { + this.method4496(var5); } - this.midiFile.readTrackLength(var1); // L: 542 - this.midiFile.markTrackPosition(var1); // L: 543 + this.midiFile.readTrackLength(var1); + this.midiFile.markTrackPosition(var1); } - var1 = this.midiFile.getPrioritizedTrack(); // L: 545 - var2 = this.midiFile.trackLengths[var1]; // L: 546 + var1 = this.midiFile.getPrioritizedTrack(); + var2 = this.midiFile.trackLengths[var1]; } - this.track = var1; // L: 549 - this.trackLength = var2; // L: 550 - this.field2864 = var3; // L: 551 - } // L: 552 + this.track = var1; + this.trackLength = var2; + this.field2850 = var3; + } - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lib;I)Z", - garbageValue = "896454021" + descriptor = "(Liu;S)Z", + garbageValue = "4885" ) - boolean method4589(MusicPatchNode var1) { - if (var1.stream == null) { // L: 555 - if (var1.field2903 >= 0) { // L: 556 - var1.remove(); // L: 557 - if (var1.field2897 > 0 && var1 == this.field2858[var1.field2898][var1.field2897]) { // L: 558 - this.field2858[var1.field2898][var1.field2897] = null; // L: 559 + boolean method4507(MusicPatchNode var1) { + if (var1.stream == null) { + if (var1.field2896 >= 0) { + var1.remove(); + if (var1.field2887 > 0 && var1 == this.field2843[var1.field2902][var1.field2887]) { + this.field2843[var1.field2902][var1.field2887] = null; } } - return true; // L: 562 + return true; } else { - return false; // L: 564 + return false; } } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lib;[IIII)Z", - garbageValue = "-1780917654" + descriptor = "(Liu;[IIII)Z", + garbageValue = "-947292548" ) - boolean method4590(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2913 = class341.field3921 / 100; // L: 568 - if (var1.field2903 < 0 || var1.stream != null && !var1.stream.method1065()) { // L: 569 - int var5 = var1.field2914; // L: 577 - if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2853[var1.field2898] * 4.921259842519685E-4D) + 0.5D); // L: 579 - if (var5 < 0) { // L: 580 + boolean method4508(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2901 = GrandExchangeOfferAgeComparator.field3633 / 100; + if (var1.field2896 < 0 || var1.stream != null && !var1.stream.method623()) { + int var5 = var1.field2892; + if (var5 > 0) { + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2834[var1.field2902]) + 0.5D); + if (var5 < 0) { var5 = 0; } - var1.field2914 = var5; // L: 581 + var1.field2892 = var5; } - var1.stream.method1052(this.method4632(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field2904; // L: 584 - boolean var7 = false; // L: 585 - ++var1.field2908; // L: 586 - var1.field2911 += var6.field2827; // L: 587 - double var8 = (double)((var1.field2910 - 60 << 8) + (var1.field2914 * var1.field2901 >> 12)) * 5.086263020833333E-6D; // L: 588 - if (var6.field2823 > 0) { // L: 589 - if (var6.field2822 > 0) { // L: 590 - var1.field2894 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2822) + 0.5D); + var1.stream.method568(this.method4575(var1)); + MusicPatchNode2 var6 = var1.field2885; + boolean var7 = false; + ++var1.field2886; + var1.field2894 += var6.field2810; + double var8 = (double)((var1.field2893 - 60 << 8) + (var1.field2891 * var1.field2892 >> 12)) * 5.086263020833333E-6D; + if (var6.field2806 > 0) { + if (var6.field2809 > 0) { + var1.field2883 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2809 * var8) + 0.5D); } else { - var1.field2894 += 128; // L: 591 + var1.field2883 += 128; } } - if (var6.field2821 != null) { // L: 593 - if (var6.field2824 > 0) { // L: 594 - var1.field2906 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2824 * var8) + 0.5D); + if (var6.field2808 != null) { + if (var6.field2807 > 0) { + var1.field2899 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2807 * var8) + 0.5D); } else { - var1.field2906 += 128; // L: 595 + var1.field2899 += 128; } - while (var1.field2905 < var6.field2821.length - 2 && var1.field2906 > (var6.field2821[var1.field2905 + 2] & 255) << 8) { // L: 596 - var1.field2905 += 2; + while (var1.field2895 < var6.field2808.length - 2 && var1.field2899 > (var6.field2808[var1.field2895 + 2] & 255) << 8) { + var1.field2895 += 2; } - if (var6.field2821.length - 2 == var1.field2905 && var6.field2821[var1.field2905 + 1] == 0) { // L: 597 + if (var6.field2808.length - 2 == var1.field2895 && var6.field2808[var1.field2895 + 1] == 0) { var7 = true; } } - if (var1.field2903 >= 0 && var6.field2828 != null && (this.field2851[var1.field2898] & 1) == 0 && (var1.field2897 < 0 || var1 != this.field2858[var1.field2898][var1.field2897])) { // L: 599 600 - if (var6.field2825 > 0) { // L: 601 - var1.field2903 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2825 * var8) + 0.5D); + if (var1.field2896 >= 0 && var6.field2811 != null && (this.field2830[var1.field2902] & 1) == 0 && (var1.field2887 < 0 || var1 != this.field2843[var1.field2902][var1.field2887])) { + if (var6.field2805 > 0) { + var1.field2896 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2805 * var8) + 0.5D); } else { - var1.field2903 += 128; // L: 602 + var1.field2896 += 128; } - while (var1.field2909 < var6.field2828.length - 2 && var1.field2903 > (var6.field2828[var1.field2909 + 2] & 255) << 8) { // L: 603 - var1.field2909 += 2; + while (var1.field2897 < var6.field2811.length - 2 && var1.field2896 > (var6.field2811[var1.field2897 + 2] & 255) << 8) { + var1.field2897 += 2; } - if (var6.field2828.length - 2 == var1.field2909) { // L: 604 + if (var6.field2811.length - 2 == var1.field2897) { var7 = true; } } - if (var7) { // L: 607 - var1.stream.method955(var1.field2913); // L: 608 - if (var2 != null) { // L: 609 + if (var7) { + var1.stream.method567(var1.field2901); + if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); // L: 610 + var1.stream.skip(var4); } - if (var1.stream.method959()) { // L: 611 + if (var1.stream.method571()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method4772(); // L: 612 - if (var1.field2903 >= 0) { // L: 613 - var1.remove(); // L: 614 - if (var1.field2897 > 0 && var1 == this.field2858[var1.field2898][var1.field2897]) { // L: 615 - this.field2858[var1.field2898][var1.field2897] = null; // L: 616 + var1.method4686(); + if (var1.field2896 >= 0) { + var1.remove(); + if (var1.field2887 > 0 && var1 == this.field2843[var1.field2902][var1.field2887]) { + this.field2843[var1.field2902][var1.field2887] = null; } } - return true; // L: 619 + return true; } else { - var1.stream.method954(var1.field2913, this.method4581(var1), this.method4650(var1)); // L: 621 - return false; // L: 622 + var1.stream.method566(var1.field2901, this.method4499(var1), this.method4500(var1)); + return false; } } else { - var1.method4772(); // L: 570 - var1.remove(); // L: 571 - if (var1.field2897 > 0 && var1 == this.field2858[var1.field2898][var1.field2897]) { // L: 572 - this.field2858[var1.field2898][var1.field2897] = null; // L: 573 + var1.method4686(); + var1.remove(); + if (var1.field2887 > 0 && var1 == this.field2843[var1.field2902][var1.field2887]) { + this.field2843[var1.field2902][var1.field2887] = null; } - return true; // L: 575 + return true; } } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index c5d348f993..219df16e80 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -1,152 +1,154 @@ -import java.awt.Image; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("ev") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("z") + @ObfuscatedName("s") + long[] field1501; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1292974499 + intValue = 1604146545 ) - static int field1523; - @ObfuscatedName("ab") - static Image field1527; - @ObfuscatedName("f") - long[] field1518; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1121640641 - ) - int field1519; + int field1499; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1291175111 + intValue = 297982951 ) - int field1521; - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = 6157496358684260999L - ) - long field1520; + int field1500; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -15673867 + longValue = 6545994804951437021L ) - int field1522; - @ObfuscatedName("o") + long field1502; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -668116803 + intValue = 955506643 ) - int field1525; + int field1504; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1688753709 + ) + int field1503; public MilliClock() { - this.field1518 = new long[10]; // L: 7 - this.field1519 = 256; // L: 15 - this.field1521 = 1; // L: 16 - this.field1522 = 0; // L: 17 - this.field1520 = ClientPacket.currentTimeMillis(); // L: 18 + this.field1501 = new long[10]; + this.field1499 = 256; + this.field1500 = 1; + this.field1504 = 0; + this.field1502 = UrlRequester.method2125(); - for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field1518[var1] = this.field1520; // L: 20 + for (int var1 = 0; var1 < 10; ++var1) { + this.field1501[var1] = this.field1502; } - } // L: 22 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-111" + descriptor = "(I)V", + garbageValue = "-296506208" ) @Export("mark") public void mark() { - for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field1518[var1] = 0L; // L: 26 + for (int var1 = 0; var1 < 10; ++var1) { + this.field1501[var1] = 0L; } - } // L: 28 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-104" + descriptor = "(III)I", + garbageValue = "2079435375" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1519; // L: 31 - int var4 = this.field1521; // L: 32 - this.field1519 = 300; // L: 33 - this.field1521 = 1; // L: 34 - this.field1520 = ClientPacket.currentTimeMillis(); // L: 35 - if (this.field1518[this.field1525] == 0L) { // L: 36 - this.field1519 = var3; // L: 37 - this.field1521 = var4; // L: 38 - } else if (this.field1520 > this.field1518[this.field1525]) { // L: 40 - this.field1519 = (int)((long)(var1 * 2560) / (this.field1520 - this.field1518[this.field1525])); + int var3 = this.field1499; + int var4 = this.field1500; + this.field1499 = 300; + this.field1500 = 1; + this.field1502 = UrlRequester.method2125(); + if (this.field1501[this.field1503] == 0L) { + this.field1499 = var3; + this.field1500 = var4; + } else if (this.field1502 > this.field1501[this.field1503]) { + this.field1499 = (int)((long)(var1 * 2560) / (this.field1502 - this.field1501[this.field1503])); } - if (this.field1519 < 25) { // L: 41 - this.field1519 = 25; + if (this.field1499 < 25) { + this.field1499 = 25; } - if (this.field1519 > 256) { // L: 42 - this.field1519 = 256; // L: 43 - this.field1521 = (int)((long)var1 - (this.field1520 - this.field1518[this.field1525]) / 10L); // L: 44 + if (this.field1499 > 256) { + this.field1499 = 256; + this.field1500 = (int)((long)var1 - (this.field1502 - this.field1501[this.field1503]) / 10L); } - if (this.field1521 > var1) { // L: 46 - this.field1521 = var1; + if (this.field1500 > var1) { + this.field1500 = var1; } - this.field1518[this.field1525] = this.field1520; // L: 47 - this.field1525 = (this.field1525 + 1) % 10; // L: 48 + this.field1501[this.field1503] = this.field1502; + this.field1503 = (this.field1503 + 1) % 10; int var5; - if (this.field1521 > 1) { // L: 49 - for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (this.field1518[var5] != 0L) { // L: 51 - this.field1518[var5] += (long)this.field1521; + if (this.field1500 > 1) { + for (var5 = 0; var5 < 10; ++var5) { + if (0L != this.field1501[var5]) { + this.field1501[var5] += (long)this.field1500; } } } - if (this.field1521 < var2) { // L: 54 - this.field1521 = var2; + if (this.field1500 < var2) { + this.field1500 = var2; } - class18.method272((long)this.field1521); // L: 55 + SceneTilePaint.method4322((long)this.field1500); - for (var5 = 0; this.field1522 < 256; this.field1522 += this.field1519) { // L: 56 57 59 - ++var5; // L: 58 + for (var5 = 0; this.field1504 < 256; this.field1504 += this.field1499) { + ++var5; } - this.field1522 &= 255; // L: 61 - return var5; // L: 62 + this.field1504 &= 255; + return var5; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "70" + descriptor = "(I)V", + garbageValue = "1037668761" ) - static int method2685(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { // L: 2067 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2068 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class18.method271(var3) ? 1 : 0; // L: 2069 - return 1; // L: 2070 - } else if (var0 == 3501) { // L: 2072 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2073 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ClanChannelMember.method108(var3) ? 1 : 0; // L: 2074 - return 1; // L: 2075 - } else if (var0 == 3502) { // L: 2077 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2078 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = KitDefinition.method2778(var3) ? 1 : 0; // L: 2079 - return 1; // L: 2080 - } else { - return 2; // L: 2082 + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = NPC.getPreferencesFile("", MouseRecorder.field975.name, true); + Buffer var1 = Decimator.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { + } + + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-59" + ) + public static void method2671() { + StructComposition.StructDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index e7ad935761..11eecffc32 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,3 +1,7 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; import java.util.HashSet; import java.util.Set; import net.runelite.mapping.Export; @@ -7,566 +11,692 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kg") +@ObfuscatedName("kj") @Implements("ModeWhere") -public enum ModeWhere implements Enumerated -{ - @ObfuscatedName("f") +public enum ModeWhere implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3701("", 0, new class287[]{class287.field3673}), - @ObfuscatedName("e") + field3715("", 0, new class288[]{class288.field3673}), + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3690("", 1, new class287[]{class287.field3671, class287.field3673}), + field3696("", 1, new class288[]{class288.field3674, class288.field3673}), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3691("", 2, new class287[]{class287.field3671, class287.field3672, class287.field3673}), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lkg;" - ) - field3692("", 3, new class287[]{class287.field3671}), + field3697("", 2, new class288[]{class288.field3674, class288.field3672, class288.field3673}), @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3697("", 4), + field3700("", 3, new class288[]{class288.field3674}), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3699("", 4), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3708("", 5, new class288[]{class288.field3674, class288.field3673}), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3714("", 6, new class288[]{class288.field3673}), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3702("", 8, new class288[]{class288.field3674, class288.field3673}), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3694("", 5, new class287[]{class287.field3671, class287.field3673}), - @ObfuscatedName("m") + field3703("", 9, new class288[]{class288.field3674, class288.field3672}), + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3695("", 6, new class287[]{class287.field3673}), + field3704("", 10, new class288[]{class288.field3674}), @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3696("", 8, new class287[]{class287.field3671, class287.field3673}), + field3705("", 11, new class288[]{class288.field3674}), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3706("", 12, new class288[]{class288.field3674, class288.field3673}), @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lkj;" ) - field3693("", 9, new class287[]{class287.field3671, class287.field3672}), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lkg;" - ) - field3698("", 10, new class287[]{class287.field3671}), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lkg;" - ) - field3699("", 11, new class287[]{class287.field3671}), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lkg;" - ) - field3700("", 12, new class287[]{class287.field3671, class287.field3673}), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lkg;" - ) - field3704("", 13, new class287[]{class287.field3671}); + field3707("", 13, new class288[]{class288.field3674}); - @ObfuscatedName("dx") + @ObfuscatedName("st") @ObfuscatedSignature( descriptor = "Ljf;" ) - @Export("archive8") - static Archive archive8; + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("ej") + @ObfuscatedGetter( + intValue = -622819047 + ) + static int field3713; + @ObfuscatedName("lh") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static Widget field3698; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1725478607 + intValue = 1787126939 ) @Export("id") final int id; - @ObfuscatedName("g") - final Set field3703; + @ObfuscatedName("a") + final Set field3709; static { - method5289(); + method5239(); } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Lkc;)V" + descriptor = "(Ljava/lang/String;I[Lkr;)V" ) - ModeWhere(String var3, int var4, class287[] var5) { - this.field3703 = new HashSet(); + ModeWhere(String var3, int var4, class288[] var5) { + this.field3709 = new HashSet(); this.id = var4; - class287[] var6 = var5; + class288[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { - class287 var8 = var6[var7]; - this.field3703.add(var8); + class288 var8 = var6[var7]; + this.field3709.add(var8); } } ModeWhere(String var3, int var4) { - this.field3703 = new HashSet(); + this.field3709 = new HashSet(); this.id = var4; } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1806959663" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;Ljy;I)V", + garbageValue = "-744949904" + ) + public static void method5251(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; + class163.field1913 = var1; + HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;I)V", + garbageValue = "1090262769" + ) + public static void method5237(AbstractArchive var0, AbstractArchive var1) { + DevicePcmPlayerProvider.HealthBarDefinition_archive = var0; + HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ZZI)Lof;", + garbageValue = "-1135953364" + ) + static IndexedSprite method5247(boolean var0, boolean var1) { + return var0 ? (var1 ? GraphicsDefaults.field3919 : class172.options_buttons_2Sprite) : (var1 ? UserComparator5.field1239 : GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1089223533" + ) + static int method5243(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = UrlRequester.getWidget(var3); + } else { + var4 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + Interpreter.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + AttackOption.invalidateWidget(var4); + Script.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + Interpreter.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + AttackOption.invalidateWidget(var4); + Script.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + AttackOption.invalidateWidget(var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "71" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class303.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; + } + + var6 = var7; + } + + var3[var4++] = (char)var6; + } + } + + return new String(var3, 0, var4); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)[Lkj;", + garbageValue = "48" + ) + static ModeWhere[] method5239() { + return new ModeWhere[]{field3705, field3702, field3707, field3700, field3703, field3696, field3714, field3715, field3697, field3699, field3708, field3706, field3704}; + } + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" + descriptor = "(I)V", + garbageValue = "-1673386275" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; // L: 54 - } + static void method5238() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Client.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var1; + try { + URL var3 = new URL(UserComparator5.method2167("services", false) + "m=accountappeal/login.ws"); + URLConnection var4 = var3.openConnection(); + var4.setRequestProperty("connection", "close"); + var4.setDoInput(true); + var4.setDoOutput(true); + var4.setConnectTimeout(5000); + OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); + var5.write("data1=req"); + var5.flush(); + InputStream var6 = var4.getInputStream(); + Buffer var7 = new Buffer(new byte[1000]); - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lnt;Ljava/lang/String;I)I", - garbageValue = "-1585565275" - ) - public static int method5292(Buffer var0, String var1) { - int var2 = var0.offset; // L: 18 - int var4 = var1.length(); // L: 21 - byte[] var5 = new byte[var4]; // L: 22 + while (true) { + int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); + if (var8 == -1) { + var7.offset = 0; + long var10 = var7.readLong(); + var1 = var10; + break; + } - 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) { - 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 + var7.offset += var8; + if (var7.offset >= 1000) { + var1 = 0L; + break; + } + } + } catch (Exception var14) { + var1 = 0L; } - } - var0.writeSmartByteShort(var5.length); // L: 58 - var0.offset += class250.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59 - return var0.offset - var2; // L: 60 + int var0; + if (var1 == 0L) { + var0 = 5; + } else { + var0 = Client.method1381(var1, Login.Login_username); + } + + switch(var0) { + case 2: + Client.setLoginResponseString(Strings.field3495, Strings.field3354, Strings.field3319); + Login.loginIndex = 6; + break; + case 3: + Client.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + Client.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + Client.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + Client.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + Client.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."); + } + + } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Lkg;", - garbageValue = "1172185177" + descriptor = "(Lkt;Lkt;Lkt;B)V", + garbageValue = "-64" ) - static ModeWhere[] method5289() { - return new ModeWhere[]{field3701, field3693, field3696, field3699, field3694, field3704, field3691, field3690, field3700, field3695, field3698, field3692, field3697}; // L: 35 - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-963755121" - ) - static int method5283(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { // L: 3844 - var3 = SoundSystem.Client_plane; // L: 3845 - int var15 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 3846 - int var8 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 3847 - BZip2State.getWorldMap().method6287(var3, var15, var8, true); // L: 3848 - return 1; // L: 3849 + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (MouseRecorder.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + WorldMapSection2.loginBoxCenter = Login.loginBoxX + 180; + if (Login.worldSelectOpen) { + GraphicsObject.method1646(var0, var1); } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3851 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3852 - String var16 = ""; // L: 3853 - var9 = BZip2State.getWorldMap().getMapArea(var3); // L: 3854 - if (var9 != null) { // L: 3855 - var16 = var9.getExternalName(); // L: 3856 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + UserComparator4.logoSprite.drawAt(Login.xPadding + 382 - UserComparator4.logoSprite.subWidth / 2, 18); + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { + byte var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); + } + + String var5; + String var6; + short var16; + int var17; + short var18; + if (Client.gameState == 20) { + class304.titleboxSprite.drawAt(Login.loginBoxX + 180 - class304.titleboxSprite.subWidth / 2, 271 - class304.titleboxSprite.subHeight / 2); + var16 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var17 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var17, 16777215, 0); + var18 = 200; + + for (var5 = class107.method2292(); var0.stringWidth(var5) > var18; var5 = var5.substring(0, var5.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var17, 16777215, 0); + var17 += 15; + + for (var6 = class16.method176(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { + } + + var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var17, 16777215, 0); + var17 += 15; } + } - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var16; // L: 3858 - return 1; // L: 3859 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3861 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3862 - BZip2State.getWorldMap().setCurrentMapAreaId(var3); // L: 3863 - return 1; // L: 3864 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3866 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getZoomLevel(); // L: 3867 - return 1; // L: 3868 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3870 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3871 - BZip2State.getWorldMap().setZoomPercentage(var3); // L: 3872 - return 1; // L: 3873 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3875 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3876 - return 1; // L: 3877 - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3879 - var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3880 - BZip2State.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3881 - return 1; // L: 3882 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3884 - var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3885 - BZip2State.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3886 - return 1; // L: 3887 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3889 - var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3890 - BZip2State.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3891 - return 1; // L: 3892 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3894 - var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3895 - BZip2State.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3896 - return 1; // L: 3897 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3899 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayX(); // L: 3900 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayY(); // L: 3901 - return 1; // L: 3902 + if (Client.gameState == 10 || Client.gameState == 11) { + class304.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var11; + if (Login.loginIndex == 0) { + var16 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 30; + var4 = Login.loginBoxX + 180 - 80; + var11 = 291; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawLines("New User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawLines("Existing User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var16 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); + var17 = var16 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); + var17 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); + var17 += 15; + var4 = Login.loginBoxX + 180 - 80; + var11 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Continue", var4, var11 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Cancel", var4, var11 + 5, 16777215, 0); } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3904 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3905 - var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3906 - if (var11 == null) { // L: 3907 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3908 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3911 + int var7; + if (Login.loginIndex == 2) { + var16 = 201; + var0.drawCentered(Login.Login_response1, WorldMapSection2.loginBoxCenter, var16, 16776960, 0); + var17 = var16 + 15; + var0.drawCentered(Login.Login_response2, WorldMapSection2.loginBoxCenter, var17, 16776960, 0); + var17 += 15; + var0.drawCentered(Login.Login_response3, WorldMapSection2.loginBoxCenter, var17, 16776960, 0); + var17 += 15; + var17 += 7; + var0.draw("Login: ", WorldMapSection2.loginBoxCenter - 110, var17, 16777215, 0); + var18 = 200; + + for (var5 = class107.method2292(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { } - return 1; // L: 3913 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3915 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3916 - var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3917 - if (var11 == null) { // L: 3918 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3919 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3920 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3923 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3924 + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), WorldMapSection2.loginBoxCenter - 70, var17, 16777215, 0); + var17 += 15; + + for (var6 = class16.method176(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { } - return 1; // L: 3926 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3928 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3929 - var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3930 - if (var11 == null) { // L: 3931 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3932 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3933 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3934 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3935 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3938 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3939 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3940 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3941 + var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), WorldMapSection2.loginBoxCenter - 108, var17, 16777215, 0); + var17 += 15; + var16 = 277; + var7 = WorldMapSection2.loginBoxCenter + -117; + IndexedSprite var14 = method5247(Client.Login_isUsernameRemembered, Login.field829); + var14.drawAt(var7, var16); + var7 = var7 + var14.subWidth + 5; + var1.draw("Remember username", var7, var16 + 13, 16776960, 0); + var7 = WorldMapSection2.loginBoxCenter + 24; + var14 = method5247(Decimator.clientPreferences.hideUsername, Login.field819); + var14.drawAt(var7, var16); + var7 = var7 + var14.subWidth + 5; + var1.draw("Hide username", var7, var16 + 13, 16776960, 0); + var17 = var16 + 15; + int var9 = WorldMapSection2.loginBoxCenter - 80; + short var10 = 321; + Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); + var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); + var9 = WorldMapSection2.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); + var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); + var16 = 357; + switch(Login.field809) { + case 2: + World.field703 = "Having trouble logging in?"; + break; + default: + World.field703 = "Can't login? Click here."; } - return 1; // L: 3943 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3945 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3946 - var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3947 - if (var11 == null) { // L: 3948 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3949 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3952 - } - - return 1; // L: 3954 - } else if (var0 == 6615) { // L: 3956 - var14 = BZip2State.getWorldMap().getDisplayCoord(); // L: 3957 - if (var14 == null) { // L: 3958 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3959 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3960 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var14.x; // L: 3963 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var14.y; // L: 3964 - } - - return 1; // L: 3966 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3968 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().currentMapAreaId(); // L: 3969 - return 1; // L: 3970 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3972 - var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3973 - var11 = BZip2State.getWorldMap().getCurrentMapArea(); // L: 3974 - if (var11 == null) { // L: 3975 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3976 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3977 - return 1; // L: 3978 - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3980 - if (var12 == null) { // L: 3981 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3982 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3983 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12[0]; // L: 3986 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12[1]; // L: 3987 - } - - return 1; // L: 3989 - } + GameEngine.field127 = new Bounds(WorldMapSection2.loginBoxCenter, var16, var1.stringWidth(World.field703), 11); + class307.field3766 = new Bounds(WorldMapSection2.loginBoxCenter, var16, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(World.field703, WorldMapSection2.loginBoxCenter, var16, 16777215, 0); + } else if (Login.loginIndex == 3) { + var16 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var4 = Login.loginBoxX + 180; + var11 = 276; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var2.drawCentered("Try again", var4, var11 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var11 = 326; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var2.drawCentered("Forgotten password?", var4, var11 + 5, 16777215, 0); } else { - Coord var5; - if (var0 == 6618) { // L: 3991 - var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3992 - var11 = BZip2State.getWorldMap().getCurrentMapArea(); // L: 3993 - if (var11 == null) { // L: 3994 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3995 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3996 - return 1; // L: 3997 + short var8; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var16 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); + var17 = var16 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); + var17 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); + var17 += 15; + var0.draw("PIN: " + class16.method176(HorizontalAlignment.otp) + (Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var17, 16777215, 0); + var17 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var17, 16776960, 0); + var17 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var17, 16776960, 0); + var4 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; + int var21 = var17 - var0.ascent; + IndexedSprite var19; + if (Login.field820) { + var19 = class172.options_buttons_2Sprite; } else { - var5 = var11.coord(var14.x, var14.y); // L: 3999 - if (var5 == null) { // L: 4000 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4001 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.packed(); // L: 4004 - } - - return 1; // L: 4006 + var19 = GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite; } - } else { - Coord var10; - if (var0 == 6619) { // L: 4008 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4009 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4010 - var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4011 - Canvas.method497(var3, var10, false); // L: 4012 - return 1; // L: 4013 - } else if (var0 == 6620) { // L: 4015 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4016 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4017 - var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4018 - Canvas.method497(var3, var10, true); // L: 4019 - return 1; // L: 4020 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4022 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4023 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4024 - var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4025 - var9 = BZip2State.getWorldMap().getMapArea(var3); // L: 4026 - if (var9 == null) { // L: 4027 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4028 - return 1; // L: 4029 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4031 - return 1; // L: 4032 - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4034 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayWith(); // L: 4035 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayHeight(); // L: 4036 - return 1; // L: 4037 - } else if (var0 == 6623) { // L: 4039 - var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 4040 - var11 = BZip2State.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4041 - if (var11 == null) { // L: 4042 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4043 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getId(); // L: 4046 - } - return 1; // L: 4048 - } else if (var0 == 6624) { // L: 4050 - BZip2State.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 4051 - return 1; // L: 4052 - } else if (var0 == 6625) { // L: 4054 - BZip2State.getWorldMap().resetMaxFlashCount(); // L: 4055 - return 1; // L: 4056 - } else if (var0 == 6626) { // L: 4058 - BZip2State.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 4059 - return 1; // L: 4060 - } else if (var0 == 6627) { // L: 4062 - BZip2State.getWorldMap().resetCyclesPerFlash(); // L: 4063 - return 1; // L: 4064 - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4066 - var13 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 4067 - BZip2State.getWorldMap().setPerpetualFlash(var13); // L: 4068 - return 1; // L: 4069 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4071 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4072 - BZip2State.getWorldMap().flashElement(var3); // L: 4073 - return 1; // L: 4074 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4076 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4077 - BZip2State.getWorldMap().flashCategory(var3); // L: 4078 - return 1; // L: 4079 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4081 - BZip2State.getWorldMap().stopCurrentFlashes(); // L: 4082 - return 1; // L: 4083 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4085 - var13 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 4086 - BZip2State.getWorldMap().setElementsDisabled(var13); // L: 4087 - return 1; // L: 4088 - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4090 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4091 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4092 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 4093 - BZip2State.getWorldMap().disableElement(var3, var7); // L: 4094 - return 1; // L: 4095 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4097 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4098 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4099 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 4100 - BZip2State.getWorldMap().setCategoryDisabled(var3, var7); // L: 4101 - return 1; // L: 4102 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4104 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4105 - return 1; // L: 4106 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4108 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4109 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4110 - return 1; // L: 4111 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4113 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4114 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4115 - return 1; // L: 4116 - } else if (var0 == 6638) { // L: 4118 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4119 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4120 - var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4121 - var5 = BZip2State.getWorldMap().method6184(var3, var10); // L: 4122 - if (var5 == null) { // L: 4123 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4124 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.packed(); // L: 4127 - } + var19.drawAt(var4, var21); + var17 += 15; + var7 = Login.loginBoxX + 180 - 80; + var8 = 321; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); + } else if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var16 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var17 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var17, 16777215, 0); + var18 = 174; - return 1; // L: 4129 - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4131 - var6 = BZip2State.getWorldMap().iconStart(); // L: 4132 - if (var6 == null) { // L: 4133 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4134 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4135 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4138 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4139 - } - - return 1; // L: 4141 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4143 - var6 = BZip2State.getWorldMap().iconNext(); // L: 4144 - if (var6 == null) { // L: 4145 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4146 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4147 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4150 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4151 - } - - return 1; // L: 4153 - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4155 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4156 - var4 = Archive.WorldMapElement_get(var3); // L: 4157 - if (var4.name == null) { // L: 4158 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4159 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.name; // L: 4162 - } - - return 1; // L: 4164 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4166 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4167 - var4 = Archive.WorldMapElement_get(var3); // L: 4168 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.textSize; // L: 4169 - return 1; // L: 4170 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4172 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4173 - var4 = Archive.WorldMapElement_get(var3); // L: 4174 - if (var4 == null) { // L: 4175 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4176 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.category; // L: 4179 - } - - return 1; // L: 4181 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4183 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4184 - var4 = Archive.WorldMapElement_get(var3); // L: 4185 - if (var4 == null) { // L: 4186 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4187 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4190 - } - - return 1; // L: 4192 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4194 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Occluder.worldMapEvent.mapElement; // L: 4195 - return 1; // L: 4196 - } else if (var0 == 6698) { // L: 4198 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Occluder.worldMapEvent.coord1.packed(); // L: 4199 - return 1; // L: 4200 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4202 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Occluder.worldMapEvent.coord2.packed(); // L: 4203 - return 1; // L: 4204 - } else { - return 2; // L: 4206 - } - } - } - } + for (var5 = class107.method2292(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var17, 16777215, 0); + var17 += 15; + int var13 = Login.loginBoxX + 180 - 80; + short var20 = 321; + Login.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); + var0.drawCentered("Recover", var13, var20 + 5, 16777215, 0); + var13 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); + var0.drawCentered("Back", var13, var20 + 5, 16777215, 0); + var20 = 356; + var1.drawCentered("Still having trouble logging in?", WorldMapSection2.loginBoxCenter, var20, 268435455, 0); + } else if (Login.loginIndex == 6) { + var16 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var4 = Login.loginBoxX + 180; + var11 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var16 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var4 = Login.loginBoxX + 180 - 80; + var11 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Set Date of Birth", var4, var11 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var16 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var4 = Login.loginBoxX + 180 - 80; + var11 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Privacy Policy", var4, var11 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var16 = 201; + String var12 = ""; + var5 = ""; + var6 = ""; + switch(Login.field804) { + case 0: + var12 = "Your account has been disabled."; + var5 = Strings.field3298; + var6 = ""; + break; + case 1: + var12 = "Account locked as we suspect it has been stolen."; + var5 = Strings.field3467; + var6 = ""; + break; + default: + class107.Login_promptCredentials(false); + } + + var0.drawCentered(var12, Login.loginBoxX + 180, var16, 16776960, 0); + var17 = var16 + 15; + var2.drawCentered(var5, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var2.drawCentered(var6, Login.loginBoxX + 180, var17, 16776960, 0); + var17 += 15; + var7 = Login.loginBoxX + 180; + var8 = 276; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180; + var8 = 326; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var16 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); + var17 = var16 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); + var17 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); + var17 += 15; + var4 = Login.loginBoxX + 180; + var11 = 301; + Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); + var0.drawCentered("Ok", var4, var11 + 5, 16777215, 0); } } } } + + if (Client.gameState >= 10) { + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Client.canvasHeight); + class6.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + class6.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + } + + FileSystem.title_muteSprite[Decimator.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && GrandExchangeOfferWorldComparator.clientLanguage == Language.Language_EN) { + if (MidiPcmStream.field2846 != null) { + var17 = Login.xPadding + 5; + var18 = 463; + byte var23 = 100; + byte var22 = 35; + MidiPcmStream.field2846.drawAt(var17, var18); + var0.drawCentered("World" + " " + Client.worldId, var23 / 2 + var17, var22 / 2 + var18 - 2, 16777215, 0); + if (NPC.World_request != null) { + var1.drawCentered("Loading...", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0); + } + } else { + MidiPcmStream.field2846 = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "sl_button", ""); + } + } + } } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-892538682" + ) + static final boolean method5252() { + return Client.isMenuOpen; + } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 5cd10b3269..e20b37eaac 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,177 +3,177 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gl") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgl;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgl;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("al") - static boolean[] field2469; + @ObfuscatedName("ak") + static boolean[] field2432; @ObfuscatedName("aj") - static boolean[] field2458; - @ObfuscatedName("ac") + static boolean[] field2443; + @ObfuscatedName("at") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("as") + @ObfuscatedName("af") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("au") - static int[] field2461; - @ObfuscatedName("ay") - static int[] field2435; - @ObfuscatedName("am") - static int[] field2463; - @ObfuscatedName("aa") - static int[] field2477; - @ObfuscatedName("av") - static int[] field2466; - @ObfuscatedName("ax") - static int[][] field2451; @ObfuscatedName("ar") - static int[] field2468; - @ObfuscatedName("af") - static int[][] field2467; - @ObfuscatedName("bq") - static int[] field2470; - @ObfuscatedName("bx") + static int[] field2446; + @ObfuscatedName("ay") + static int[] field2447; + @ObfuscatedName("ap") + static int[] field2448; + @ObfuscatedName("ah") + static int[] field2449; + @ObfuscatedName("ai") + static int[] field2451; + @ObfuscatedName("ad") + static int[][] field2468; + @ObfuscatedName("ac") + static int[] field2435; + @ObfuscatedName("aw") + static int[][] field2454; + @ObfuscatedName("bt") + static int[] field2455; + @ObfuscatedName("bk") + static int[] field2456; + @ObfuscatedName("br") static int[] field2422; - @ObfuscatedName("bi") - static int[] field2472; - @ObfuscatedName("bz") - static int[] field2473; - @ObfuscatedName("bb") - static int[] field2474; + @ObfuscatedName("by") + static int[] field2407; @ObfuscatedName("bv") - static int[] field2475; - @ObfuscatedName("bc") + static int[] field2459; + @ObfuscatedName("bf") + static int[] field2460; + @ObfuscatedName("bd") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("be") + @ObfuscatedName("bg") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("ba") + @ObfuscatedName("bw") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bs") - static boolean field2479; - @ObfuscatedName("by") + @ObfuscatedName("bo") + static boolean field2464; + @ObfuscatedName("bu") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bg") - static int[] field2484; - @ObfuscatedName("bm") - static int[] field2485; - @ObfuscatedName("j") + @ObfuscatedName("bj") + static int[] field2469; + @ObfuscatedName("bq") + static int[] field2470; + @ObfuscatedName("l") @Export("verticesCount") int verticesCount; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("verticesX") int[] verticesX; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("verticesY") int[] verticesY; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("indicesCount") int indicesCount; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("indices1") int[] indices1; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("indices2") int[] indices2; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("indices3") int[] indices3; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("faceColors1") int[] faceColors1; @ObfuscatedName("k") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("u") - byte[] field2448; - @ObfuscatedName("q") + @ObfuscatedName("e") + byte[] field2440; + @ObfuscatedName("c") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("s") - byte field2437; - @ObfuscatedName("p") - int field2438; - @ObfuscatedName("c") - int[] field2449; - @ObfuscatedName("n") - int[] field2440; - @ObfuscatedName("l") - int[] field2441; - @ObfuscatedName("w") + @ObfuscatedName("i") + byte field2441; + @ObfuscatedName("m") + int field2423; + @ObfuscatedName("b") + int[] field2453; + @ObfuscatedName("z") + int[] field2425; + @ObfuscatedName("d") + int[] field2426; + @ObfuscatedName("y") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("boundsType") int boundsType; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("bottomY") int bottomY; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @Export("diameter") int diameter; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("radius") int radius; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("xMid") int xMid; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @Export("yMid") int yMid; - @ObfuscatedName("ab") + @ObfuscatedName("au") @Export("zMid") int zMid; - @ObfuscatedName("aq") + @ObfuscatedName("av") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ae") + @ObfuscatedName("as") @Export("yMidOffset") int yMidOffset; @ObfuscatedName("ao") @@ -181,235 +181,235 @@ public class Model extends Renderable { int zMidOffset; static { - Model_sharedSequenceModel = new Model(); // L: 6 - Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7 - Model_sharedSpotAnimationModel = new Model(); // L: 8 - Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9 - field2469 = new boolean[6500]; // L: 45 - field2458 = new boolean[6500]; // L: 46 - modelViewportXs = new int[6500]; // L: 47 - modelViewportYs = new int[6500]; // L: 48 - field2461 = new int[6500]; // L: 49 - field2435 = new int[6500]; // L: 50 - field2463 = new int[6500]; // L: 51 - field2477 = new int[6500]; // L: 52 - field2466 = new int[1600]; // L: 54 - field2451 = new int[1600][512]; // L: 55 - field2468 = new int[12]; // L: 56 - field2467 = new int[12][2000]; // L: 57 - field2470 = new int[2000]; // L: 58 - field2422 = new int[2000]; // L: 59 - field2472 = new int[12]; // L: 60 - field2473 = new int[10]; // L: 61 - field2474 = new int[10]; // L: 62 - field2475 = new int[10]; // L: 63 - field2479 = true; // L: 67 - Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70 - Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71 - field2484 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 - field2485 = Rasterizer3D.field2282; // L: 73 + Model_sharedSequenceModel = new Model(); + Model_sharedSequenceModelFaceAlphas = new byte[1]; + Model_sharedSpotAnimationModel = new Model(); + Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; + field2432 = new boolean[6500]; + field2443 = new boolean[6500]; + modelViewportXs = new int[6500]; + modelViewportYs = new int[6500]; + field2446 = new int[6500]; + field2447 = new int[6500]; + field2448 = new int[6500]; + field2449 = new int[6500]; + field2451 = new int[1600]; + field2468 = new int[1600][512]; + field2435 = new int[12]; + field2454 = new int[12][2000]; + field2455 = new int[2000]; + field2456 = new int[2000]; + field2422 = new int[12]; + field2407 = new int[10]; + field2459 = new int[10]; + field2460 = new int[10]; + field2464 = true; + Model_sine = Rasterizer3D.Rasterizer3D_sine; + Model_cosine = Rasterizer3D.Rasterizer3D_cosine; + field2469 = Rasterizer3D.Rasterizer3D_colorPalette; + field2470 = Rasterizer3D.field2270; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2437 = 0; - this.field2438 = 0; + this.field2441 = 0; + this.field2423 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; this.zMidOffset = -1; - } // L: 77 + } @ObfuscatedSignature( - descriptor = "([Lgd;I)V" + descriptor = "([Lgl;I)V" ) public Model(Model[] var1, int var2) { - this.verticesCount = 0; // L: 10 - this.indicesCount = 0; // L: 14 - this.field2437 = 0; // L: 25 - this.field2438 = 0; // L: 26 - this.isSingleTile = false; // L: 32 - this.xMidOffset = -1; // L: 41 - this.yMidOffset = -1; // L: 42 - this.zMidOffset = -1; // L: 43 - boolean var3 = false; // L: 80 - boolean var4 = false; // L: 81 - boolean var5 = false; // L: 82 - boolean var6 = false; // L: 83 - this.verticesCount = 0; // L: 84 - this.indicesCount = 0; // L: 85 - this.field2438 = 0; // L: 86 - this.field2437 = -1; // L: 87 + this.verticesCount = 0; + this.indicesCount = 0; + this.field2441 = 0; + this.field2423 = 0; + this.isSingleTile = false; + this.xMidOffset = -1; + this.yMidOffset = -1; + this.zMidOffset = -1; + boolean var3 = false; + boolean var4 = false; + boolean var5 = false; + boolean var6 = false; + this.verticesCount = 0; + this.indicesCount = 0; + this.field2423 = 0; + this.field2441 = -1; int var7; Model var8; - for (var7 = 0; var7 < var2; ++var7) { // L: 88 - var8 = var1[var7]; // L: 89 - if (var8 != null) { // L: 90 - this.verticesCount += var8.verticesCount; // L: 91 - this.indicesCount += var8.indicesCount; // L: 92 - this.field2438 += var8.field2438; // L: 93 - if (var8.faceRenderPriorities != null) { // L: 94 + for (var7 = 0; var7 < var2; ++var7) { + var8 = var1[var7]; + if (var8 != null) { + this.verticesCount += var8.verticesCount; + this.indicesCount += var8.indicesCount; + this.field2423 += var8.field2423; + if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field2437 == -1) { // L: 96 - this.field2437 = var8.field2437; + if (this.field2441 == -1) { + this.field2441 = var8.field2441; } - if (this.field2437 != var8.field2437) { // L: 97 + if (this.field2441 != var8.field2441) { var3 = true; } } - var4 |= var8.faceAlphas != null; // L: 99 - var5 |= var8.faceTextures != null; // L: 100 - var6 |= var8.field2448 != null; // L: 101 + var4 |= var8.faceAlphas != null; + var5 |= var8.faceTextures != null; + var6 |= var8.field2440 != null; } } - this.verticesX = new int[this.verticesCount]; // L: 104 - this.verticesY = new int[this.verticesCount]; // L: 105 - this.verticesZ = new int[this.verticesCount]; // L: 106 - this.indices1 = new int[this.indicesCount]; // L: 107 - this.indices2 = new int[this.indicesCount]; // L: 108 - this.indices3 = new int[this.indicesCount]; // L: 109 - this.faceColors1 = new int[this.indicesCount]; // L: 110 - this.faceColors2 = new int[this.indicesCount]; // L: 111 - this.faceColors3 = new int[this.indicesCount]; // L: 112 - if (var3) { // L: 113 + this.verticesX = new int[this.verticesCount]; + this.verticesY = new int[this.verticesCount]; + this.verticesZ = new int[this.verticesCount]; + this.indices1 = new int[this.indicesCount]; + this.indices2 = new int[this.indicesCount]; + this.indices3 = new int[this.indicesCount]; + this.faceColors1 = new int[this.indicesCount]; + this.faceColors2 = new int[this.indicesCount]; + this.faceColors3 = new int[this.indicesCount]; + if (var3) { this.faceRenderPriorities = new byte[this.indicesCount]; } - if (var4) { // L: 114 + if (var4) { this.faceAlphas = new byte[this.indicesCount]; } - if (var5) { // L: 115 + if (var5) { this.faceTextures = new short[this.indicesCount]; } - if (var6) { // L: 116 - this.field2448 = new byte[this.indicesCount]; + if (var6) { + this.field2440 = new byte[this.indicesCount]; } - if (this.field2438 > 0) { // L: 117 - this.field2449 = new int[this.field2438]; // L: 118 - this.field2440 = new int[this.field2438]; // L: 119 - this.field2441 = new int[this.field2438]; // L: 120 + if (this.field2423 > 0) { + this.field2453 = new int[this.field2423]; + this.field2425 = new int[this.field2423]; + this.field2426 = new int[this.field2423]; } - this.verticesCount = 0; // L: 122 - this.indicesCount = 0; // L: 123 - this.field2438 = 0; // L: 124 + this.verticesCount = 0; + this.indicesCount = 0; + this.field2423 = 0; - for (var7 = 0; var7 < var2; ++var7) { // L: 125 - var8 = var1[var7]; // L: 126 - if (var8 != null) { // L: 127 + for (var7 = 0; var7 < var2; ++var7) { + var8 = var1[var7]; + if (var8 != null) { int var9; - for (var9 = 0; var9 < var8.indicesCount; ++var9) { // L: 128 - this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; // L: 129 - this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; // L: 130 - this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; // L: 131 - this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; // L: 132 - this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; // L: 133 - this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; // L: 134 - if (var3) { // L: 135 - if (var8.faceRenderPriorities != null) { // L: 136 + for (var9 = 0; var9 < var8.indicesCount; ++var9) { + this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; + this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; + this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; + this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; + this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; + this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; + if (var3) { + if (var8.faceRenderPriorities != null) { this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2437; // L: 137 + this.faceRenderPriorities[this.indicesCount] = var8.field2441; } } - if (var4 && var8.faceAlphas != null) { // L: 139 140 + if (var4 && var8.faceAlphas != null) { this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9]; } - if (var5) { // L: 142 - if (var8.faceTextures != null) { // L: 143 + if (var5) { + if (var8.faceTextures != null) { this.faceTextures[this.indicesCount] = var8.faceTextures[var9]; } else { - this.faceTextures[this.indicesCount] = -1; // L: 144 + this.faceTextures[this.indicesCount] = -1; } } - if (var6) { // L: 146 - if (var8.field2448 != null && var8.field2448[var9] != -1) { // L: 147 - this.field2448[this.indicesCount] = (byte)(this.field2438 + var8.field2448[var9]); + if (var6) { + if (var8.field2440 != null && var8.field2440[var9] != -1) { + this.field2440[this.indicesCount] = (byte)(this.field2423 + var8.field2440[var9]); } else { - this.field2448[this.indicesCount] = -1; // L: 148 + this.field2440[this.indicesCount] = -1; } } - ++this.indicesCount; // L: 150 + ++this.indicesCount; } - for (var9 = 0; var9 < var8.field2438; ++var9) { // L: 152 - this.field2449[this.field2438] = this.verticesCount + var8.field2449[var9]; // L: 153 - this.field2440[this.field2438] = this.verticesCount + var8.field2440[var9]; // L: 154 - this.field2441[this.field2438] = this.verticesCount + var8.field2441[var9]; // L: 155 - ++this.field2438; // L: 156 + for (var9 = 0; var9 < var8.field2423; ++var9) { + this.field2453[this.field2423] = this.verticesCount + var8.field2453[var9]; + this.field2425[this.field2423] = this.verticesCount + var8.field2425[var9]; + this.field2426[this.field2423] = this.verticesCount + var8.field2426[var9]; + ++this.field2423; } - for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158 - this.verticesX[this.verticesCount] = var8.verticesX[var9]; // L: 159 - this.verticesY[this.verticesCount] = var8.verticesY[var9]; // L: 160 - this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; // L: 161 - ++this.verticesCount; // L: 162 + for (var9 = 0; var9 < var8.verticesCount; ++var9) { + this.verticesX[this.verticesCount] = var8.verticesX[var9]; + this.verticesY[this.verticesCount] = var8.verticesY[var9]; + this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; + ++this.verticesCount; } } } - } // L: 166 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgd;" + descriptor = "([[IIIIZI)Lgl;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBoundsCylinder(); // L: 169 - int var7 = var2 - this.xzRadius; // L: 170 - int var8 = var2 + this.xzRadius; // L: 171 - int var9 = var4 - this.xzRadius; // L: 172 - int var10 = var4 + this.xzRadius; // L: 173 - if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 174 - var7 >>= 7; // L: 175 - var8 = var8 + 127 >> 7; // L: 176 - var9 >>= 7; // L: 177 - var10 = var10 + 127 >> 7; // L: 178 - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 179 + this.calculateBoundsCylinder(); + int var7 = var2 - this.xzRadius; + int var8 = var2 + this.xzRadius; + int var9 = var4 - this.xzRadius; + int var10 = var4 + this.xzRadius; + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + var7 >>= 7; + var8 = var8 + 127 >> 7; + var9 >>= 7; + var10 = var10 + 127 >> 7; + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; } else { Model var11; - if (var5) { // L: 181 - var11 = new Model(); // L: 182 - var11.verticesCount = this.verticesCount; // L: 183 - var11.indicesCount = this.indicesCount; // L: 184 - var11.field2438 = this.field2438; // L: 185 - var11.verticesX = this.verticesX; // L: 186 - var11.verticesZ = this.verticesZ; // L: 187 - var11.indices1 = this.indices1; // L: 188 - var11.indices2 = this.indices2; // L: 189 - var11.indices3 = this.indices3; // L: 190 - var11.faceColors1 = this.faceColors1; // L: 191 - var11.faceColors2 = this.faceColors2; // L: 192 - var11.faceColors3 = this.faceColors3; // L: 193 - var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194 - var11.faceAlphas = this.faceAlphas; // L: 195 - var11.field2448 = this.field2448; // L: 196 - var11.faceTextures = this.faceTextures; // L: 197 - var11.field2437 = this.field2437; // L: 198 - var11.field2449 = this.field2449; // L: 199 - var11.field2440 = this.field2440; // L: 200 - var11.field2441 = this.field2441; // L: 201 - var11.vertexLabels = this.vertexLabels; // L: 202 - var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203 - var11.isSingleTile = this.isSingleTile; // L: 204 - var11.verticesY = new int[var11.verticesCount]; // L: 205 + if (var5) { + var11 = new Model(); + var11.verticesCount = this.verticesCount; + var11.indicesCount = this.indicesCount; + var11.field2423 = this.field2423; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceColors1 = this.faceColors1; + var11.faceColors2 = this.faceColors2; + var11.faceColors3 = this.faceColors3; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.field2440 = this.field2440; + var11.faceTextures = this.faceTextures; + var11.field2441 = this.field2441; + var11.field2453 = this.field2453; + var11.field2425 = this.field2425; + var11.field2426 = this.field2426; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.isSingleTile = this.isSingleTile; + var11.verticesY = new int[var11.verticesCount]; } else { - var11 = this; // L: 208 + var11 = this; } int var12; @@ -422,39 +422,39 @@ public class Model extends Renderable { int var19; int var20; int var21; - if (var6 == 0) { // L: 210 - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 211 - var13 = var2 + this.verticesX[var12]; // L: 212 - var14 = var4 + this.verticesZ[var12]; // L: 213 - var15 = var13 & 127; // L: 214 - var16 = var14 & 127; // L: 215 - var17 = var13 >> 7; // L: 216 - var18 = var14 >> 7; // L: 217 - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 218 - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 219 - var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 220 - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 221 + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 225 - var13 = (-this.verticesY[var12] << 16) / super.height; // L: 226 - if (var13 < var6) { // L: 227 - var14 = var2 + this.verticesX[var12]; // L: 228 - var15 = var4 + this.verticesZ[var12]; // L: 229 - var16 = var14 & 127; // L: 230 - var17 = var15 & 127; // L: 231 - var18 = var14 >> 7; // L: 232 - var19 = var15 >> 7; // L: 233 - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 234 - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 235 - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 236 - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 237 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; } } } - var11.resetBounds(); // L: 241 - return var11; // L: 242 + var11.resetBounds(); + return var11; } } else { return this; @@ -463,454 +463,454 @@ public class Model extends Renderable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Z)Lgd;" + descriptor = "(Z)Lgl;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { - if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 246 + if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247 + return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Z)Lgd;" + descriptor = "(Z)Lgl;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { - if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 251 + if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252 + return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZLgd;[B)Lgd;" + descriptor = "(ZLgl;[B)Lgl;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { - var2.verticesCount = this.verticesCount; // L: 256 - var2.indicesCount = this.indicesCount; // L: 257 - var2.field2438 = this.field2438; // L: 258 - if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 259 - var2.verticesX = new int[this.verticesCount + 100]; // L: 260 - var2.verticesY = new int[this.verticesCount + 100]; // L: 261 - var2.verticesZ = new int[this.verticesCount + 100]; // L: 262 + var2.verticesCount = this.verticesCount; + var2.indicesCount = this.indicesCount; + var2.field2423 = this.field2423; + if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { + var2.verticesX = new int[this.verticesCount + 100]; + var2.verticesY = new int[this.verticesCount + 100]; + var2.verticesZ = new int[this.verticesCount + 100]; } int var4; - for (var4 = 0; var4 < this.verticesCount; ++var4) { // L: 264 - var2.verticesX[var4] = this.verticesX[var4]; // L: 265 - var2.verticesY[var4] = this.verticesY[var4]; // L: 266 - var2.verticesZ[var4] = this.verticesZ[var4]; // L: 267 + for (var4 = 0; var4 < this.verticesCount; ++var4) { + var2.verticesX[var4] = this.verticesX[var4]; + var2.verticesY[var4] = this.verticesY[var4]; + var2.verticesZ[var4] = this.verticesZ[var4]; } - if (var1) { // L: 269 + if (var1) { var2.faceAlphas = this.faceAlphas; } else { - var2.faceAlphas = var3; // L: 271 - if (this.faceAlphas == null) { // L: 272 - for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 273 + var2.faceAlphas = var3; + if (this.faceAlphas == null) { + for (var4 = 0; var4 < this.indicesCount; ++var4) { var2.faceAlphas[var4] = 0; } } else { - for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 276 + for (var4 = 0; var4 < this.indicesCount; ++var4) { var2.faceAlphas[var4] = this.faceAlphas[var4]; } } } - var2.indices1 = this.indices1; // L: 279 - var2.indices2 = this.indices2; // L: 280 - var2.indices3 = this.indices3; // L: 281 - var2.faceColors1 = this.faceColors1; // L: 282 - var2.faceColors2 = this.faceColors2; // L: 283 - var2.faceColors3 = this.faceColors3; // L: 284 - var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285 - var2.field2448 = this.field2448; // L: 286 - var2.faceTextures = this.faceTextures; // L: 287 - var2.field2437 = this.field2437; // L: 288 - var2.field2449 = this.field2449; // L: 289 - var2.field2440 = this.field2440; // L: 290 - var2.field2441 = this.field2441; // L: 291 - var2.vertexLabels = this.vertexLabels; // L: 292 - var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293 - var2.isSingleTile = this.isSingleTile; // L: 294 - var2.resetBounds(); // L: 295 - return var2; // L: 296 + var2.indices1 = this.indices1; + var2.indices2 = this.indices2; + var2.indices3 = this.indices3; + var2.faceColors1 = this.faceColors1; + var2.faceColors2 = this.faceColors2; + var2.faceColors3 = this.faceColors3; + var2.faceRenderPriorities = this.faceRenderPriorities; + var2.field2440 = this.field2440; + var2.faceTextures = this.faceTextures; + var2.field2441 = this.field2441; + var2.field2453 = this.field2453; + var2.field2425 = this.field2425; + var2.field2426 = this.field2426; + var2.vertexLabels = this.vertexLabels; + var2.faceLabelsAlpha = this.faceLabelsAlpha; + var2.isSingleTile = this.isSingleTile; + var2.resetBounds(); + return var2; } - @ObfuscatedName("m") + @ObfuscatedName("n") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { - if (this.xMidOffset == -1) { // L: 300 - int var2 = 0; // L: 301 - int var3 = 0; // L: 302 - int var4 = 0; // L: 303 - int var5 = 0; // L: 304 - int var6 = 0; // L: 305 - int var7 = 0; // L: 306 - int var8 = Model_cosine[var1]; // L: 307 - int var9 = Model_sine[var1]; // L: 308 + if (this.xMidOffset == -1) { + int var2 = 0; + int var3 = 0; + int var4 = 0; + int var5 = 0; + int var6 = 0; + int var7 = 0; + int var8 = Model_cosine[var1]; + int var9 = Model_sine[var1]; - for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309 - int var11 = Rasterizer3D.method3969(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 - int var12 = this.verticesY[var10]; // L: 311 - int var13 = Rasterizer3D.method3970(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 - if (var11 < var2) { // L: 313 + for (int var10 = 0; var10 < this.verticesCount; ++var10) { + int var11 = Rasterizer3D.method3910(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var12 = this.verticesY[var10]; + int var13 = Rasterizer3D.method3891(this.verticesX[var10], this.verticesZ[var10], var8, var9); + if (var11 < var2) { var2 = var11; } - if (var11 > var5) { // L: 314 + if (var11 > var5) { var5 = var11; } - if (var12 < var3) { // L: 315 + if (var12 < var3) { var3 = var12; } - if (var12 > var6) { // L: 316 + if (var12 > var6) { var6 = var12; } - if (var13 < var4) { // L: 317 + if (var13 < var4) { var4 = var13; } - if (var13 > var7) { // L: 318 + if (var13 > var7) { var7 = var13; } } - this.xMid = (var5 + var2) / 2; // L: 320 - this.yMid = (var6 + var3) / 2; // L: 321 - this.zMid = (var7 + var4) / 2; // L: 322 - this.xMidOffset = (var5 - var2 + 1) / 2; // L: 323 - this.yMidOffset = (var6 - var3 + 1) / 2; // L: 324 - this.zMidOffset = (var7 - var4 + 1) / 2; // L: 325 - if (this.xMidOffset < 32) { // L: 327 + this.xMid = (var5 + var2) / 2; + this.yMid = (var6 + var3) / 2; + this.zMid = (var7 + var4) / 2; + this.xMidOffset = (var5 - var2 + 1) / 2; + this.yMidOffset = (var6 - var3 + 1) / 2; + this.zMidOffset = (var7 - var4 + 1) / 2; + if (this.xMidOffset < 32) { this.xMidOffset = 32; } - if (this.zMidOffset < 32) { // L: 328 + if (this.zMidOffset < 32) { this.zMidOffset = 32; } - if (this.isSingleTile) { // L: 329 - this.xMidOffset += 8; // L: 331 - this.zMidOffset += 8; // L: 332 + if (this.isSingleTile) { + this.xMidOffset += 8; + this.zMidOffset += 8; } } - } // L: 334 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { - if (this.boundsType != 1) { // L: 337 - this.boundsType = 1; // L: 338 - super.height = 0; // L: 339 - this.bottomY = 0; // L: 340 - this.xzRadius = 0; // L: 341 + if (this.boundsType != 1) { + this.boundsType = 1; + super.height = 0; + this.bottomY = 0; + this.xzRadius = 0; - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 342 - int var2 = this.verticesX[var1]; // L: 343 - int var3 = this.verticesY[var1]; // L: 344 - int var4 = this.verticesZ[var1]; // L: 345 - if (-var3 > super.height) { // L: 346 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.bottomY) { // L: 347 + if (var3 > this.bottomY) { this.bottomY = var3; } - int var5 = var2 * var2 + var4 * var4; // L: 348 - if (var5 > this.xzRadius) { // L: 349 + int var5 = var2 * var2 + var4 * var4; + if (var5 > this.xzRadius) { this.xzRadius = var5; } } - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 351 - this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); // L: 352 - this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); // L: 353 + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); + this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); + this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); } - } // L: 354 - - @ObfuscatedName("h") - void method4307() { - if (this.boundsType != 2) { // L: 357 - this.boundsType = 2; // L: 358 - this.xzRadius = 0; // L: 359 - - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 360 - int var2 = this.verticesX[var1]; // L: 361 - int var3 = this.verticesY[var1]; // L: 362 - int var4 = this.verticesZ[var1]; // L: 363 - int var5 = var2 * var2 + var4 * var4 + var3 * var3; // L: 364 - if (var5 > this.xzRadius) { // L: 365 - this.xzRadius = var5; - } - } - - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 367 - this.radius = this.xzRadius; // L: 368 - this.diameter = this.xzRadius + this.xzRadius; // L: 369 - } - } // L: 370 - - @ObfuscatedName("d") - public int method4331() { - this.calculateBoundsCylinder(); // L: 373 - return this.xzRadius; // L: 374 } - @ObfuscatedName("z") + @ObfuscatedName("o") + void method4211() { + if (this.boundsType != 2) { + this.boundsType = 2; + this.xzRadius = 0; + + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + int var5 = var2 * var2 + var4 * var4 + var3 * var3; + if (var5 > this.xzRadius) { + this.xzRadius = var5; + } + } + + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); + this.radius = this.xzRadius; + this.diameter = this.xzRadius + this.xzRadius; + } + } + + @ObfuscatedName("x") + public int method4212() { + this.calculateBoundsCylinder(); + return this.xzRadius; + } + + @ObfuscatedName("r") @Export("resetBounds") void resetBounds() { - this.boundsType = 0; // L: 378 - this.xMidOffset = -1; // L: 379 - } // L: 380 + this.boundsType = 0; + this.xMidOffset = -1; + } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lgi;I)V" + descriptor = "(Lga;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { - if (this.vertexLabels != null) { // L: 383 - if (var2 != -1) { // L: 384 - Animation var3 = var1.frames[var2]; // L: 385 - Skeleton var4 = var3.skeleton; // L: 386 - Model_transformTempX = 0; // L: 387 - Model_transformTempY = 0; // L: 388 - Model_transformTempZ = 0; // L: 389 + if (this.vertexLabels != null) { + if (var2 != -1) { + Animation var3 = var1.frames[var2]; + Skeleton var4 = var3.skeleton; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; - for (int var5 = 0; var5 < var3.transformCount; ++var5) { // L: 390 - int var6 = var3.transformSkeletonLabels[var5]; // L: 391 - this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); // L: 392 + for (int var5 = 0; var5 < var3.transformCount; ++var5) { + int var6 = var3.transformSkeletonLabels[var5]; + this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); } - this.resetBounds(); // L: 394 + this.resetBounds(); } } - } // L: 395 + } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lgi;ILgi;I[I)V" + descriptor = "(Lga;ILga;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { - if (var2 != -1) { // L: 398 - if (var5 != null && var4 != -1) { // L: 399 - Animation var6 = var1.frames[var2]; // L: 403 - Animation var7 = var3.frames[var4]; // L: 404 - Skeleton var8 = var6.skeleton; // L: 405 - Model_transformTempX = 0; // L: 406 - Model_transformTempY = 0; // L: 407 - Model_transformTempZ = 0; // L: 408 - byte var9 = 0; // L: 409 - int var13 = var9 + 1; // L: 410 + if (var2 != -1) { + if (var5 != null && var4 != -1) { + Animation var6 = var1.frames[var2]; + Animation var7 = var3.frames[var4]; + Skeleton var8 = var6.skeleton; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; + byte var9 = 0; + int var13 = var9 + 1; int var10 = var5[var9]; int var11; int var12; - for (var11 = 0; var11 < var6.transformCount; ++var11) { // L: 411 - for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 412 413 + for (var11 = 0; var11 < var6.transformCount; ++var11) { + for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { } - if (var12 != var10 || var8.transformTypes[var12] == 0) { // L: 414 + if (var12 != var10 || var8.transformTypes[var12] == 0) { this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]); } } - Model_transformTempX = 0; // L: 416 - Model_transformTempY = 0; // L: 417 - Model_transformTempZ = 0; // L: 418 - var9 = 0; // L: 419 - var13 = var9 + 1; // L: 420 + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; + var9 = 0; + var13 = var9 + 1; var10 = var5[var9]; - for (var11 = 0; var11 < var7.transformCount; ++var11) { // L: 421 - for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 422 423 + for (var11 = 0; var11 < var7.transformCount; ++var11) { + for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { } - if (var12 == var10 || var8.transformTypes[var12] == 0) { // L: 424 + if (var12 == var10 || var8.transformTypes[var12] == 0) { this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); } } - this.resetBounds(); // L: 426 + this.resetBounds(); } else { - this.animate(var1, var2); // L: 400 + this.animate(var1, var2); } } - } // L: 401 427 + } @ObfuscatedName("k") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { - int var6 = var2.length; // L: 430 + int var6 = var2.length; int var7; int var8; int var11; int var12; - if (var1 == 0) { // L: 431 - var7 = 0; // L: 432 - Model_transformTempX = 0; // L: 433 - Model_transformTempY = 0; // L: 434 - Model_transformTempZ = 0; // L: 435 + if (var1 == 0) { + var7 = 0; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; - for (var8 = 0; var8 < var6; ++var8) { // L: 436 - int var18 = var2[var8]; // L: 437 - if (var18 < this.vertexLabels.length) { // L: 438 - int[] var19 = this.vertexLabels[var18]; // L: 439 + for (var8 = 0; var8 < var6; ++var8) { + int var18 = var2[var8]; + if (var18 < this.vertexLabels.length) { + int[] var19 = this.vertexLabels[var18]; - for (var11 = 0; var11 < var19.length; ++var11) { // L: 440 - var12 = var19[var11]; // L: 441 - Model_transformTempX += this.verticesX[var12]; // L: 442 - Model_transformTempY += this.verticesY[var12]; // L: 443 - Model_transformTempZ += this.verticesZ[var12]; // L: 444 - ++var7; // L: 445 + for (var11 = 0; var11 < var19.length; ++var11) { + var12 = var19[var11]; + Model_transformTempX += this.verticesX[var12]; + Model_transformTempY += this.verticesY[var12]; + Model_transformTempZ += this.verticesZ[var12]; + ++var7; } } } - if (var7 > 0) { // L: 449 - Model_transformTempX = var3 + Model_transformTempX / var7; // L: 450 - Model_transformTempY = var4 + Model_transformTempY / var7; // L: 451 - Model_transformTempZ = var5 + Model_transformTempZ / var7; // L: 452 + if (var7 > 0) { + Model_transformTempX = var3 + Model_transformTempX / var7; + Model_transformTempY = var4 + Model_transformTempY / var7; + Model_transformTempZ = var5 + Model_transformTempZ / var7; } else { - Model_transformTempX = var3; // L: 455 - Model_transformTempY = var4; // L: 456 - Model_transformTempZ = var5; // L: 457 + Model_transformTempX = var3; + Model_transformTempY = var4; + Model_transformTempZ = var5; } } else { int[] var9; int var10; int[] var10000; - if (var1 == 1) { // L: 461 - for (var7 = 0; var7 < var6; ++var7) { // L: 462 - var8 = var2[var7]; // L: 463 - if (var8 < this.vertexLabels.length) { // L: 464 - var9 = this.vertexLabels[var8]; // L: 465 + if (var1 == 1) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var9 = this.vertexLabels[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 466 - var11 = var9[var10]; // L: 467 - var10000 = this.verticesX; // L: 468 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var10000 = this.verticesX; var10000[var11] += var3; - var10000 = this.verticesY; // L: 469 + var10000 = this.verticesY; var10000[var11] += var4; - var10000 = this.verticesZ; // L: 470 + var10000 = this.verticesZ; var10000[var11] += var5; } } } - } else if (var1 == 2) { // L: 476 - for (var7 = 0; var7 < var6; ++var7) { // L: 477 - var8 = var2[var7]; // L: 478 - if (var8 < this.vertexLabels.length) { // L: 479 - var9 = this.vertexLabels[var8]; // L: 480 + } else if (var1 == 2) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var9 = this.vertexLabels[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 481 - var11 = var9[var10]; // L: 482 - var10000 = this.verticesX; // L: 483 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var10000 = this.verticesX; var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; // L: 484 + var10000 = this.verticesY; var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; // L: 485 + var10000 = this.verticesZ; var10000[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; // L: 486 - int var13 = (var4 & 255) * 8; // L: 487 - int var14 = (var5 & 255) * 8; // L: 488 + var12 = (var3 & 255) * 8; + int var13 = (var4 & 255) * 8; + int var14 = (var5 & 255) * 8; int var15; int var16; int var17; - if (var14 != 0) { // L: 489 - var15 = Model_sine[var14]; // L: 490 - var16 = Model_cosine[var14]; // L: 491 - var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; // L: 492 - this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; // L: 493 - this.verticesX[var11] = var17; // L: 494 + if (var14 != 0) { + var15 = Model_sine[var14]; + var16 = Model_cosine[var14]; + var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; } - if (var12 != 0) { // L: 496 - var15 = Model_sine[var12]; // L: 497 - var16 = Model_cosine[var12]; // L: 498 - var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; // L: 499 - this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; // L: 500 - this.verticesY[var11] = var17; // L: 501 + if (var12 != 0) { + var15 = Model_sine[var12]; + var16 = Model_cosine[var12]; + var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; + this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; + this.verticesY[var11] = var17; } - if (var13 != 0) { // L: 503 - var15 = Model_sine[var13]; // L: 504 - var16 = Model_cosine[var13]; // L: 505 - var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; // L: 506 - this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; // L: 507 - this.verticesX[var11] = var17; // L: 508 + if (var13 != 0) { + var15 = Model_sine[var13]; + var16 = Model_cosine[var13]; + var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; } - var10000 = this.verticesX; // L: 510 + var10000 = this.verticesX; var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; // L: 511 + var10000 = this.verticesY; var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; // L: 512 + var10000 = this.verticesZ; var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 3) { // L: 518 - for (var7 = 0; var7 < var6; ++var7) { // L: 519 - var8 = var2[var7]; // L: 520 - if (var8 < this.vertexLabels.length) { // L: 521 - var9 = this.vertexLabels[var8]; // L: 522 + } else if (var1 == 3) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var9 = this.vertexLabels[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 523 - var11 = var9[var10]; // L: 524 - var10000 = this.verticesX; // L: 525 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var10000 = this.verticesX; var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; // L: 526 + var10000 = this.verticesY; var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; // L: 527 + var10000 = this.verticesZ; var10000[var11] -= Model_transformTempZ; - this.verticesX[var11] = var3 * this.verticesX[var11] / 128; // L: 528 - this.verticesY[var11] = var4 * this.verticesY[var11] / 128; // L: 529 - this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; // L: 530 - var10000 = this.verticesX; // L: 531 + this.verticesX[var11] = var3 * this.verticesX[var11] / 128; + this.verticesY[var11] = var4 * this.verticesY[var11] / 128; + this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; + var10000 = this.verticesX; var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; // L: 532 + var10000 = this.verticesY; var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; // L: 533 + var10000 = this.verticesZ; var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 5) { // L: 539 - if (this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 540 - for (var7 = 0; var7 < var6; ++var7) { // L: 541 - var8 = var2[var7]; // L: 542 - if (var8 < this.faceLabelsAlpha.length) { // L: 543 - var9 = this.faceLabelsAlpha[var8]; // L: 544 + } else if (var1 == 5) { + if (this.faceLabelsAlpha != null && this.faceAlphas != null) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.faceLabelsAlpha.length) { + var9 = this.faceLabelsAlpha[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 545 - var11 = var9[var10]; // L: 546 - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; // L: 547 - if (var12 < 0) { // L: 548 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var12 = (this.faceAlphas[var11] & 255) + var3 * 8; + if (var12 < 0) { var12 = 0; - } else if (var12 > 255) { // L: 549 + } else if (var12 > 255) { var12 = 255; } - this.faceAlphas[var11] = (byte)var12; // L: 550 + this.faceAlphas[var11] = (byte)var12; } } } @@ -918,223 +918,223 @@ public class Model extends Renderable { } } - } // L: 459 474 516 537 555 557 + } - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("rotateY90Ccw") public void rotateY90Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560 - int var2 = this.verticesX[var1]; // L: 561 - this.verticesX[var1] = this.verticesZ[var1]; // L: 562 - this.verticesZ[var1] = -var2; // L: 563 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + this.verticesX[var1] = this.verticesZ[var1]; + this.verticesZ[var1] = -var2; } - this.resetBounds(); // L: 565 - } // L: 566 - - @ObfuscatedName("t") - @Export("rotateY180") - public void rotateY180() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 - this.verticesX[var1] = -this.verticesX[var1]; // L: 570 - this.verticesZ[var1] = -this.verticesZ[var1]; // L: 571 - } - - this.resetBounds(); // L: 573 - } // L: 574 - - @ObfuscatedName("x") - @Export("rotateY270Ccw") - public void rotateY270Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 - int var2 = this.verticesZ[var1]; // L: 578 - this.verticesZ[var1] = this.verticesX[var1]; // L: 579 - this.verticesX[var1] = -var2; // L: 580 - } - - this.resetBounds(); // L: 582 - } // L: 583 - - @ObfuscatedName("u") - @Export("rotateZ") - public void rotateZ(int var1) { - int var2 = Model_sine[var1]; // L: 586 - int var3 = Model_cosine[var1]; // L: 587 - - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 588 - int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; // L: 589 - this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; // L: 590 - this.verticesY[var4] = var5; // L: 591 - } - - this.resetBounds(); // L: 593 - } // L: 594 + this.resetBounds(); + } @ObfuscatedName("q") + @Export("rotateY180") + public void rotateY180() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + this.verticesX[var1] = -this.verticesX[var1]; + this.verticesZ[var1] = -this.verticesZ[var1]; + } + + this.resetBounds(); + } + + @ObfuscatedName("u") + @Export("rotateY270Ccw") + public void rotateY270Ccw() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesZ[var1]; + this.verticesZ[var1] = this.verticesX[var1]; + this.verticesX[var1] = -var2; + } + + this.resetBounds(); + } + + @ObfuscatedName("e") + @Export("rotateZ") + public void rotateZ(int var1) { + int var2 = Model_sine[var1]; + int var3 = Model_cosine[var1]; + + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; + this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; + this.verticesY[var4] = var5; + } + + this.resetBounds(); + } + + @ObfuscatedName("c") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 - int[] var10000 = this.verticesX; // L: 598 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int[] var10000 = this.verticesX; var10000[var4] += var1; - var10000 = this.verticesY; // L: 599 + var10000 = this.verticesY; var10000[var4] += var2; - var10000 = this.verticesZ; // L: 600 + var10000 = this.verticesZ; var10000[var4] += var3; } - this.resetBounds(); // L: 602 - } // L: 603 + this.resetBounds(); + } - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("scale") public void scale(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 607 - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 608 - this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 609 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; } - this.resetBounds(); // L: 611 - } // L: 612 + this.resetBounds(); + } - @ObfuscatedName("p") - public final void method4347(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2466[0] = -1; // L: 615 - if (this.boundsType != 2 && this.boundsType != 1) { // L: 616 - this.method4307(); + @ObfuscatedName("m") + public final void method4260(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2451[0] = -1; + if (this.boundsType != 2 && this.boundsType != 1) { + this.method4211(); } - int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617 - int var9 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 618 - int var10 = Model_sine[var1]; // L: 619 - int var11 = Model_cosine[var1]; // L: 620 - int var12 = Model_sine[var2]; // L: 621 - int var13 = Model_cosine[var2]; // L: 622 - int var14 = Model_sine[var3]; // L: 623 - int var15 = Model_cosine[var3]; // L: 624 - int var16 = Model_sine[var4]; // L: 625 - int var17 = Model_cosine[var4]; // L: 626 - int var18 = var16 * var6 + var17 * var7 >> 16; // L: 627 + int var8 = Rasterizer3D.Rasterizer3D_clipMidX; + int var9 = Rasterizer3D.Rasterizer3D_clipMidY; + int var10 = Model_sine[var1]; + int var11 = Model_cosine[var1]; + int var12 = Model_sine[var2]; + int var13 = Model_cosine[var2]; + int var14 = Model_sine[var3]; + int var15 = Model_cosine[var3]; + int var16 = Model_sine[var4]; + int var17 = Model_cosine[var4]; + int var18 = var16 * var6 + var17 * var7 >> 16; - for (int var19 = 0; var19 < this.verticesCount; ++var19) { // L: 628 - int var20 = this.verticesX[var19]; // L: 629 - int var21 = this.verticesY[var19]; // L: 630 - int var22 = this.verticesZ[var19]; // L: 631 + for (int var19 = 0; var19 < this.verticesCount; ++var19) { + int var20 = this.verticesX[var19]; + int var21 = this.verticesY[var19]; + int var22 = this.verticesZ[var19]; int var23; - if (var3 != 0) { // L: 632 - var23 = var21 * var14 + var20 * var15 >> 16; // L: 633 - var21 = var21 * var15 - var20 * var14 >> 16; // L: 634 - var20 = var23; // L: 635 + if (var3 != 0) { + var23 = var21 * var14 + var20 * var15 >> 16; + var21 = var21 * var15 - var20 * var14 >> 16; + var20 = var23; } - if (var1 != 0) { // L: 637 - var23 = var21 * var11 - var22 * var10 >> 16; // L: 638 - var22 = var21 * var10 + var22 * var11 >> 16; // L: 639 - var21 = var23; // L: 640 + if (var1 != 0) { + var23 = var21 * var11 - var22 * var10 >> 16; + var22 = var21 * var10 + var22 * var11 >> 16; + var21 = var23; } - if (var2 != 0) { // L: 642 - var23 = var22 * var12 + var20 * var13 >> 16; // L: 643 - var22 = var22 * var13 - var20 * var12 >> 16; // L: 644 - var20 = var23; // L: 645 + if (var2 != 0) { + var23 = var22 * var12 + var20 * var13 >> 16; + var22 = var22 * var13 - var20 * var12 >> 16; + var20 = var23; } - var20 += var5; // L: 647 - var21 += var6; // L: 648 - var22 += var7; // L: 649 - var23 = var21 * var17 - var22 * var16 >> 16; // L: 650 - var22 = var21 * var16 + var22 * var17 >> 16; // L: 651 - field2461[var19] = var22 - var18; // L: 653 - modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 654 - modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 655 - if (this.field2438 > 0) { // L: 656 - field2435[var19] = var20; // L: 657 - field2463[var19] = var23; // L: 658 - field2477[var19] = var22; // L: 659 + var20 += var5; + var21 += var6; + var22 += var7; + var23 = var21 * var17 - var22 * var16 >> 16; + var22 = var21 * var16 + var22 * var17 >> 16; + field2446[var19] = var22 - var18; + modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; + modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; + if (this.field2423 > 0) { + field2447[var19] = var20; + field2448[var19] = var23; + field2449[var19] = var22; } } try { - this.draw0(false, false, false, 0L); // L: 663 - } catch (Exception var25) { // L: 665 + this.draw0(false, false, false, 0L); + } catch (Exception var25) { } - } // L: 666 + } - @ObfuscatedName("c") - public final void method4309(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2466[0] = -1; // L: 669 - if (this.boundsType != 2 && this.boundsType != 1) { // L: 670 - this.method4307(); + @ObfuscatedName("b") + public final void method4223(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2451[0] = -1; + if (this.boundsType != 2 && this.boundsType != 1) { + this.method4211(); } - int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671 - int var10 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 672 - int var11 = Model_sine[var1]; // L: 673 - int var12 = Model_cosine[var1]; // L: 674 - int var13 = Model_sine[var2]; // L: 675 - int var14 = Model_cosine[var2]; // L: 676 - int var15 = Model_sine[var3]; // L: 677 - int var16 = Model_cosine[var3]; // L: 678 - int var17 = Model_sine[var4]; // L: 679 - int var18 = Model_cosine[var4]; // L: 680 - int var19 = var17 * var6 + var18 * var7 >> 16; // L: 681 + int var9 = Rasterizer3D.Rasterizer3D_clipMidX; + int var10 = Rasterizer3D.Rasterizer3D_clipMidY; + int var11 = Model_sine[var1]; + int var12 = Model_cosine[var1]; + int var13 = Model_sine[var2]; + int var14 = Model_cosine[var2]; + int var15 = Model_sine[var3]; + int var16 = Model_cosine[var3]; + int var17 = Model_sine[var4]; + int var18 = Model_cosine[var4]; + int var19 = var17 * var6 + var18 * var7 >> 16; - for (int var20 = 0; var20 < this.verticesCount; ++var20) { // L: 682 - int var21 = this.verticesX[var20]; // L: 683 - int var22 = this.verticesY[var20]; // L: 684 - int var23 = this.verticesZ[var20]; // L: 685 + for (int var20 = 0; var20 < this.verticesCount; ++var20) { + int var21 = this.verticesX[var20]; + int var22 = this.verticesY[var20]; + int var23 = this.verticesZ[var20]; int var24; - if (var3 != 0) { // L: 686 - var24 = var22 * var15 + var21 * var16 >> 16; // L: 687 - var22 = var22 * var16 - var21 * var15 >> 16; // L: 688 - var21 = var24; // L: 689 + if (var3 != 0) { + var24 = var22 * var15 + var21 * var16 >> 16; + var22 = var22 * var16 - var21 * var15 >> 16; + var21 = var24; } - if (var1 != 0) { // L: 691 - var24 = var22 * var12 - var23 * var11 >> 16; // L: 692 - var23 = var22 * var11 + var23 * var12 >> 16; // L: 693 - var22 = var24; // L: 694 + if (var1 != 0) { + var24 = var22 * var12 - var23 * var11 >> 16; + var23 = var22 * var11 + var23 * var12 >> 16; + var22 = var24; } - if (var2 != 0) { // L: 696 - var24 = var23 * var13 + var21 * var14 >> 16; // L: 697 - var23 = var23 * var14 - var21 * var13 >> 16; // L: 698 - var21 = var24; // L: 699 + if (var2 != 0) { + var24 = var23 * var13 + var21 * var14 >> 16; + var23 = var23 * var14 - var21 * var13 >> 16; + var21 = var24; } - var21 += var5; // L: 701 - var22 += var6; // L: 702 - var23 += var7; // L: 703 - var24 = var22 * var18 - var23 * var17 >> 16; // L: 704 - var23 = var22 * var17 + var23 * var18 >> 16; // L: 705 - field2461[var20] = var23 - var19; // L: 707 - modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 708 - modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 709 - if (this.field2438 > 0) { // L: 710 - field2435[var20] = var21; // L: 711 - field2463[var20] = var24; // L: 712 - field2477[var20] = var23; // L: 713 + var21 += var5; + var22 += var6; + var23 += var7; + var24 = var22 * var18 - var23 * var17 >> 16; + var23 = var22 * var17 + var23 * var18 >> 16; + field2446[var20] = var23 - var19; + modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; + modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; + if (this.field2423 > 0) { + field2447[var20] = var21; + field2448[var20] = var24; + field2449[var20] = var23; } } try { - this.draw0(false, false, false, 0L); // L: 717 - } catch (Exception var26) { // L: 719 + this.draw0(false, false, false, 0L); + } catch (Exception var26) { } - } // L: 720 + } - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 922 + if (this.diameter < 1600) { int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 923 - field2466[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { + field2451[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 924 + var6 = var3 ? 20 : 5; int var7; int var8; @@ -1146,623 +1146,559 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 925 - if (this.faceColors3[var7] != -2) { // L: 926 - var8 = this.indices1[var7]; // L: 927 - var9 = this.indices2[var7]; // L: 928 - var10 = this.indices3[var7]; // L: 929 - var11 = modelViewportXs[var8]; // L: 930 - var12 = modelViewportXs[var9]; // L: 931 - var28 = modelViewportXs[var10]; // L: 932 - int var29; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 933 - if (var2 && FontName.method6331(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 959 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 962 - var2 = false; // L: 964 + for (var7 = 0; var7 < this.indicesCount; ++var7) { + if (this.faceColors3[var7] != -2) { + var8 = this.indices1[var7]; + var9 = this.indices2[var7]; + var10 = this.indices3[var7]; + var11 = modelViewportXs[var8]; + var12 = modelViewportXs[var9]; + var28 = modelViewportXs[var10]; + int var31; + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { + if (var2 && NetCache.method5089(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; + var2 = false; } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 966 - field2458[var7] = false; // L: 967 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 968 - field2469[var7] = false; // L: 969 + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { + field2443[var7] = false; + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field2432[var7] = false; } else { - field2469[var7] = true; + field2432[var7] = true; } - var29 = (field2461[var8] + field2461[var9] + field2461[var10]) / 3 + this.radius; // L: 970 - field2451[var29][field2466[var29]++] = var7; // L: 971 + var31 = (field2446[var8] + field2446[var9] + field2446[var10]) / 3 + this.radius; + field2468[var31][field2451[var31]++] = var7; } } else { - var29 = field2435[var8]; // L: 934 - var15 = field2435[var9]; // L: 935 - var16 = field2435[var10]; // L: 936 - int var30 = field2463[var8]; // L: 937 - var18 = field2463[var9]; // L: 938 - int var19 = field2463[var10]; // L: 939 - int var20 = field2477[var8]; // L: 940 - int var21 = field2477[var9]; // L: 941 - int var22 = field2477[var10]; // L: 942 - var29 -= var15; // L: 943 - var16 -= var15; // L: 944 - var30 -= var18; // L: 945 - var19 -= var18; // L: 946 - var20 -= var21; // L: 947 - var22 -= var21; // L: 948 - int var23 = var30 * var22 - var20 * var19; // L: 949 - int var24 = var20 * var16 - var29 * var22; // L: 950 - int var25 = var29 * var19 - var30 * var16; // L: 951 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 952 - field2458[var7] = true; // L: 953 - int var26 = (field2461[var8] + field2461[var9] + field2461[var10]) / 3 + this.radius; // L: 954 - field2451[var26][field2466[var26]++] = var7; // L: 955 + var31 = field2447[var8]; + var15 = field2447[var9]; + var16 = field2447[var10]; + int var32 = field2448[var8]; + var18 = field2448[var9]; + int var19 = field2448[var10]; + int var20 = field2449[var8]; + int var21 = field2449[var9]; + int var22 = field2449[var10]; + var31 -= var15; + var16 -= var15; + var32 -= var18; + var19 -= var18; + var20 -= var21; + var22 -= var21; + int var23 = var32 * var22 - var20 * var19; + int var24 = var20 * var16 - var31 * var22; + int var25 = var31 * var19 - var32 * var16; + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { + field2443[var7] = true; + int var26 = (field2446[var8] + field2446[var9] + field2446[var10]) / 3 + this.radius; + field2468[var26][field2451[var26]++] = var7; } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 975 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 976 - var8 = field2466[var7]; // L: 977 - if (var8 > 0) { // L: 978 - var27 = field2451[var7]; // L: 979 + if (this.faceRenderPriorities == null) { + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field2451[var7]; + if (var8 > 0) { + var27 = field2468[var7]; - for (var10 = 0; var10 < var8; ++var10) { // L: 980 + for (var10 = 0; var10 < var8; ++var10) { this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 985 - field2468[var7] = 0; // L: 986 - field2472[var7] = 0; // L: 987 + for (var7 = 0; var7 < 12; ++var7) { + field2435[var7] = 0; + field2422[var7] = 0; } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 989 - var8 = field2466[var7]; // L: 990 - if (var8 > 0) { // L: 991 - var27 = field2451[var7]; // L: 992 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field2451[var7]; + if (var8 > 0) { + var27 = field2468[var7]; - for (var10 = 0; var10 < var8; ++var10) { // L: 993 - var11 = var27[var10]; // L: 994 - byte var33 = this.faceRenderPriorities[var11]; // L: 995 - var28 = field2468[var33]++; // L: 996 - field2467[var33][var28] = var11; // L: 997 - if (var33 < 10) { // L: 998 - int[] var10000 = field2472; + for (var10 = 0; var10 < var8; ++var10) { + var11 = var27[var10]; + byte var33 = this.faceRenderPriorities[var11]; + var28 = field2435[var33]++; + field2454[var33][var28] = var11; + if (var33 < 10) { + int[] var10000 = field2422; var10000[var33] += var7; - } else if (var33 == 10) { // L: 999 - field2470[var28] = var7; + } else if (var33 == 10) { + field2455[var28] = var7; } else { - field2422[var28] = var7; // L: 1000 + field2456[var28] = var7; } } } } - var7 = 0; // L: 1004 - if (field2468[1] > 0 || field2468[2] > 0) { // L: 1005 - var7 = (field2472[1] + field2472[2]) / (field2468[1] + field2468[2]); + var7 = 0; + if (field2435[1] > 0 || field2435[2] > 0) { + var7 = (field2422[1] + field2422[2]) / (field2435[1] + field2435[2]); } - var8 = 0; // L: 1006 - if (field2468[3] > 0 || field2468[4] > 0) { // L: 1007 - var8 = (field2472[3] + field2472[4]) / (field2468[3] + field2468[4]); + var8 = 0; + if (field2435[3] > 0 || field2435[4] > 0) { + var8 = (field2422[3] + field2422[4]) / (field2435[3] + field2435[4]); } - var9 = 0; // L: 1008 - if (field2468[6] > 0 || field2468[8] > 0) { // L: 1009 - var9 = (field2472[8] + field2472[6]) / (field2468[8] + field2468[6]); + var9 = 0; + if (field2435[6] > 0 || field2435[8] > 0) { + var9 = (field2422[8] + field2422[6]) / (field2435[8] + field2435[6]); } - var11 = 0; // L: 1011 - var12 = field2468[10]; // L: 1012 - int[] var13 = field2467[10]; // L: 1013 - int[] var14 = field2470; // L: 1014 - if (var11 == var12) { // L: 1015 - var11 = 0; // L: 1016 - var12 = field2468[11]; // L: 1017 - var13 = field2467[11]; // L: 1018 - var14 = field2422; // L: 1019 + var11 = 0; + var12 = field2435[10]; + int[] var13 = field2454[10]; + int[] var14 = field2455; + if (var11 == var12) { + var11 = 0; + var12 = field2435[11]; + var13 = field2454[11]; + var14 = field2456; } - if (var11 < var12) { // L: 1021 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1022 + var10 = -1000; } - for (var15 = 0; var15 < 10; ++var15) { // L: 1023 - while (var15 == 0 && var10 > var7) { // L: 1024 - this.drawFace(var13[var11++]); // L: 1025 - if (var11 == var12 && var13 != field2467[11]) { // L: 1026 - var11 = 0; // L: 1027 - var12 = field2468[11]; // L: 1028 - var13 = field2467[11]; // L: 1029 - var14 = field2422; // L: 1030 + for (var15 = 0; var15 < 10; ++var15) { + while (var15 == 0 && var10 > var7) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2454[11]) { + var11 = 0; + var12 = field2435[11]; + var13 = field2454[11]; + var14 = field2456; } - if (var11 < var12) { // L: 1032 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1033 + var10 = -1000; } } - while (var15 == 3 && var10 > var8) { // L: 1035 - this.drawFace(var13[var11++]); // L: 1036 - if (var11 == var12 && var13 != field2467[11]) { // L: 1037 - var11 = 0; // L: 1038 - var12 = field2468[11]; // L: 1039 - var13 = field2467[11]; // L: 1040 - var14 = field2422; // L: 1041 + while (var15 == 3 && var10 > var8) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2454[11]) { + var11 = 0; + var12 = field2435[11]; + var13 = field2454[11]; + var14 = field2456; } - if (var11 < var12) { // L: 1043 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1044 + var10 = -1000; } } - while (var15 == 5 && var10 > var9) { // L: 1046 - this.drawFace(var13[var11++]); // L: 1047 - if (var11 == var12 && var13 != field2467[11]) { // L: 1048 - var11 = 0; // L: 1049 - var12 = field2468[11]; // L: 1050 - var13 = field2467[11]; // L: 1051 - var14 = field2422; // L: 1052 + while (var15 == 5 && var10 > var9) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2454[11]) { + var11 = 0; + var12 = field2435[11]; + var13 = field2454[11]; + var14 = field2456; } - if (var11 < var12) { // L: 1054 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1055 + var10 = -1000; } } - var16 = field2468[var15]; // L: 1057 - int[] var17 = field2467[var15]; // L: 1058 + var16 = field2435[var15]; + int[] var17 = field2454[var15]; - for (var18 = 0; var18 < var16; ++var18) { // L: 1059 - this.drawFace(var17[var18]); // L: 1060 + for (var18 = 0; var18 < var16; ++var18) { + this.drawFace(var17[var18]); } } - while (var10 != -1000) { // L: 1063 - this.drawFace(var13[var11++]); // L: 1064 - if (var11 == var12 && var13 != field2467[11]) { // L: 1065 - var11 = 0; // L: 1066 - var13 = field2467[11]; // L: 1067 - var12 = field2468[11]; // L: 1068 - var14 = field2422; // L: 1069 + while (var10 != -1000) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2454[11]) { + var11 = 0; + var13 = field2454[11]; + var12 = field2435[11]; + var14 = field2456; } - if (var11 < var12) { // L: 1071 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1072 + var10 = -1000; } } } } - } // L: 983 1074 + } - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("drawFace") final void drawFace(int var1) { - if (field2458[var1]) { // L: 1077 - this.method4320(var1); // L: 1078 + if (field2443[var1]) { + this.method4216(var1); } else { - int var2 = this.indices1[var1]; // L: 1081 - int var3 = this.indices2[var1]; // L: 1082 - int var4 = this.indices3[var1]; // L: 1083 - Rasterizer3D.field2262 = field2469[var1]; // L: 1084 - if (this.faceAlphas == null) { // L: 1085 + int var2 = this.indices1[var1]; + int var3 = this.indices2[var1]; + int var4 = this.indices3[var1]; + Rasterizer3D.field2251 = field2432[var1]; + if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1086 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1087 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var5; int var6; int var7; - if (this.field2448 != null && this.field2448[var1] != -1) { // L: 1095 - int var8 = this.field2448[var1] & 255; // L: 1096 - var5 = this.field2449[var8]; // L: 1097 - var6 = this.field2440[var8]; // L: 1098 - var7 = this.field2441[var8]; // L: 1099 + if (this.field2440 != null && this.field2440[var1] != -1) { + int var8 = this.field2440[var1] & 255; + var5 = this.field2453[var8]; + var6 = this.field2425[var8]; + var7 = this.field2426[var8]; } else { - var5 = var2; // L: 1102 - var6 = var3; // L: 1103 - var7 = var4; // L: 1104 + var5 = var2; + var6 = var3; + var7 = var4; } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3964(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var5], field2435[var6], field2435[var7], field2463[var5], field2463[var6], field2463[var7], field2477[var5], field2477[var6], field2477[var7], this.faceTextures[var1]); // L: 1106 + Rasterizer3D.method3939(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var5], field2447[var6], field2447[var7], field2448[var5], field2448[var6], field2448[var7], field2449[var5], field2449[var6], field2449[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method3964(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2435[var5], field2435[var6], field2435[var7], field2463[var5], field2463[var6], field2463[var7], field2477[var5], field2477[var6], field2477[var7], this.faceTextures[var1]); // L: 1107 + Rasterizer3D.method3939(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2447[var5], field2447[var6], field2447[var7], field2448[var5], field2448[var6], field2448[var7], field2449[var5], field2449[var6], field2449[var7], this.faceTextures[var1]); } - } else if (this.faceColors3[var1] == -1) { // L: 1088 - Rasterizer3D.method3962(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2484[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { + Rasterizer3D.method3903(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2469[this.faceColors1[var1]]); } else { - Rasterizer3D.method3960(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1089 + Rasterizer3D.method3905(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } - } // L: 1079 1109 + } - @ObfuscatedName("w") - final void method4320(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1112 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1113 - int var4 = 0; // L: 1114 - int var5 = this.indices1[var1]; // L: 1115 - int var6 = this.indices2[var1]; // L: 1116 - int var7 = this.indices3[var1]; // L: 1117 - int var8 = field2477[var5]; // L: 1118 - int var9 = field2477[var6]; // L: 1119 - int var10 = field2477[var7]; // L: 1120 - if (this.faceAlphas == null) { // L: 1121 + @ObfuscatedName("y") + final void method4216(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; + int var4 = 0; + int var5 = this.indices1[var1]; + int var6 = this.indices2[var1]; + int var7 = this.indices3[var1]; + int var8 = field2449[var5]; + int var9 = field2449[var6]; + int var10 = field2449[var7]; + if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1122 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1123 - field2473[var4] = modelViewportXs[var5]; // L: 1124 - field2474[var4] = modelViewportYs[var5]; // L: 1125 - field2475[var4++] = this.faceColors1[var1]; // L: 1126 + if (var8 >= 50) { + field2407[var4] = modelViewportXs[var5]; + field2459[var4] = modelViewportYs[var5]; + field2460[var4++] = this.faceColors1[var1]; } else { - var11 = field2435[var5]; // L: 1129 - var12 = field2463[var5]; // L: 1130 - var13 = this.faceColors1[var1]; // L: 1131 - if (var10 >= 50) { // L: 1132 - var14 = field2485[var10 - var8] * (50 - var8); // L: 1133 - field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var7] - var11) * var14 >> 16)) / 50; // L: 1134 - field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var7] - var12) * var14 >> 16)) / 50; // L: 1135 - field2475[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1136 + var11 = field2447[var5]; + var12 = field2448[var5]; + var13 = this.faceColors1[var1]; + if (var10 >= 50) { + var14 = field2470[var10 - var8] * (50 - var8); + field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var7] - var11) * var14 >> 16)) / 50; + field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var7] - var12) * var14 >> 16)) / 50; + field2460[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } - if (var9 >= 50) { // L: 1138 - var14 = field2485[var9 - var8] * (50 - var8); // L: 1139 - field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var6] - var11) * var14 >> 16)) / 50; // L: 1140 - field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var6] - var12) * var14 >> 16)) / 50; // L: 1141 - field2475[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1142 + if (var9 >= 50) { + var14 = field2470[var9 - var8] * (50 - var8); + field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var6] - var11) * var14 >> 16)) / 50; + field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var6] - var12) * var14 >> 16)) / 50; + field2460[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } - if (var9 >= 50) { // L: 1145 - field2473[var4] = modelViewportXs[var6]; // L: 1146 - field2474[var4] = modelViewportYs[var6]; // L: 1147 - field2475[var4++] = this.faceColors2[var1]; // L: 1148 + if (var9 >= 50) { + field2407[var4] = modelViewportXs[var6]; + field2459[var4] = modelViewportYs[var6]; + field2460[var4++] = this.faceColors2[var1]; } else { - var11 = field2435[var6]; // L: 1151 - var12 = field2463[var6]; // L: 1152 - var13 = this.faceColors2[var1]; // L: 1153 - if (var8 >= 50) { // L: 1154 - var14 = field2485[var8 - var9] * (50 - var9); // L: 1155 - field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var5] - var11) * var14 >> 16)) / 50; // L: 1156 - field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var5] - var12) * var14 >> 16)) / 50; // L: 1157 - field2475[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1158 + var11 = field2447[var6]; + var12 = field2448[var6]; + var13 = this.faceColors2[var1]; + if (var8 >= 50) { + var14 = field2470[var8 - var9] * (50 - var9); + field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var5] - var11) * var14 >> 16)) / 50; + field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var5] - var12) * var14 >> 16)) / 50; + field2460[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } - if (var10 >= 50) { // L: 1160 - var14 = field2485[var10 - var9] * (50 - var9); // L: 1161 - field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var7] - var11) * var14 >> 16)) / 50; // L: 1162 - field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var7] - var12) * var14 >> 16)) / 50; // L: 1163 - field2475[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1164 + if (var10 >= 50) { + var14 = field2470[var10 - var9] * (50 - var9); + field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var7] - var11) * var14 >> 16)) / 50; + field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var7] - var12) * var14 >> 16)) / 50; + field2460[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } - if (var10 >= 50) { // L: 1167 - field2473[var4] = modelViewportXs[var7]; // L: 1168 - field2474[var4] = modelViewportYs[var7]; // L: 1169 - field2475[var4++] = this.faceColors3[var1]; // L: 1170 + if (var10 >= 50) { + field2407[var4] = modelViewportXs[var7]; + field2459[var4] = modelViewportYs[var7]; + field2460[var4++] = this.faceColors3[var1]; } else { - var11 = field2435[var7]; // L: 1173 - var12 = field2463[var7]; // L: 1174 - var13 = this.faceColors3[var1]; // L: 1175 - if (var9 >= 50) { // L: 1176 - var14 = field2485[var9 - var10] * (50 - var10); // L: 1177 - field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var6] - var11) * var14 >> 16)) / 50; // L: 1178 - field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var6] - var12) * var14 >> 16)) / 50; // L: 1179 - field2475[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1180 + var11 = field2447[var7]; + var12 = field2448[var7]; + var13 = this.faceColors3[var1]; + if (var9 >= 50) { + var14 = field2470[var9 - var10] * (50 - var10); + field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var6] - var11) * var14 >> 16)) / 50; + field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var6] - var12) * var14 >> 16)) / 50; + field2460[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } - if (var8 >= 50) { // L: 1182 - var14 = field2485[var8 - var10] * (50 - var10); // L: 1183 - field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var5] - var11) * var14 >> 16)) / 50; // L: 1184 - field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var5] - var12) * var14 >> 16)) / 50; // L: 1185 - field2475[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1186 + if (var8 >= 50) { + var14 = field2470[var8 - var10] * (50 - var10); + field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var5] - var11) * var14 >> 16)) / 50; + field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var5] - var12) * var14 >> 16)) / 50; + field2460[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field2473[0]; // L: 1189 - var12 = field2473[1]; // L: 1190 - var13 = field2473[2]; // L: 1191 - var14 = field2474[0]; // L: 1192 - int var15 = field2474[1]; // L: 1193 - int var16 = field2474[2]; // L: 1194 - Rasterizer3D.field2262 = false; // L: 1195 + var11 = field2407[0]; + var12 = field2407[1]; + var13 = field2407[2]; + var14 = field2459[0]; + int var15 = field2459[1]; + int var16 = field2459[2]; + Rasterizer3D.field2251 = false; int var17; int var18; int var19; int var20; - if (var4 == 3) { // L: 1196 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1197 - Rasterizer3D.field2262 = true; + if (var4 == 3) { + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field2251 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1198 - if (this.field2448 != null && this.field2448[var1] != -1) { // L: 1206 - var20 = this.field2448[var1] & 255; // L: 1207 - var17 = this.field2449[var20]; // L: 1208 - var18 = this.field2440[var20]; // L: 1209 - var19 = this.field2441[var20]; // L: 1210 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.field2440 != null && this.field2440[var1] != -1) { + var20 = this.field2440[var1] & 255; + var17 = this.field2453[var20]; + var18 = this.field2425[var20]; + var19 = this.field2426[var20]; } else { - var17 = var5; // L: 1213 - var18 = var6; // L: 1214 - var19 = var7; // L: 1215 + var17 = var5; + var18 = var6; + var19 = var7; } - if (this.faceColors3[var1] == -1) { // L: 1217 - Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { + Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], this.faceTextures[var1]); // L: 1218 + Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], this.faceTextures[var1]); } - } else if (this.faceColors3[var1] == -1) { // L: 1199 - Rasterizer3D.method3962(var14, var15, var16, var11, var12, var13, field2484[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { + Rasterizer3D.method3903(var14, var15, var16, var11, var12, var13, field2469[this.faceColors1[var1]]); } else { - Rasterizer3D.method3960(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2]); // L: 1200 + Rasterizer3D.method3905(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2]); } } - if (var4 == 4) { // L: 1221 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2473[3] < 0 || field2473[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1222 - Rasterizer3D.field2262 = true; + if (var4 == 4) { + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2407[3] < 0 || field2407[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field2251 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1223 - if (this.field2448 != null && this.field2448[var1] != -1) { // L: 1238 - var20 = this.field2448[var1] & 255; // L: 1239 - var17 = this.field2449[var20]; // L: 1240 - var18 = this.field2440[var20]; // L: 1241 - var19 = this.field2441[var20]; // L: 1242 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.field2440 != null && this.field2440[var1] != -1) { + var20 = this.field2440[var1] & 255; + var17 = this.field2453[var20]; + var18 = this.field2425[var20]; + var19 = this.field2426[var20]; } else { - var17 = var5; // L: 1245 - var18 = var6; // L: 1246 - var19 = var7; // L: 1247 + var17 = var5; + var18 = var6; + var19 = var7; } - short var21 = this.faceTextures[var1]; // L: 1249 - if (this.faceColors3[var1] == -1) { // L: 1250 - Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1251 - Rasterizer3D.method3964(var14, var16, field2474[3], var11, var13, field2473[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1252 + short var21 = this.faceTextures[var1]; + if (this.faceColors3[var1] == -1) { + Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); + Rasterizer3D.method3939(var14, var16, field2459[3], var11, var13, field2407[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); } else { - Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1255 - Rasterizer3D.method3964(var14, var16, field2474[3], var11, var13, field2473[3], field2475[0], field2475[2], field2475[3], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1256 + Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); + Rasterizer3D.method3939(var14, var16, field2459[3], var11, var13, field2407[3], field2460[0], field2460[2], field2460[3], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); } - } else if (this.faceColors3[var1] == -1) { // L: 1224 - var17 = field2484[this.faceColors1[var1]]; // L: 1225 - Rasterizer3D.method3962(var14, var15, var16, var11, var12, var13, var17); // L: 1226 - Rasterizer3D.method3962(var14, var16, field2474[3], var11, var13, field2473[3], var17); // L: 1227 + } else if (this.faceColors3[var1] == -1) { + var17 = field2469[this.faceColors1[var1]]; + Rasterizer3D.method3903(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method3903(var14, var16, field2459[3], var11, var13, field2407[3], var17); } else { - Rasterizer3D.method3960(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2]); // L: 1230 - Rasterizer3D.method3960(var14, var16, field2474[3], var11, var13, field2473[3], field2475[0], field2475[2], field2475[3]); // L: 1231 + Rasterizer3D.method3905(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2]); + Rasterizer3D.method3905(var14, var16, field2459[3], var11, var13, field2407[3], field2460[0], field2460[2], field2460[3]); } } - } // L: 1260 + } - @ObfuscatedName("bh") + @ObfuscatedName("cd") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2466[0] = -1; // L: 723 - if (this.boundsType != 1) { // L: 724 + field2451[0] = -1; + if (this.boundsType != 1) { this.calculateBoundsCylinder(); } - this.calculateBoundingBox(var1); // L: 725 - int var11 = var5 * var8 - var4 * var6 >> 16; // L: 726 - int var12 = var2 * var7 + var3 * var11 >> 16; // L: 727 - int var13 = var3 * this.xzRadius >> 16; // L: 728 - int var14 = var12 + var13; // L: 729 - if (var14 > 50 && var12 < 3500) { // L: 730 - int var15 = var8 * var4 + var5 * var6 >> 16; // L: 731 - int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 732 - if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { // L: 733 - int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 734 - if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { // L: 735 - int var18 = var3 * var7 - var11 * var2 >> 16; // L: 736 - int var19 = var2 * this.xzRadius >> 16; // L: 737 - int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; // L: 738 - if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { // L: 739 - int var21 = (var3 * super.height >> 16) + var19; // L: 740 - int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; // L: 741 - if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { // L: 742 - int var23 = var13 + (var2 * super.height >> 16); // L: 743 - boolean var24 = false; // L: 744 - boolean var25 = false; // L: 745 - if (var12 - var23 <= 50) { // L: 746 + this.calculateBoundingBox(var1); + int var11 = var5 * var8 - var4 * var6 >> 16; + int var12 = var2 * var7 + var3 * var11 >> 16; + int var13 = var3 * this.xzRadius >> 16; + int var14 = var12 + var13; + if (var14 > 50 && var12 < 3500) { + int var15 = var8 * var4 + var5 * var6 >> 16; + int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { + int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { + int var18 = var3 * var7 - var11 * var2 >> 16; + int var19 = var2 * this.xzRadius >> 16; + int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; + if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { + int var21 = (var3 * super.height >> 16) + var19; + int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; + if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { + int var23 = var13 + (var2 * super.height >> 16); + boolean var24 = false; + boolean var25 = false; + if (var12 - var23 <= 50) { var25 = true; } - boolean var26 = var25 || this.field2438 > 0; // L: 747 - int var27 = FloorUnderlayDefinition.method2924(); // L: 748 - int var28 = WorldMapSection2.method3333(); // L: 749 - boolean var29 = class8.method103(); // L: 750 - boolean var30 = 0L != var9 && !class24.method329(var9); // L: 753 - boolean var32 = false; // L: 756 + boolean var26 = var25 || this.field2423 > 0; + int var27 = ViewportMouse.ViewportMouse_x; + int var29 = UserComparator8.method2157(); + boolean var30 = class183.method3659(); + boolean var32 = var9 != 0L; + boolean var33; + if (var32) { + var33 = (int)(var9 >>> 16 & 1L) == 1; + var32 = !var33; + } + + var33 = false; + int var35; int var36; int var37; - int var38; - int var39; - int var47; - int var53; - int var54; - int var55; - if (var30 && var29) { // L: 757 - boolean var33 = false; // L: 758 - if (field2479) { // L: 759 - boolean var34; - if (!class8.method103()) { // L: 763 - var34 = false; // L: 764 - } else { - int var42; - int var43; - int var44; - if (!ViewportMouse.ViewportMouse_false0) { // L: 768 - var36 = Scene.Scene_cameraPitchSine; // L: 769 - var37 = Scene.Scene_cameraPitchCosine; // L: 770 - var38 = Scene.Scene_cameraYawSine; // L: 771 - var39 = Scene.Scene_cameraYawCosine; // L: 772 - byte var40 = 50; // L: 773 - short var41 = 3500; // L: 774 - var42 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 775 - var43 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 776 - var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 777 - int var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 778 - int var46 = Rasterizer3D.method3973(var43, var40, var37, var36); // L: 780 - var54 = Rasterizer3D.method4031(var43, var40, var37, var36); // L: 781 - var43 = var46; // L: 782 - var46 = Rasterizer3D.method3973(var45, var41, var37, var36); // L: 783 - var55 = Rasterizer3D.method4031(var45, var41, var37, var36); // L: 784 - var45 = var46; // L: 785 - var46 = Rasterizer3D.method3992(var42, var54, var39, var38); // L: 786 - var54 = Rasterizer3D.method4000(var42, var54, var39, var38); // L: 787 - var42 = var46; // L: 788 - var46 = Rasterizer3D.method3992(var44, var55, var39, var38); // L: 789 - var55 = Rasterizer3D.method4000(var44, var55, var39, var38); // L: 790 - class2.field20 = (var42 + var46) / 2; // L: 792 - ViewportMouse.field2490 = (var45 + var43) / 2; // L: 793 - FillMode.field4244 = (var55 + var54) / 2; // L: 794 - UserComparator5.field1442 = (var46 - var42) / 2; // L: 795 - ClanChannelMember.field68 = (var45 - var43) / 2; // L: 796 - WorldMapEvent.field2146 = (var55 - var54) / 2; // L: 797 - MilliClock.field1523 = Math.abs(UserComparator5.field1442); // L: 798 - EnumComposition.field1629 = Math.abs(ClanChannelMember.field68); // L: 799 - class21.field180 = Math.abs(WorldMapEvent.field2146); // L: 800 - } - - var36 = this.xMid + var6; // L: 802 - var37 = var7 + this.yMid; // L: 803 - var38 = var8 + this.zMid; // L: 804 - var39 = this.xMidOffset; // L: 805 - var54 = this.yMidOffset; // L: 806 - var55 = this.zMidOffset; // L: 807 - var42 = class2.field20 - var36; // L: 808 - var43 = ViewportMouse.field2490 - var37; // L: 809 - var44 = FillMode.field4244 - var38; // L: 810 - if (Math.abs(var42) > var39 + MilliClock.field1523) { // L: 811 - var34 = false; // L: 812 - } else if (Math.abs(var43) > var54 + EnumComposition.field1629) { // L: 815 - var34 = false; // L: 816 - } else if (Math.abs(var44) > var55 + class21.field180) { // L: 819 - var34 = false; // L: 820 - } else if (Math.abs(var44 * ClanChannelMember.field68 - var43 * WorldMapEvent.field2146) > var54 * class21.field180 + var55 * EnumComposition.field1629) { // L: 823 - var34 = false; // L: 824 - } else if (Math.abs(var42 * WorldMapEvent.field2146 - var44 * UserComparator5.field1442) > var39 * class21.field180 + var55 * MilliClock.field1523) { // L: 827 - var34 = false; // L: 828 - } else if (Math.abs(var43 * UserComparator5.field1442 - var42 * ClanChannelMember.field68) > var54 * MilliClock.field1523 + var39 * EnumComposition.field1629) { // L: 831 - var34 = false; // L: 832 - } else { - var34 = true; // L: 835 - } - } - - var33 = var34; // L: 837 + if (var32 && var30) { + boolean var34 = false; + if (field2464) { + var34 = class127.method2569(this, var6, var7, var8); } else { - var53 = var12 - var13; // L: 840 - if (var53 <= 50) { // L: 841 - var53 = 50; + var35 = var12 - var13; + if (var35 <= 50) { + var35 = 50; } - if (var15 > 0) { // L: 842 - var16 /= var14; // L: 843 - var17 /= var53; // L: 844 + if (var15 > 0) { + var16 /= var14; + var17 /= var35; } else { - var17 /= var14; // L: 847 - var16 /= var53; // L: 848 + var17 /= var14; + var16 /= var35; } - if (var18 > 0) { // L: 850 - var22 /= var14; // L: 851 - var20 /= var53; // L: 852 + if (var18 > 0) { + var22 /= var14; + var20 /= var35; } else { - var20 /= var14; // L: 855 - var22 /= var53; // L: 856 + var20 /= var14; + var22 /= var35; } - var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 858 - var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 859 - if (var47 > var16 && var47 < var17 && var36 > var22 && var36 < var20) { // L: 860 - var33 = true; // L: 861 + var36 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var36 > var16 && var36 < var17 && var37 > var22 && var37 < var20) { + var34 = true; } } - if (var33) { // L: 864 - if (this.isSingleTile) { // L: 865 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 868 + if (var34) { + if (this.isSingleTile) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; } else { - var32 = true; // L: 871 + var33 = true; } } } - int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 874 - var53 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 875 - var47 = 0; // L: 876 - var36 = 0; // L: 877 - if (var1 != 0) { // L: 878 - var47 = Model_sine[var1]; // L: 879 - var36 = Model_cosine[var1]; // L: 880 + int var47 = Rasterizer3D.Rasterizer3D_clipMidX; + var35 = Rasterizer3D.Rasterizer3D_clipMidY; + var36 = 0; + var37 = 0; + if (var1 != 0) { + var36 = Model_sine[var1]; + var37 = Model_cosine[var1]; } - for (var37 = 0; var37 < this.verticesCount; ++var37) { // L: 882 - var38 = this.verticesX[var37]; // L: 883 - var39 = this.verticesY[var37]; // L: 884 - var54 = this.verticesZ[var37]; // L: 885 - if (var1 != 0) { // L: 886 - var55 = var54 * var47 + var38 * var36 >> 16; // L: 887 - var54 = var54 * var36 - var38 * var47 >> 16; // L: 888 - var38 = var55; // L: 889 + for (int var38 = 0; var38 < this.verticesCount; ++var38) { + int var39 = this.verticesX[var38]; + int var40 = this.verticesY[var38]; + int var41 = this.verticesZ[var38]; + int var42; + if (var1 != 0) { + var42 = var41 * var36 + var39 * var37 >> 16; + var41 = var41 * var37 - var39 * var36 >> 16; + var39 = var42; } - var38 += var6; // L: 891 - var39 += var7; // L: 892 - var54 += var8; // L: 893 - var55 = var54 * var4 + var5 * var38 >> 16; // L: 894 - var54 = var5 * var54 - var38 * var4 >> 16; // L: 895 - var38 = var55; // L: 896 - var55 = var3 * var39 - var54 * var2 >> 16; // L: 897 - var54 = var39 * var2 + var3 * var54 >> 16; // L: 898 - field2461[var37] = var54 - var12; // L: 900 - if (var54 >= 50) { // L: 901 - modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var54 + var52; // L: 902 - modelViewportYs[var37] = var55 * Rasterizer3D.Rasterizer3D_zoom / var54 + var53; // L: 903 + var39 += var6; + var40 += var7; + var41 += var8; + var42 = var41 * var4 + var5 * var39 >> 16; + var41 = var5 * var41 - var39 * var4 >> 16; + var39 = var42; + var42 = var3 * var40 - var41 * var2 >> 16; + var41 = var40 * var2 + var3 * var41 >> 16; + field2446[var38] = var41 - var12; + if (var41 >= 50) { + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var47; + modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; } else { - modelViewportXs[var37] = -5000; // L: 906 - var24 = true; // L: 907 + modelViewportXs[var38] = -5000; + var24 = true; } - if (var26) { // L: 909 - field2435[var37] = var38; // L: 910 - field2463[var37] = var55; // L: 911 - field2477[var37] = var54; // L: 912 + if (var26) { + field2447[var38] = var39; + field2448[var38] = var42; + field2449[var38] = var41; } } try { - this.draw0(var24, var32, this.isSingleTile, var9); // L: 916 - } catch (Exception var51) { // L: 918 + this.draw0(var24, var33, this.isSingleTile, var9); + } catch (Exception var46) { } } @@ -1770,5 +1706,5 @@ public class Model extends Renderable { } } } - } // L: 919 + } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 2e463f9c44..67ca3929b6 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,136 +3,136 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("gz") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("aq") - static int[] field2197; - @ObfuscatedName("ae") - static int[] field2179; + @ObfuscatedName("av") + static int[] field2184; + @ObfuscatedName("as") + static int[] field2185; @ObfuscatedName("ao") - static int field2199; - @ObfuscatedName("an") + static int field2186; + @ObfuscatedName("az") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("verticesCount") int verticesCount; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("verticesX") int[] verticesX; @ObfuscatedName("v") @Export("verticesY") int[] verticesY; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("faceCount") int faceCount; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("indices1") int[] indices1; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("indices2") int[] indices2; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("indices3") int[] indices3; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("faceColors") short[] faceColors; @ObfuscatedName("k") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("priority") byte priority; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lgy;" + descriptor = "[Lgf;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Lgv;" + descriptor = "[Lhf;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Lgv;" + descriptor = "[Lhf;" ) - VertexNormal[] field2168; - @ObfuscatedName("ak") + VertexNormal[] field2175; + @ObfuscatedName("an") @Export("ambient") public short ambient; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("contrast") public short contrast; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ah") - int field2192; - @ObfuscatedName("az") - int field2193; - @ObfuscatedName("ap") - int field2194; - @ObfuscatedName("ag") - int field2176; + @ObfuscatedName("aq") + int field2179; + @ObfuscatedName("aa") + int field2180; @ObfuscatedName("ab") - int field2195; + int field2181; + @ObfuscatedName("ax") + int field2161; + @ObfuscatedName("au") + int field2182; static { - field2197 = new int[10000]; // L: 44 - field2179 = new int[10000]; // L: 45 - field2199 = 0; // L: 46 - ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47 - ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48 + field2184 = new int[10000]; + field2185 = new int[10000]; + field2186 = 0; + ModelData_sine = Rasterizer3D.Rasterizer3D_sine; + ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } ModelData() { @@ -140,949 +140,949 @@ public class ModelData extends Renderable { this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - } // L: 50 + } @ObfuscatedSignature( - descriptor = "([Lga;I)V" + descriptor = "([Lgz;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - boolean var3 = false; // L: 471 - boolean var4 = false; // L: 472 - boolean var5 = false; // L: 473 - boolean var6 = false; // L: 474 - boolean var7 = false; // L: 475 - boolean var8 = false; // L: 476 - this.verticesCount = 0; // L: 477 - this.faceCount = 0; // L: 478 - this.textureTriangleCount = 0; // L: 479 - this.priority = -1; // L: 480 + boolean var3 = false; + boolean var4 = false; + boolean var5 = false; + boolean var6 = false; + boolean var7 = false; + boolean var8 = false; + this.verticesCount = 0; + this.faceCount = 0; + this.textureTriangleCount = 0; + this.priority = -1; int var9; ModelData var10; - for (var9 = 0; var9 < var2; ++var9) { // L: 481 - var10 = var1[var9]; // L: 482 - if (var10 != null) { // L: 483 - this.verticesCount += var10.verticesCount; // L: 484 - this.faceCount += var10.faceCount; // L: 485 - this.textureTriangleCount += var10.textureTriangleCount; // L: 486 - if (var10.faceRenderPriorities != null) { // L: 487 + for (var9 = 0; var9 < var2; ++var9) { + var10 = var1[var9]; + if (var10 != null) { + this.verticesCount += var10.verticesCount; + this.faceCount += var10.faceCount; + this.textureTriangleCount += var10.textureTriangleCount; + if (var10.faceRenderPriorities != null) { var4 = true; } else { - if (this.priority == -1) { // L: 489 + if (this.priority == -1) { this.priority = var10.priority; } - if (this.priority != var10.priority) { // L: 490 + if (this.priority != var10.priority) { var4 = true; } } - var3 |= var10.faceRenderTypes != null; // L: 492 - var5 |= var10.faceAlphas != null; // L: 493 - var6 |= var10.faceSkins != null; // L: 494 - var7 |= var10.faceTextures != null; // L: 495 - var8 |= var10.textureCoords != null; // L: 496 + var3 |= var10.faceRenderTypes != null; + var5 |= var10.faceAlphas != null; + var6 |= var10.faceSkins != null; + var7 |= var10.faceTextures != null; + var8 |= var10.textureCoords != null; } } - this.verticesX = new int[this.verticesCount]; // L: 499 - this.verticesY = new int[this.verticesCount]; // L: 500 - this.verticesZ = new int[this.verticesCount]; // L: 501 - this.vertexSkins = new int[this.verticesCount]; // L: 502 - this.indices1 = new int[this.faceCount]; // L: 503 - this.indices2 = new int[this.faceCount]; // L: 504 - this.indices3 = new int[this.faceCount]; // L: 505 - if (var3) { // L: 506 + this.verticesX = new int[this.verticesCount]; + this.verticesY = new int[this.verticesCount]; + this.verticesZ = new int[this.verticesCount]; + this.vertexSkins = new int[this.verticesCount]; + this.indices1 = new int[this.faceCount]; + this.indices2 = new int[this.faceCount]; + this.indices3 = new int[this.faceCount]; + if (var3) { this.faceRenderTypes = new byte[this.faceCount]; } - if (var4) { // L: 507 + if (var4) { this.faceRenderPriorities = new byte[this.faceCount]; } - if (var5) { // L: 508 + if (var5) { this.faceAlphas = new byte[this.faceCount]; } - if (var6) { // L: 509 + if (var6) { this.faceSkins = new int[this.faceCount]; } - if (var7) { // L: 510 + if (var7) { this.faceTextures = new short[this.faceCount]; } - if (var8) { // L: 511 + if (var8) { this.textureCoords = new byte[this.faceCount]; } - this.faceColors = new short[this.faceCount]; // L: 512 - if (this.textureTriangleCount > 0) { // L: 513 - this.textureRenderTypes = new byte[this.textureTriangleCount]; // L: 514 - this.texTriangleX = new short[this.textureTriangleCount]; // L: 515 - this.texTriangleY = new short[this.textureTriangleCount]; // L: 516 - this.texTriangleZ = new short[this.textureTriangleCount]; // L: 517 + this.faceColors = new short[this.faceCount]; + if (this.textureTriangleCount > 0) { + this.textureRenderTypes = new byte[this.textureTriangleCount]; + this.texTriangleX = new short[this.textureTriangleCount]; + this.texTriangleY = new short[this.textureTriangleCount]; + this.texTriangleZ = new short[this.textureTriangleCount]; } - this.verticesCount = 0; // L: 519 - this.faceCount = 0; // L: 520 - this.textureTriangleCount = 0; // L: 521 + this.verticesCount = 0; + this.faceCount = 0; + this.textureTriangleCount = 0; - for (var9 = 0; var9 < var2; ++var9) { // L: 522 - var10 = var1[var9]; // L: 523 - if (var10 != null) { // L: 524 + for (var9 = 0; var9 < var2; ++var9) { + var10 = var1[var9]; + if (var10 != null) { int var11; - for (var11 = 0; var11 < var10.faceCount; ++var11) { // L: 525 - if (var3 && var10.faceRenderTypes != null) { // L: 526 527 + for (var11 = 0; var11 < var10.faceCount; ++var11) { + if (var3 && var10.faceRenderTypes != null) { this.faceRenderTypes[this.faceCount] = var10.faceRenderTypes[var11]; } - if (var4) { // L: 529 - if (var10.faceRenderPriorities != null) { // L: 530 + if (var4) { + if (var10.faceRenderPriorities != null) { this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; } else { - this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531 + this.faceRenderPriorities[this.faceCount] = var10.priority; } } - if (var5 && var10.faceAlphas != null) { // L: 533 534 + if (var5 && var10.faceAlphas != null) { this.faceAlphas[this.faceCount] = var10.faceAlphas[var11]; } - if (var6 && var10.faceSkins != null) { // L: 536 537 + if (var6 && var10.faceSkins != null) { this.faceSkins[this.faceCount] = var10.faceSkins[var11]; } - if (var7) { // L: 539 - if (var10.faceTextures != null) { // L: 540 + if (var7) { + if (var10.faceTextures != null) { this.faceTextures[this.faceCount] = var10.faceTextures[var11]; } else { - this.faceTextures[this.faceCount] = -1; // L: 541 + this.faceTextures[this.faceCount] = -1; } } - if (var8) { // L: 543 - if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { // L: 544 + if (var8) { + if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var10.textureCoords[var11]); } else { - this.textureCoords[this.faceCount] = -1; // L: 545 + this.textureCoords[this.faceCount] = -1; } } - this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547 - this.indices1[this.faceCount] = this.method3868(var10, var10.indices1[var11]); // L: 548 - this.indices2[this.faceCount] = this.method3868(var10, var10.indices2[var11]); // L: 549 - this.indices3[this.faceCount] = this.method3868(var10, var10.indices3[var11]); // L: 550 - ++this.faceCount; // L: 551 + this.faceColors[this.faceCount] = var10.faceColors[var11]; + this.indices1[this.faceCount] = this.method3831(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method3831(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method3831(var10, var10.indices3[var11]); + ++this.faceCount; } - for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553 - byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554 - if (var12 == 0) { // L: 555 - this.texTriangleX[this.textureTriangleCount] = (short)this.method3868(var10, var10.texTriangleX[var11]); // L: 556 - this.texTriangleY[this.textureTriangleCount] = (short)this.method3868(var10, var10.texTriangleY[var11]); // L: 557 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method3868(var10, var10.texTriangleZ[var11]); // L: 558 + for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { + byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; + if (var12 == 0) { + this.texTriangleX[this.textureTriangleCount] = (short)this.method3831(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method3831(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3831(var10, var10.texTriangleZ[var11]); } - ++this.textureTriangleCount; // L: 560 + ++this.textureTriangleCount; } } } - } // L: 564 + } ModelData(byte[] var1) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59 - this.method3866(var1); + if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { + this.method3808(var1); } else { - this.method3903(var1); // L: 60 + this.method3795(var1); } - } // L: 61 + } @ObfuscatedSignature( - descriptor = "(Lga;ZZZZ)V", + descriptor = "(Lgz;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { - this.verticesCount = 0; // L: 9 - this.faceCount = 0; // L: 13 - this.priority = 0; // L: 23 - this.isBoundsCalculated = false; // L: 38 - this.verticesCount = var1.verticesCount; // L: 588 - this.faceCount = var1.faceCount; // L: 589 - this.textureTriangleCount = var1.textureTriangleCount; // L: 590 + this.verticesCount = 0; + this.faceCount = 0; + this.priority = 0; + this.isBoundsCalculated = false; + this.verticesCount = var1.verticesCount; + this.faceCount = var1.faceCount; + this.textureTriangleCount = var1.textureTriangleCount; int var6; - if (var2) { // L: 591 - this.verticesX = var1.verticesX; // L: 592 - this.verticesY = var1.verticesY; // L: 593 - this.verticesZ = var1.verticesZ; // L: 594 + if (var2) { + this.verticesX = var1.verticesX; + this.verticesY = var1.verticesY; + this.verticesZ = var1.verticesZ; } else { - this.verticesX = new int[this.verticesCount]; // L: 597 - this.verticesY = new int[this.verticesCount]; // L: 598 - this.verticesZ = new int[this.verticesCount]; // L: 599 + this.verticesX = new int[this.verticesCount]; + this.verticesY = new int[this.verticesCount]; + this.verticesZ = new int[this.verticesCount]; - for (var6 = 0; var6 < this.verticesCount; ++var6) { // L: 600 - this.verticesX[var6] = var1.verticesX[var6]; // L: 601 - this.verticesY[var6] = var1.verticesY[var6]; // L: 602 - this.verticesZ[var6] = var1.verticesZ[var6]; // L: 603 + for (var6 = 0; var6 < this.verticesCount; ++var6) { + this.verticesX[var6] = var1.verticesX[var6]; + this.verticesY[var6] = var1.verticesY[var6]; + this.verticesZ[var6] = var1.verticesZ[var6]; } } - if (var3) { // L: 606 + if (var3) { this.faceColors = var1.faceColors; } else { - this.faceColors = new short[this.faceCount]; // L: 608 + this.faceColors = new short[this.faceCount]; - for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 609 + for (var6 = 0; var6 < this.faceCount; ++var6) { this.faceColors[var6] = var1.faceColors[var6]; } } - if (!var4 && var1.faceTextures != null) { // L: 611 - this.faceTextures = new short[this.faceCount]; // L: 613 + if (!var4 && var1.faceTextures != null) { + this.faceTextures = new short[this.faceCount]; - for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 614 + for (var6 = 0; var6 < this.faceCount; ++var6) { this.faceTextures[var6] = var1.faceTextures[var6]; } } else { this.faceTextures = var1.faceTextures; } - this.faceAlphas = var1.faceAlphas; // L: 616 - this.indices1 = var1.indices1; // L: 626 - this.indices2 = var1.indices2; // L: 627 - this.indices3 = var1.indices3; // L: 628 - this.faceRenderTypes = var1.faceRenderTypes; // L: 629 - this.faceRenderPriorities = var1.faceRenderPriorities; // L: 630 - this.textureCoords = var1.textureCoords; // L: 631 - this.priority = var1.priority; // L: 632 - this.textureRenderTypes = var1.textureRenderTypes; // L: 633 - this.texTriangleX = var1.texTriangleX; // L: 634 - this.texTriangleY = var1.texTriangleY; // L: 635 - this.texTriangleZ = var1.texTriangleZ; // L: 636 - this.vertexSkins = var1.vertexSkins; // L: 637 - this.faceSkins = var1.faceSkins; // L: 638 - this.vertexLabels = var1.vertexLabels; // L: 639 - this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640 - this.vertexNormals = var1.vertexNormals; // L: 641 - this.faceNormals = var1.faceNormals; // L: 642 - this.field2168 = var1.field2168; // L: 643 - this.ambient = var1.ambient; // L: 644 - this.contrast = var1.contrast; // L: 645 + this.faceAlphas = var1.faceAlphas; + this.indices1 = var1.indices1; + this.indices2 = var1.indices2; + this.indices3 = var1.indices3; + this.faceRenderTypes = var1.faceRenderTypes; + this.faceRenderPriorities = var1.faceRenderPriorities; + this.textureCoords = var1.textureCoords; + this.priority = var1.priority; + this.textureRenderTypes = var1.textureRenderTypes; + this.texTriangleX = var1.texTriangleX; + this.texTriangleY = var1.texTriangleY; + this.texTriangleZ = var1.texTriangleZ; + this.vertexSkins = var1.vertexSkins; + this.faceSkins = var1.faceSkins; + this.vertexLabels = var1.vertexLabels; + this.faceLabelsAlpha = var1.faceLabelsAlpha; + this.vertexNormals = var1.vertexNormals; + this.faceNormals = var1.faceNormals; + this.field2175 = var1.field2175; + this.ambient = var1.ambient; + this.contrast = var1.contrast; } @ObfuscatedName("v") - void method3866(byte[] var1) { - Buffer var2 = new Buffer(var1); // L: 64 - Buffer var3 = new Buffer(var1); // L: 65 - Buffer var4 = new Buffer(var1); // L: 66 - Buffer var5 = new Buffer(var1); // L: 67 - Buffer var6 = new Buffer(var1); // L: 68 - Buffer var7 = new Buffer(var1); // L: 69 - Buffer var8 = new Buffer(var1); // L: 70 - var2.offset = var1.length - 23; // L: 71 - int var9 = var2.readUnsignedShort(); // L: 72 - int var10 = var2.readUnsignedShort(); // L: 73 - int var11 = var2.readUnsignedByte(); // L: 74 - int var12 = var2.readUnsignedByte(); // L: 75 - int var13 = var2.readUnsignedByte(); // L: 76 - int var14 = var2.readUnsignedByte(); // L: 77 - int var15 = var2.readUnsignedByte(); // L: 78 - int var16 = var2.readUnsignedByte(); // L: 79 - int var17 = var2.readUnsignedByte(); // L: 80 - int var18 = var2.readUnsignedShort(); // L: 81 - int var19 = var2.readUnsignedShort(); // L: 82 - int var20 = var2.readUnsignedShort(); // L: 83 - int var21 = var2.readUnsignedShort(); // L: 84 - int var22 = var2.readUnsignedShort(); // L: 85 - int var23 = 0; // L: 86 - int var24 = 0; // L: 87 - int var25 = 0; // L: 88 + void method3808(byte[] var1) { + Buffer var2 = new Buffer(var1); + Buffer var3 = new Buffer(var1); + Buffer var4 = new Buffer(var1); + Buffer var5 = new Buffer(var1); + Buffer var6 = new Buffer(var1); + Buffer var7 = new Buffer(var1); + Buffer var8 = new Buffer(var1); + var2.offset = var1.length - 23; + int var9 = var2.readUnsignedShort(); + int var10 = var2.readUnsignedShort(); + int var11 = var2.readUnsignedByte(); + int var12 = var2.readUnsignedByte(); + int var13 = var2.readUnsignedByte(); + int var14 = var2.readUnsignedByte(); + int var15 = var2.readUnsignedByte(); + int var16 = var2.readUnsignedByte(); + int var17 = var2.readUnsignedByte(); + int var18 = var2.readUnsignedShort(); + int var19 = var2.readUnsignedShort(); + int var20 = var2.readUnsignedShort(); + int var21 = var2.readUnsignedShort(); + int var22 = var2.readUnsignedShort(); + int var23 = 0; + int var24 = 0; + int var25 = 0; int var26; - if (var11 > 0) { // L: 89 - this.textureRenderTypes = new byte[var11]; // L: 90 - var2.offset = 0; // L: 91 + if (var11 > 0) { + this.textureRenderTypes = new byte[var11]; + var2.offset = 0; - for (var26 = 0; var26 < var11; ++var26) { // L: 92 - byte var27 = this.textureRenderTypes[var26] = var2.readByte(); // L: 93 - if (var27 == 0) { // L: 94 + for (var26 = 0; var26 < var11; ++var26) { + byte var27 = this.textureRenderTypes[var26] = var2.readByte(); + if (var27 == 0) { ++var23; } - if (var27 >= 1 && var27 <= 3) { // L: 95 + if (var27 >= 1 && var27 <= 3) { ++var24; } - if (var27 == 2) { // L: 96 + if (var27 == 2) { ++var25; } } } - var26 = var11 + var9; // L: 101 - int var28 = var26; // L: 102 - if (var12 == 1) { // L: 103 + var26 = var11 + var9; + int var28 = var26; + if (var12 == 1) { var26 += var10; } - int var29 = var26; // L: 104 - var26 += var10; // L: 105 - int var30 = var26; // L: 106 - if (var13 == 255) { // L: 107 + int var29 = var26; + var26 += var10; + int var30 = var26; + if (var13 == 255) { var26 += var10; } - int var31 = var26; // L: 108 - if (var15 == 1) { // L: 109 + int var31 = var26; + if (var15 == 1) { var26 += var10; } - int var32 = var26; // L: 110 - if (var17 == 1) { // L: 111 + int var32 = var26; + if (var17 == 1) { var26 += var9; } - int var33 = var26; // L: 112 - if (var14 == 1) { // L: 113 + int var33 = var26; + if (var14 == 1) { var26 += var10; } - int var34 = var26; // L: 114 - var26 += var21; // L: 115 - int var35 = var26; // L: 116 - if (var16 == 1) { // L: 117 + int var34 = var26; + var26 += var21; + int var35 = var26; + if (var16 == 1) { var26 += var10 * 2; } - int var36 = var26; // L: 118 - var26 += var22; // L: 119 - int var37 = var26; // L: 120 - var26 += var10 * 2; // L: 121 - int var38 = var26; // L: 122 - var26 += var18; // L: 123 - int var39 = var26; // L: 124 - var26 += var19; // L: 125 - int var40 = var26; // L: 126 - var26 += var20; // L: 127 - int var41 = var26; // L: 128 - var26 += var23 * 6; // L: 129 - int var42 = var26; // L: 130 - var26 += var24 * 6; // L: 131 - int var43 = var26; // L: 132 - var26 += var24 * 6; // L: 133 - int var44 = var26; // L: 134 - var26 += var24 * 2; // L: 135 - int var45 = var26; // L: 136 - var26 += var24; // L: 137 - int var46 = var26; // L: 138 - var26 += var24 * 2 + var25 * 2; // L: 139 - this.verticesCount = var9; // L: 141 - this.faceCount = var10; // L: 142 - this.textureTriangleCount = var11; // L: 143 - this.verticesX = new int[var9]; // L: 144 - this.verticesY = new int[var9]; // L: 145 - this.verticesZ = new int[var9]; // L: 146 - this.indices1 = new int[var10]; // L: 147 - this.indices2 = new int[var10]; // L: 148 - this.indices3 = new int[var10]; // L: 149 - if (var17 == 1) { // L: 150 + int var36 = var26; + var26 += var22; + int var37 = var26; + var26 += var10 * 2; + int var38 = var26; + var26 += var18; + int var39 = var26; + var26 += var19; + int var40 = var26; + var26 += var20; + int var41 = var26; + var26 += var23 * 6; + int var42 = var26; + var26 += var24 * 6; + int var43 = var26; + var26 += var24 * 6; + int var44 = var26; + var26 += var24 * 2; + int var45 = var26; + var26 += var24; + int var46 = var26; + var26 += var24 * 2 + var25 * 2; + this.verticesCount = var9; + this.faceCount = var10; + this.textureTriangleCount = var11; + this.verticesX = new int[var9]; + this.verticesY = new int[var9]; + this.verticesZ = new int[var9]; + this.indices1 = new int[var10]; + this.indices2 = new int[var10]; + this.indices3 = new int[var10]; + if (var17 == 1) { this.vertexSkins = new int[var9]; } - if (var12 == 1) { // L: 151 + if (var12 == 1) { this.faceRenderTypes = new byte[var10]; } - if (var13 == 255) { // L: 152 + if (var13 == 255) { this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; // L: 153 + this.priority = (byte)var13; } - if (var14 == 1) { // L: 154 + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if (var15 == 1) { // L: 155 + if (var15 == 1) { this.faceSkins = new int[var10]; } - if (var16 == 1) { // L: 156 + if (var16 == 1) { this.faceTextures = new short[var10]; } - if (var16 == 1 && var11 > 0) { // L: 157 + if (var16 == 1 && var11 > 0) { this.textureCoords = new byte[var10]; } - this.faceColors = new short[var10]; // L: 158 - if (var11 > 0) { // L: 159 - this.texTriangleX = new short[var11]; // L: 160 - this.texTriangleY = new short[var11]; // L: 161 - this.texTriangleZ = new short[var11]; // L: 162 + this.faceColors = new short[var10]; + if (var11 > 0) { + this.texTriangleX = new short[var11]; + this.texTriangleY = new short[var11]; + this.texTriangleZ = new short[var11]; } - var2.offset = var11; // L: 164 - var3.offset = var38; // L: 165 - var4.offset = var39; // L: 166 - var5.offset = var40; // L: 167 - var6.offset = var32; // L: 168 - int var48 = 0; // L: 169 - int var49 = 0; // L: 170 - int var50 = 0; // L: 171 + var2.offset = var11; + var3.offset = var38; + var4.offset = var39; + var5.offset = var40; + var6.offset = var32; + int var48 = 0; + int var49 = 0; + int var50 = 0; int var51; int var52; int var53; int var54; int var55; - for (var51 = 0; var51 < var9; ++var51) { // L: 172 - var52 = var2.readUnsignedByte(); // L: 173 - var53 = 0; // L: 174 - if ((var52 & 1) != 0) { // L: 175 + for (var51 = 0; var51 < var9; ++var51) { + var52 = var2.readUnsignedByte(); + var53 = 0; + if ((var52 & 1) != 0) { var53 = var3.readShortSmart(); } - var54 = 0; // L: 176 - if ((var52 & 2) != 0) { // L: 177 + var54 = 0; + if ((var52 & 2) != 0) { var54 = var4.readShortSmart(); } - var55 = 0; // L: 178 - if ((var52 & 4) != 0) { // L: 179 + var55 = 0; + if ((var52 & 4) != 0) { var55 = var5.readShortSmart(); } - this.verticesX[var51] = var48 + var53; // L: 180 - this.verticesY[var51] = var49 + var54; // L: 181 - this.verticesZ[var51] = var50 + var55; // L: 182 - var48 = this.verticesX[var51]; // L: 183 - var49 = this.verticesY[var51]; // L: 184 - var50 = this.verticesZ[var51]; // L: 185 - if (var17 == 1) { // L: 186 + this.verticesX[var51] = var48 + var53; + this.verticesY[var51] = var49 + var54; + this.verticesZ[var51] = var50 + var55; + var48 = this.verticesX[var51]; + var49 = this.verticesY[var51]; + var50 = this.verticesZ[var51]; + if (var17 == 1) { this.vertexSkins[var51] = var6.readUnsignedByte(); } } - var2.offset = var37; // L: 188 - var3.offset = var28; // L: 189 - var4.offset = var30; // L: 190 - var5.offset = var33; // L: 191 - var6.offset = var31; // L: 192 - var7.offset = var35; // L: 193 - var8.offset = var36; // L: 194 + var2.offset = var37; + var3.offset = var28; + var4.offset = var30; + var5.offset = var33; + var6.offset = var31; + var7.offset = var35; + var8.offset = var36; - for (var51 = 0; var51 < var10; ++var51) { // L: 195 - this.faceColors[var51] = (short)var2.readUnsignedShort(); // L: 196 - if (var12 == 1) { // L: 197 + for (var51 = 0; var51 < var10; ++var51) { + this.faceColors[var51] = (short)var2.readUnsignedShort(); + if (var12 == 1) { this.faceRenderTypes[var51] = var3.readByte(); } - if (var13 == 255) { // L: 198 + if (var13 == 255) { this.faceRenderPriorities[var51] = var4.readByte(); } - if (var14 == 1) { // L: 199 + if (var14 == 1) { this.faceAlphas[var51] = var5.readByte(); } - if (var15 == 1) { // L: 200 + if (var15 == 1) { this.faceSkins[var51] = var6.readUnsignedByte(); } - if (var16 == 1) { // L: 201 + if (var16 == 1) { this.faceTextures[var51] = (short)(var7.readUnsignedShort() - 1); } - if (this.textureCoords != null && this.faceTextures[var51] != -1) { // L: 202 + if (this.textureCoords != null && this.faceTextures[var51] != -1) { this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1); } } - var2.offset = var34; // L: 204 - var3.offset = var29; // L: 205 - var51 = 0; // L: 206 - var52 = 0; // L: 207 - var53 = 0; // L: 208 - var54 = 0; // L: 209 + var2.offset = var34; + var3.offset = var29; + var51 = 0; + var52 = 0; + var53 = 0; + var54 = 0; int var56; - for (var55 = 0; var55 < var10; ++var55) { // L: 210 - var56 = var3.readUnsignedByte(); // L: 211 - if (var56 == 1) { // L: 212 - var51 = var2.readShortSmart() + var54; // L: 213 - var52 = var2.readShortSmart() + var51; // L: 215 - var53 = var2.readShortSmart() + var52; // L: 217 - var54 = var53; // L: 218 - this.indices1[var55] = var51; // L: 219 - this.indices2[var55] = var52; // L: 220 - this.indices3[var55] = var53; // L: 221 + for (var55 = 0; var55 < var10; ++var55) { + var56 = var3.readUnsignedByte(); + if (var56 == 1) { + var51 = var2.readShortSmart() + var54; + var52 = var2.readShortSmart() + var51; + var53 = var2.readShortSmart() + var52; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var52; + this.indices3[var55] = var53; } - if (var56 == 2) { // L: 223 - var52 = var53; // L: 224 - var53 = var2.readShortSmart() + var54; // L: 225 - var54 = var53; // L: 226 - this.indices1[var55] = var51; // L: 227 - this.indices2[var55] = var52; // L: 228 - this.indices3[var55] = var53; // L: 229 + if (var56 == 2) { + var52 = var53; + var53 = var2.readShortSmart() + var54; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var52; + this.indices3[var55] = var53; } - if (var56 == 3) { // L: 231 - var51 = var53; // L: 232 - var53 = var2.readShortSmart() + var54; // L: 233 - var54 = var53; // L: 234 - this.indices1[var55] = var51; // L: 235 - this.indices2[var55] = var52; // L: 236 - this.indices3[var55] = var53; // L: 237 + if (var56 == 3) { + var51 = var53; + var53 = var2.readShortSmart() + var54; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var52; + this.indices3[var55] = var53; } - if (var56 == 4) { // L: 239 - int var57 = var51; // L: 240 - var51 = var52; // L: 241 - var52 = var57; // L: 242 - var53 = var2.readShortSmart() + var54; // L: 243 - var54 = var53; // L: 244 - this.indices1[var55] = var51; // L: 245 - this.indices2[var55] = var57; // L: 246 - this.indices3[var55] = var53; // L: 247 + if (var56 == 4) { + int var57 = var51; + var51 = var52; + var52 = var57; + var53 = var2.readShortSmart() + var54; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var57; + this.indices3[var55] = var53; } } - var2.offset = var41; // L: 250 - var3.offset = var42; // L: 251 - var4.offset = var43; // L: 252 - var5.offset = var44; // L: 253 - var6.offset = var45; // L: 254 - var7.offset = var46; // L: 255 + var2.offset = var41; + var3.offset = var42; + var4.offset = var43; + var5.offset = var44; + var6.offset = var45; + var7.offset = var46; - for (var55 = 0; var55 < var11; ++var55) { // L: 256 - var56 = this.textureRenderTypes[var55] & 255; // L: 257 - if (var56 == 0) { // L: 258 - this.texTriangleX[var55] = (short)var2.readUnsignedShort(); // L: 259 - this.texTriangleY[var55] = (short)var2.readUnsignedShort(); // L: 260 - this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); // L: 261 + for (var55 = 0; var55 < var11; ++var55) { + var56 = this.textureRenderTypes[var55] & 255; + if (var56 == 0) { + this.texTriangleX[var55] = (short)var2.readUnsignedShort(); + this.texTriangleY[var55] = (short)var2.readUnsignedShort(); + this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); } } - var2.offset = var26; // L: 264 - var55 = var2.readUnsignedByte(); // L: 265 - if (var55 != 0) { // L: 266 + var2.offset = var26; + var55 = var2.readUnsignedByte(); + if (var55 != 0) { new ModelData0(); - var2.readUnsignedShort(); // L: 268 - var2.readUnsignedShort(); // L: 269 - var2.readUnsignedShort(); // L: 270 - var2.readInt(); // L: 271 + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readInt(); } - } // L: 273 + } @ObfuscatedName("j") - void method3903(byte[] var1) { - boolean var2 = false; // L: 276 - boolean var3 = false; // L: 277 - Buffer var4 = new Buffer(var1); // L: 278 - Buffer var5 = new Buffer(var1); // L: 279 - Buffer var6 = new Buffer(var1); // L: 280 - Buffer var7 = new Buffer(var1); // L: 281 - Buffer var8 = new Buffer(var1); // L: 282 - var4.offset = var1.length - 18; // L: 283 - int var9 = var4.readUnsignedShort(); // L: 284 - int var10 = var4.readUnsignedShort(); // L: 285 - int var11 = var4.readUnsignedByte(); // L: 286 - int var12 = var4.readUnsignedByte(); // L: 287 - int var13 = var4.readUnsignedByte(); // L: 288 - int var14 = var4.readUnsignedByte(); // L: 289 - int var15 = var4.readUnsignedByte(); // L: 290 - int var16 = var4.readUnsignedByte(); // L: 291 - int var17 = var4.readUnsignedShort(); // L: 292 - int var18 = var4.readUnsignedShort(); // L: 293 - int var19 = var4.readUnsignedShort(); // L: 294 - int var20 = var4.readUnsignedShort(); // L: 295 - byte var21 = 0; // L: 296 - int var45 = var21 + var9; // L: 298 - int var23 = var45; // L: 299 - var45 += var10; // L: 300 - int var24 = var45; // L: 301 - if (var13 == 255) { // L: 302 + void method3795(byte[] var1) { + boolean var2 = false; + boolean var3 = false; + Buffer var4 = new Buffer(var1); + Buffer var5 = new Buffer(var1); + Buffer var6 = new Buffer(var1); + Buffer var7 = new Buffer(var1); + Buffer var8 = new Buffer(var1); + var4.offset = var1.length - 18; + int var9 = var4.readUnsignedShort(); + int var10 = var4.readUnsignedShort(); + int var11 = var4.readUnsignedByte(); + int var12 = var4.readUnsignedByte(); + int var13 = var4.readUnsignedByte(); + int var14 = var4.readUnsignedByte(); + int var15 = var4.readUnsignedByte(); + int var16 = var4.readUnsignedByte(); + int var17 = var4.readUnsignedShort(); + int var18 = var4.readUnsignedShort(); + int var19 = var4.readUnsignedShort(); + int var20 = var4.readUnsignedShort(); + byte var21 = 0; + int var45 = var21 + var9; + int var23 = var45; + var45 += var10; + int var24 = var45; + if (var13 == 255) { var45 += var10; } - int var25 = var45; // L: 303 - if (var15 == 1) { // L: 304 + int var25 = var45; + if (var15 == 1) { var45 += var10; } - int var26 = var45; // L: 305 - if (var12 == 1) { // L: 306 + int var26 = var45; + if (var12 == 1) { var45 += var10; } - int var27 = var45; // L: 307 - if (var16 == 1) { // L: 308 + int var27 = var45; + if (var16 == 1) { var45 += var9; } - int var28 = var45; // L: 309 - if (var14 == 1) { // L: 310 + int var28 = var45; + if (var14 == 1) { var45 += var10; } - int var29 = var45; // L: 311 - var45 += var20; // L: 312 - int var30 = var45; // L: 313 - var45 += var10 * 2; // L: 314 - int var31 = var45; // L: 315 - var45 += var11 * 6; // L: 316 - int var32 = var45; // L: 317 - var45 += var17; // L: 318 - int var33 = var45; // L: 319 - var45 += var18; // L: 320 - int var10000 = var45 + var19; // L: 322 - this.verticesCount = var9; // L: 323 - this.faceCount = var10; // L: 324 - this.textureTriangleCount = var11; // L: 325 - this.verticesX = new int[var9]; // L: 326 - this.verticesY = new int[var9]; // L: 327 - this.verticesZ = new int[var9]; // L: 328 - this.indices1 = new int[var10]; // L: 329 - this.indices2 = new int[var10]; // L: 330 - this.indices3 = new int[var10]; // L: 331 - if (var11 > 0) { // L: 332 - this.textureRenderTypes = new byte[var11]; // L: 333 - this.texTriangleX = new short[var11]; // L: 334 - this.texTriangleY = new short[var11]; // L: 335 - this.texTriangleZ = new short[var11]; // L: 336 + int var29 = var45; + var45 += var20; + int var30 = var45; + var45 += var10 * 2; + int var31 = var45; + var45 += var11 * 6; + int var32 = var45; + var45 += var17; + int var33 = var45; + var45 += var18; + int var10000 = var45 + var19; + this.verticesCount = var9; + this.faceCount = var10; + this.textureTriangleCount = var11; + this.verticesX = new int[var9]; + this.verticesY = new int[var9]; + this.verticesZ = new int[var9]; + this.indices1 = new int[var10]; + this.indices2 = new int[var10]; + this.indices3 = new int[var10]; + if (var11 > 0) { + this.textureRenderTypes = new byte[var11]; + this.texTriangleX = new short[var11]; + this.texTriangleY = new short[var11]; + this.texTriangleZ = new short[var11]; } - if (var16 == 1) { // L: 338 + if (var16 == 1) { this.vertexSkins = new int[var9]; } - if (var12 == 1) { // L: 339 - this.faceRenderTypes = new byte[var10]; // L: 340 - this.textureCoords = new byte[var10]; // L: 341 - this.faceTextures = new short[var10]; // L: 342 + if (var12 == 1) { + this.faceRenderTypes = new byte[var10]; + this.textureCoords = new byte[var10]; + this.faceTextures = new short[var10]; } - if (var13 == 255) { // L: 344 + if (var13 == 255) { this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; // L: 345 + this.priority = (byte)var13; } - if (var14 == 1) { // L: 346 + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if (var15 == 1) { // L: 347 + if (var15 == 1) { this.faceSkins = new int[var10]; } - this.faceColors = new short[var10]; // L: 348 - var4.offset = var21; // L: 349 - var5.offset = var32; // L: 350 - var6.offset = var33; // L: 351 - var7.offset = var45; // L: 352 - var8.offset = var27; // L: 353 - int var35 = 0; // L: 354 - int var36 = 0; // L: 355 - int var37 = 0; // L: 356 + this.faceColors = new short[var10]; + var4.offset = var21; + var5.offset = var32; + var6.offset = var33; + var7.offset = var45; + var8.offset = var27; + int var35 = 0; + int var36 = 0; + int var37 = 0; int var38; int var39; int var40; int var41; int var42; - for (var38 = 0; var38 < var9; ++var38) { // L: 357 - var39 = var4.readUnsignedByte(); // L: 358 - var40 = 0; // L: 359 - if ((var39 & 1) != 0) { // L: 360 + for (var38 = 0; var38 < var9; ++var38) { + var39 = var4.readUnsignedByte(); + var40 = 0; + if ((var39 & 1) != 0) { var40 = var5.readShortSmart(); } - var41 = 0; // L: 361 - if ((var39 & 2) != 0) { // L: 362 + var41 = 0; + if ((var39 & 2) != 0) { var41 = var6.readShortSmart(); } - var42 = 0; // L: 363 - if ((var39 & 4) != 0) { // L: 364 + var42 = 0; + if ((var39 & 4) != 0) { var42 = var7.readShortSmart(); } - this.verticesX[var38] = var35 + var40; // L: 365 - this.verticesY[var38] = var36 + var41; // L: 366 - this.verticesZ[var38] = var37 + var42; // L: 367 - var35 = this.verticesX[var38]; // L: 368 - var36 = this.verticesY[var38]; // L: 369 - var37 = this.verticesZ[var38]; // L: 370 - if (var16 == 1) { // L: 371 + this.verticesX[var38] = var35 + var40; + this.verticesY[var38] = var36 + var41; + this.verticesZ[var38] = var37 + var42; + var35 = this.verticesX[var38]; + var36 = this.verticesY[var38]; + var37 = this.verticesZ[var38]; + if (var16 == 1) { this.vertexSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var30; // L: 373 - var5.offset = var26; // L: 374 - var6.offset = var24; // L: 375 - var7.offset = var28; // L: 376 - var8.offset = var25; // L: 377 + var4.offset = var30; + var5.offset = var26; + var6.offset = var24; + var7.offset = var28; + var8.offset = var25; - for (var38 = 0; var38 < var10; ++var38) { // L: 378 - this.faceColors[var38] = (short)var4.readUnsignedShort(); // L: 379 - if (var12 == 1) { // L: 380 - var39 = var5.readUnsignedByte(); // L: 381 - if ((var39 & 1) == 1) { // L: 382 - this.faceRenderTypes[var38] = 1; // L: 383 - var2 = true; // L: 384 + for (var38 = 0; var38 < var10; ++var38) { + this.faceColors[var38] = (short)var4.readUnsignedShort(); + if (var12 == 1) { + var39 = var5.readUnsignedByte(); + if ((var39 & 1) == 1) { + this.faceRenderTypes[var38] = 1; + var2 = true; } else { - this.faceRenderTypes[var38] = 0; // L: 386 + this.faceRenderTypes[var38] = 0; } - if ((var39 & 2) == 2) { // L: 387 - this.textureCoords[var38] = (byte)(var39 >> 2); // L: 388 - this.faceTextures[var38] = this.faceColors[var38]; // L: 389 - this.faceColors[var38] = 127; // L: 390 - if (this.faceTextures[var38] != -1) { // L: 391 + if ((var39 & 2) == 2) { + this.textureCoords[var38] = (byte)(var39 >> 2); + this.faceTextures[var38] = this.faceColors[var38]; + this.faceColors[var38] = 127; + if (this.faceTextures[var38] != -1) { var3 = true; } } else { - this.textureCoords[var38] = -1; // L: 394 - this.faceTextures[var38] = -1; // L: 395 + this.textureCoords[var38] = -1; + this.faceTextures[var38] = -1; } } - if (var13 == 255) { // L: 398 + if (var13 == 255) { this.faceRenderPriorities[var38] = var6.readByte(); } - if (var14 == 1) { // L: 399 + if (var14 == 1) { this.faceAlphas[var38] = var7.readByte(); } - if (var15 == 1) { // L: 400 + if (var15 == 1) { this.faceSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var29; // L: 402 - var5.offset = var23; // L: 403 - var38 = 0; // L: 404 - var39 = 0; // L: 405 - var40 = 0; // L: 406 - var41 = 0; // L: 407 + var4.offset = var29; + var5.offset = var23; + var38 = 0; + var39 = 0; + var40 = 0; + var41 = 0; int var43; int var44; - for (var42 = 0; var42 < var10; ++var42) { // L: 408 - var43 = var5.readUnsignedByte(); // L: 409 - if (var43 == 1) { // L: 410 - var38 = var4.readShortSmart() + var41; // L: 411 - var39 = var4.readShortSmart() + var38; // L: 413 - var40 = var4.readShortSmart() + var39; // L: 415 - var41 = var40; // L: 416 - this.indices1[var42] = var38; // L: 417 - this.indices2[var42] = var39; // L: 418 - this.indices3[var42] = var40; // L: 419 + for (var42 = 0; var42 < var10; ++var42) { + var43 = var5.readUnsignedByte(); + if (var43 == 1) { + var38 = var4.readShortSmart() + var41; + var39 = var4.readShortSmart() + var38; + var40 = var4.readShortSmart() + var39; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var39; + this.indices3[var42] = var40; } - if (var43 == 2) { // L: 421 - var39 = var40; // L: 422 - var40 = var4.readShortSmart() + var41; // L: 423 - var41 = var40; // L: 424 - this.indices1[var42] = var38; // L: 425 - this.indices2[var42] = var39; // L: 426 - this.indices3[var42] = var40; // L: 427 + if (var43 == 2) { + var39 = var40; + var40 = var4.readShortSmart() + var41; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var39; + this.indices3[var42] = var40; } - if (var43 == 3) { // L: 429 - var38 = var40; // L: 430 - var40 = var4.readShortSmart() + var41; // L: 431 - var41 = var40; // L: 432 - this.indices1[var42] = var38; // L: 433 - this.indices2[var42] = var39; // L: 434 - this.indices3[var42] = var40; // L: 435 + if (var43 == 3) { + var38 = var40; + var40 = var4.readShortSmart() + var41; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var39; + this.indices3[var42] = var40; } - if (var43 == 4) { // L: 437 - var44 = var38; // L: 438 - var38 = var39; // L: 439 - var39 = var44; // L: 440 - var40 = var4.readShortSmart() + var41; // L: 441 - var41 = var40; // L: 442 - this.indices1[var42] = var38; // L: 443 - this.indices2[var42] = var44; // L: 444 - this.indices3[var42] = var40; // L: 445 + if (var43 == 4) { + var44 = var38; + var38 = var39; + var39 = var44; + var40 = var4.readShortSmart() + var41; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var44; + this.indices3[var42] = var40; } } - var4.offset = var31; // L: 448 + var4.offset = var31; - for (var42 = 0; var42 < var11; ++var42) { // L: 449 - this.textureRenderTypes[var42] = 0; // L: 450 - this.texTriangleX[var42] = (short)var4.readUnsignedShort(); // L: 451 - this.texTriangleY[var42] = (short)var4.readUnsignedShort(); // L: 452 - this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); // L: 453 + for (var42 = 0; var42 < var11; ++var42) { + this.textureRenderTypes[var42] = 0; + this.texTriangleX[var42] = (short)var4.readUnsignedShort(); + this.texTriangleY[var42] = (short)var4.readUnsignedShort(); + this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); } - if (this.textureCoords != null) { // L: 455 - boolean var46 = false; // L: 456 + if (this.textureCoords != null) { + boolean var46 = false; - for (var43 = 0; var43 < var10; ++var43) { // L: 457 - var44 = this.textureCoords[var43] & 255; // L: 458 - if (var44 != 255) { // L: 459 - if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { // L: 460 + for (var43 = 0; var43 < var10; ++var43) { + var44 = this.textureCoords[var43] & 255; + if (var44 != 255) { + if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { this.textureCoords[var43] = -1; } else { - var46 = true; // L: 461 + var46 = true; } } } - if (!var46) { // L: 464 + if (!var46) { this.textureCoords = null; } } - if (!var3) { // L: 466 + if (!var3) { this.faceTextures = null; } - if (!var2) { // L: 467 + if (!var2) { this.faceRenderTypes = null; } - } // L: 468 + } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lga;I)I" + descriptor = "(Lgz;I)I" ) - final int method3868(ModelData var1, int var2) { - int var3 = -1; // L: 567 - int var4 = var1.verticesX[var2]; // L: 568 - int var5 = var1.verticesY[var2]; // L: 569 - int var6 = var1.verticesZ[var2]; // L: 570 + final int method3831(ModelData var1, int var2) { + int var3 = -1; + int var4 = var1.verticesX[var2]; + int var5 = var1.verticesY[var2]; + int var6 = var1.verticesZ[var2]; - for (int var7 = 0; var7 < this.verticesCount; ++var7) { // L: 571 - if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { // L: 572 - var3 = var7; // L: 573 + for (int var7 = 0; var7 < this.verticesCount; ++var7) { + if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { + var3 = var7; break; } } - if (var3 == -1) { // L: 577 - this.verticesX[this.verticesCount] = var4; // L: 578 - this.verticesY[this.verticesCount] = var5; // L: 579 - this.verticesZ[this.verticesCount] = var6; // L: 580 + if (var3 == -1) { + this.verticesX[this.verticesCount] = var4; + this.verticesY[this.verticesCount] = var5; + this.verticesZ[this.verticesCount] = var6; if (var1.vertexSkins != null) { - this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 581 + this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; } - var3 = this.verticesCount++; // L: 582 + var3 = this.verticesCount++; } - return var3; // L: 584 + return var3; } - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lgz;" ) - public ModelData method3870() { - ModelData var1 = new ModelData(); // L: 650 - if (this.faceRenderTypes != null) { // L: 651 - var1.faceRenderTypes = new byte[this.faceCount]; // L: 652 + public ModelData method3797() { + ModelData var1 = new ModelData(); + if (this.faceRenderTypes != null) { + var1.faceRenderTypes = new byte[this.faceCount]; - for (int var2 = 0; var2 < this.faceCount; ++var2) { // L: 653 + for (int var2 = 0; var2 < this.faceCount; ++var2) { var1.faceRenderTypes[var2] = this.faceRenderTypes[var2]; } } - var1.verticesCount = this.verticesCount; // L: 655 - var1.faceCount = this.faceCount; // L: 656 - var1.textureTriangleCount = this.textureTriangleCount; // L: 657 - var1.verticesX = this.verticesX; // L: 658 - var1.verticesY = this.verticesY; // L: 659 - var1.verticesZ = this.verticesZ; // L: 660 - var1.indices1 = this.indices1; // L: 661 - var1.indices2 = this.indices2; // L: 662 - var1.indices3 = this.indices3; // L: 663 - var1.faceRenderPriorities = this.faceRenderPriorities; // L: 664 - var1.faceAlphas = this.faceAlphas; // L: 665 - var1.textureCoords = this.textureCoords; // L: 666 - var1.faceColors = this.faceColors; // L: 667 - var1.faceTextures = this.faceTextures; // L: 668 - var1.priority = this.priority; // L: 669 - var1.textureRenderTypes = this.textureRenderTypes; // L: 670 - var1.texTriangleX = this.texTriangleX; // L: 671 - var1.texTriangleY = this.texTriangleY; // L: 672 - var1.texTriangleZ = this.texTriangleZ; // L: 673 - var1.vertexSkins = this.vertexSkins; // L: 674 - var1.faceSkins = this.faceSkins; // L: 675 - var1.vertexLabels = this.vertexLabels; // L: 676 - var1.faceLabelsAlpha = this.faceLabelsAlpha; // L: 677 - var1.vertexNormals = this.vertexNormals; // L: 678 - var1.faceNormals = this.faceNormals; // L: 679 - var1.ambient = this.ambient; // L: 680 - var1.contrast = this.contrast; // L: 681 - return var1; // L: 682 + var1.verticesCount = this.verticesCount; + var1.faceCount = this.faceCount; + var1.textureTriangleCount = this.textureTriangleCount; + var1.verticesX = this.verticesX; + var1.verticesY = this.verticesY; + var1.verticesZ = this.verticesZ; + var1.indices1 = this.indices1; + var1.indices2 = this.indices2; + var1.indices3 = this.indices3; + var1.faceRenderPriorities = this.faceRenderPriorities; + var1.faceAlphas = this.faceAlphas; + var1.textureCoords = this.textureCoords; + var1.faceColors = this.faceColors; + var1.faceTextures = this.faceTextures; + var1.priority = this.priority; + var1.textureRenderTypes = this.textureRenderTypes; + var1.texTriangleX = this.texTriangleX; + var1.texTriangleY = this.texTriangleY; + var1.texTriangleZ = this.texTriangleZ; + var1.vertexSkins = this.vertexSkins; + var1.faceSkins = this.faceSkins; + var1.vertexLabels = this.vertexLabels; + var1.faceLabelsAlpha = this.faceLabelsAlpha; + var1.vertexNormals = this.vertexNormals; + var1.faceNormals = this.faceNormals; + var1.ambient = this.ambient; + var1.contrast = this.contrast; + return var1; } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lga;" + descriptor = "([[IIIIZI)Lgz;" ) - public ModelData method3933(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBounds(); // L: 686 - int var7 = var2 + this.field2193; // L: 687 - int var8 = var2 + this.field2194; // L: 688 - int var9 = var4 + this.field2195; // L: 689 - int var10 = var4 + this.field2176; // L: 690 - if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691 - var7 >>= 7; // L: 692 - var8 = var8 + 127 >> 7; // L: 693 - var9 >>= 7; // L: 694 - var10 = var10 + 127 >> 7; // L: 695 - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 696 + public ModelData method3798(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + this.calculateBounds(); + int var7 = var2 + this.field2180; + int var8 = var2 + this.field2181; + int var9 = var4 + this.field2182; + int var10 = var4 + this.field2161; + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + var7 >>= 7; + var8 = var8 + 127 >> 7; + var9 >>= 7; + var10 = var10 + 127 >> 7; + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; } else { - ModelData var11 = new ModelData(); // L: 699 - var11.verticesCount = this.verticesCount; // L: 700 - var11.faceCount = this.faceCount; // L: 701 - var11.textureTriangleCount = this.textureTriangleCount; // L: 702 - var11.verticesX = this.verticesX; // L: 703 - var11.verticesZ = this.verticesZ; // L: 704 - var11.indices1 = this.indices1; // L: 705 - var11.indices2 = this.indices2; // L: 706 - var11.indices3 = this.indices3; // L: 707 - var11.faceRenderTypes = this.faceRenderTypes; // L: 708 - var11.faceRenderPriorities = this.faceRenderPriorities; // L: 709 - var11.faceAlphas = this.faceAlphas; // L: 710 - var11.textureCoords = this.textureCoords; // L: 711 - var11.faceColors = this.faceColors; // L: 712 - var11.faceTextures = this.faceTextures; // L: 713 - var11.priority = this.priority; // L: 714 - var11.textureRenderTypes = this.textureRenderTypes; // L: 715 - var11.texTriangleX = this.texTriangleX; // L: 716 - var11.texTriangleY = this.texTriangleY; // L: 717 - var11.texTriangleZ = this.texTriangleZ; // L: 718 - var11.vertexSkins = this.vertexSkins; // L: 719 - var11.faceSkins = this.faceSkins; // L: 720 - var11.vertexLabels = this.vertexLabels; // L: 721 - var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 722 - var11.ambient = this.ambient; // L: 723 - var11.contrast = this.contrast; // L: 724 - var11.verticesY = new int[var11.verticesCount]; // L: 725 + ModelData var11 = new ModelData(); + var11.verticesCount = this.verticesCount; + var11.faceCount = this.faceCount; + var11.textureTriangleCount = this.textureTriangleCount; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceRenderTypes = this.faceRenderTypes; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.textureCoords = this.textureCoords; + var11.faceColors = this.faceColors; + var11.faceTextures = this.faceTextures; + var11.priority = this.priority; + var11.textureRenderTypes = this.textureRenderTypes; + var11.texTriangleX = this.texTriangleX; + var11.texTriangleY = this.texTriangleY; + var11.texTriangleZ = this.texTriangleZ; + var11.vertexSkins = this.vertexSkins; + var11.faceSkins = this.faceSkins; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.ambient = this.ambient; + var11.contrast = this.contrast; + var11.verticesY = new int[var11.verticesCount]; int var12; int var13; int var14; @@ -1093,601 +1093,601 @@ public class ModelData extends Renderable { int var19; int var20; int var21; - if (var6 == 0) { // L: 730 - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 731 - var13 = var2 + this.verticesX[var12]; // L: 732 - var14 = var4 + this.verticesZ[var12]; // L: 733 - var15 = var13 & 127; // L: 734 - var16 = var14 & 127; // L: 735 - var17 = var13 >> 7; // L: 736 - var18 = var14 >> 7; // L: 737 - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 738 - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 739 - var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 740 - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 741 + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 745 - var13 = (-this.verticesY[var12] << 16) / super.height; // L: 746 - if (var13 < var6) { // L: 747 - var14 = var2 + this.verticesX[var12]; // L: 748 - var15 = var4 + this.verticesZ[var12]; // L: 749 - var16 = var14 & 127; // L: 750 - var17 = var15 & 127; // L: 751 - var18 = var14 >> 7; // L: 752 - var19 = var15 >> 7; // L: 753 - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 754 - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 755 - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 756 - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 757 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; } } } - var11.invalidate(); // L: 761 - return var11; // L: 762 + var11.invalidate(); + return var11; } } else { return this; } } - @ObfuscatedName("h") - void method3872() { + @ObfuscatedName("o") + void method3799() { int[] var1; int var2; int var10002; int var3; int var4; - if (this.vertexSkins != null) { // L: 766 - var1 = new int[256]; // L: 767 - var2 = 0; // L: 768 + if (this.vertexSkins != null) { + var1 = new int[256]; + var2 = 0; - for (var3 = 0; var3 < this.verticesCount; ++var3) { // L: 769 - var4 = this.vertexSkins[var3]; // L: 770 - var10002 = var1[var4]++; // L: 771 - if (var4 > var2) { // L: 772 + for (var3 = 0; var3 < this.verticesCount; ++var3) { + var4 = this.vertexSkins[var3]; + var10002 = var1[var4]++; + if (var4 > var2) { var2 = var4; } } - this.vertexLabels = new int[var2 + 1][]; // L: 774 + this.vertexLabels = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { // L: 775 - this.vertexLabels[var3] = new int[var1[var3]]; // L: 776 - var1[var3] = 0; // L: 777 + for (var3 = 0; var3 <= var2; ++var3) { + this.vertexLabels[var3] = new int[var1[var3]]; + var1[var3] = 0; } - for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { // L: 779 781 - var4 = this.vertexSkins[var3]; // L: 780 + for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { + var4 = this.vertexSkins[var3]; } - this.vertexSkins = null; // L: 783 + this.vertexSkins = null; } - if (this.faceSkins != null) { // L: 785 - var1 = new int[256]; // L: 786 - var2 = 0; // L: 787 + if (this.faceSkins != null) { + var1 = new int[256]; + var2 = 0; - for (var3 = 0; var3 < this.faceCount; ++var3) { // L: 788 - var4 = this.faceSkins[var3]; // L: 789 - var10002 = var1[var4]++; // L: 790 - if (var4 > var2) { // L: 791 + for (var3 = 0; var3 < this.faceCount; ++var3) { + var4 = this.faceSkins[var3]; + var10002 = var1[var4]++; + if (var4 > var2) { var2 = var4; } } - this.faceLabelsAlpha = new int[var2 + 1][]; // L: 793 + this.faceLabelsAlpha = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { // L: 794 - this.faceLabelsAlpha[var3] = new int[var1[var3]]; // L: 795 - var1[var3] = 0; // L: 796 + for (var3 = 0; var3 <= var2; ++var3) { + this.faceLabelsAlpha[var3] = new int[var1[var3]]; + var1[var3] = 0; } - for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { // L: 798 800 - var4 = this.faceSkins[var3]; // L: 799 + for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { + var4 = this.faceSkins[var3]; } - this.faceSkins = null; // L: 802 + this.faceSkins = null; } - } // L: 804 + } - @ObfuscatedName("d") - public void method3873() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807 - int var2 = this.verticesX[var1]; // L: 808 - this.verticesX[var1] = this.verticesZ[var1]; // L: 809 - this.verticesZ[var1] = -var2; // L: 810 + @ObfuscatedName("x") + public void method3792() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + this.verticesX[var1] = this.verticesZ[var1]; + this.verticesZ[var1] = -var2; } - this.invalidate(); // L: 812 - } // L: 813 + this.invalidate(); + } - @ObfuscatedName("z") - public void method3874() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816 - this.verticesX[var1] = -this.verticesX[var1]; // L: 817 - this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818 + @ObfuscatedName("r") + public void method3801() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + this.verticesX[var1] = -this.verticesX[var1]; + this.verticesZ[var1] = -this.verticesZ[var1]; } - this.invalidate(); // L: 820 - } // L: 821 + this.invalidate(); + } - @ObfuscatedName("b") - public void method3875() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824 - int var2 = this.verticesZ[var1]; // L: 825 - this.verticesZ[var1] = this.verticesX[var1]; // L: 826 - this.verticesX[var1] = -var2; // L: 827 + @ObfuscatedName("p") + public void method3802() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesZ[var1]; + this.verticesZ[var1] = this.verticesX[var1]; + this.verticesX[var1] = -var2; } - this.invalidate(); // L: 829 - } // L: 830 + this.invalidate(); + } - @ObfuscatedName("i") - public void method3864(int var1) { - int var2 = ModelData_sine[var1]; // L: 833 - int var3 = ModelData_cosine[var1]; // L: 834 + @ObfuscatedName("h") + public void method3856(int var1) { + int var2 = ModelData_sine[var1]; + int var3 = ModelData_cosine[var1]; - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 835 - int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; // L: 836 - this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; // L: 837 - this.verticesX[var4] = var5; // L: 838 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; + this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; + this.verticesX[var4] = var5; } - this.invalidate(); // L: 840 - } // L: 841 + this.invalidate(); + } @ObfuscatedName("k") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 - int[] var10000 = this.verticesX; // L: 845 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int[] var10000 = this.verticesX; var10000[var4] += var1; - var10000 = this.verticesY; // L: 846 + var10000 = this.verticesY; var10000[var4] += var2; - var10000 = this.verticesZ; // L: 847 + var10000 = this.verticesZ; var10000[var4] += var3; } - this.invalidate(); // L: 849 - } // L: 850 + this.invalidate(); + } - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("recolor") public void recolor(short var1, short var2) { - for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853 - if (this.faceColors[var3] == var1) { // L: 854 + for (int var3 = 0; var3 < this.faceCount; ++var3) { + if (this.faceColors[var3] == var1) { this.faceColors[var3] = var2; } } - } // L: 856 + } - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("retexture") public void retexture(short var1, short var2) { - if (this.faceTextures != null) { // L: 859 - for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 860 + if (this.faceTextures != null) { + for (int var3 = 0; var3 < this.faceCount; ++var3) { if (this.faceTextures[var3] == var1) { - this.faceTextures[var3] = var2; // L: 861 + this.faceTextures[var3] = var2; } } } - } // L: 863 + } - @ObfuscatedName("x") - public void method3877() { + @ObfuscatedName("u") + public void method3807() { int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866 + for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; } - for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 867 - int var2 = this.indices1[var1]; // L: 868 - this.indices1[var1] = this.indices3[var1]; // L: 869 - this.indices3[var1] = var2; // L: 870 + for (var1 = 0; var1 < this.faceCount; ++var1) { + int var2 = this.indices1[var1]; + this.indices1[var1] = this.indices3[var1]; + this.indices3[var1] = var2; } - this.invalidate(); // L: 872 - } // L: 873 + this.invalidate(); + } - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("resize") public void resize(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 877 - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 878 - this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 879 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; } - this.invalidate(); // L: 881 - } // L: 882 + this.invalidate(); + } - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("calculateVertexNormals") public void calculateVertexNormals() { - if (this.vertexNormals == null) { // L: 885 - this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 886 + if (this.vertexNormals == null) { + this.vertexNormals = new VertexNormal[this.verticesCount]; int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 887 + for (var1 = 0; var1 < this.verticesCount; ++var1) { this.vertexNormals[var1] = new VertexNormal(); } - for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 888 - int var2 = this.indices1[var1]; // L: 889 - int var3 = this.indices2[var1]; // L: 890 - int var4 = this.indices3[var1]; // L: 891 - int var5 = this.verticesX[var3] - this.verticesX[var2]; // L: 892 - int var6 = this.verticesY[var3] - this.verticesY[var2]; // L: 893 - int var7 = this.verticesZ[var3] - this.verticesZ[var2]; // L: 894 - int var8 = this.verticesX[var4] - this.verticesX[var2]; // L: 895 - int var9 = this.verticesY[var4] - this.verticesY[var2]; // L: 896 - int var10 = this.verticesZ[var4] - this.verticesZ[var2]; // L: 897 - int var11 = var6 * var10 - var9 * var7; // L: 898 - int var12 = var7 * var8 - var10 * var5; // L: 899 + for (var1 = 0; var1 < this.faceCount; ++var1) { + int var2 = this.indices1[var1]; + int var3 = this.indices2[var1]; + int var4 = this.indices3[var1]; + int var5 = this.verticesX[var3] - this.verticesX[var2]; + int var6 = this.verticesY[var3] - this.verticesY[var2]; + int var7 = this.verticesZ[var3] - this.verticesZ[var2]; + int var8 = this.verticesX[var4] - this.verticesX[var2]; + int var9 = this.verticesY[var4] - this.verticesY[var2]; + int var10 = this.verticesZ[var4] - this.verticesZ[var2]; + int var11 = var6 * var10 - var9 * var7; + int var12 = var7 * var8 - var10 * var5; int var13; - for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { // L: 900 901 904 - var11 >>= 1; // L: 902 - var12 >>= 1; // L: 903 + for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { + var11 >>= 1; + var12 >>= 1; } - int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); // L: 906 - if (var14 <= 0) { // L: 907 + int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); + if (var14 <= 0) { var14 = 1; } - var11 = var11 * 256 / var14; // L: 908 - var12 = var12 * 256 / var14; // L: 909 - var13 = var13 * 256 / var14; // L: 910 + var11 = var11 * 256 / var14; + var12 = var12 * 256 / var14; + var13 = var13 * 256 / var14; byte var15; - if (this.faceRenderTypes == null) { // L: 912 + if (this.faceRenderTypes == null) { var15 = 0; } else { - var15 = this.faceRenderTypes[var1]; // L: 913 + var15 = this.faceRenderTypes[var1]; } - if (var15 == 0) { // L: 914 - VertexNormal var16 = this.vertexNormals[var2]; // L: 916 - var16.x += var11; // L: 917 - var16.y += var12; // L: 918 - var16.z += var13; // L: 919 - ++var16.magnitude; // L: 920 - var16 = this.vertexNormals[var3]; // L: 921 - var16.x += var11; // L: 922 - var16.y += var12; // L: 923 - var16.z += var13; // L: 924 - ++var16.magnitude; // L: 925 - var16 = this.vertexNormals[var4]; // L: 926 - var16.x += var11; // L: 927 - var16.y += var12; // L: 928 - var16.z += var13; // L: 929 - ++var16.magnitude; // L: 930 - } else if (var15 == 1) { // L: 932 - if (this.faceNormals == null) { // L: 933 + if (var15 == 0) { + VertexNormal var16 = this.vertexNormals[var2]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + var16 = this.vertexNormals[var3]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + var16 = this.vertexNormals[var4]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + } else if (var15 == 1) { + if (this.faceNormals == null) { this.faceNormals = new FaceNormal[this.faceCount]; } - FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); // L: 934 - var17.x = var11; // L: 935 - var17.y = var12; // L: 936 - var17.z = var13; // L: 937 + FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); + var17.x = var11; + var17.y = var12; + var17.z = var13; } } } - } // L: 940 + } - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("invalidate") void invalidate() { - this.vertexNormals = null; // L: 943 - this.field2168 = null; // L: 944 - this.faceNormals = null; // L: 945 - this.isBoundsCalculated = false; // L: 946 - } // L: 947 + this.vertexNormals = null; + this.field2175 = null; + this.faceNormals = null; + this.isBoundsCalculated = false; + } - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("calculateBounds") void calculateBounds() { - if (!this.isBoundsCalculated) { // L: 950 - super.height = 0; // L: 951 - this.field2192 = 0; // L: 952 - this.field2193 = 999999; // L: 953 - this.field2194 = -999999; // L: 954 - this.field2176 = -99999; // L: 955 - this.field2195 = 99999; // L: 956 + if (!this.isBoundsCalculated) { + super.height = 0; + this.field2179 = 0; + this.field2180 = 999999; + this.field2181 = -999999; + this.field2161 = -99999; + this.field2182 = 99999; - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957 - int var2 = this.verticesX[var1]; // L: 958 - int var3 = this.verticesY[var1]; // L: 959 - int var4 = this.verticesZ[var1]; // L: 960 - if (var2 < this.field2193) { // L: 961 - this.field2193 = var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + if (var2 < this.field2180) { + this.field2180 = var2; } - if (var2 > this.field2194) { // L: 962 - this.field2194 = var2; + if (var2 > this.field2181) { + this.field2181 = var2; } - if (var4 < this.field2195) { // L: 963 - this.field2195 = var4; + if (var4 < this.field2182) { + this.field2182 = var4; } - if (var4 > this.field2176) { // L: 964 - this.field2176 = var4; + if (var4 > this.field2161) { + this.field2161 = var4; } - if (-var3 > super.height) { // L: 965 + if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field2192) { // L: 966 - this.field2192 = var3; + if (var3 > this.field2179) { + this.field2179 = var3; } } - this.isBoundsCalculated = true; // L: 968 + this.isBoundsCalculated = true; } - } // L: 969 + } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIII)Lgd;" + descriptor = "(IIIII)Lgl;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { - this.calculateVertexNormals(); // L: 1028 - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1029 - int var7 = var6 * var2 >> 8; // L: 1030 - Model var8 = new Model(); // L: 1031 - var8.faceColors1 = new int[this.faceCount]; // L: 1032 - var8.faceColors2 = new int[this.faceCount]; // L: 1033 - var8.faceColors3 = new int[this.faceCount]; // L: 1034 - if (this.textureTriangleCount > 0 && this.textureCoords != null) { // L: 1035 - int[] var9 = new int[this.textureTriangleCount]; // L: 1036 + this.calculateVertexNormals(); + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); + int var7 = var6 * var2 >> 8; + Model var8 = new Model(); + var8.faceColors1 = new int[this.faceCount]; + var8.faceColors2 = new int[this.faceCount]; + var8.faceColors3 = new int[this.faceCount]; + if (this.textureTriangleCount > 0 && this.textureCoords != null) { + int[] var9 = new int[this.textureTriangleCount]; int var10; - for (var10 = 0; var10 < this.faceCount; ++var10) { // L: 1037 - if (this.textureCoords[var10] != -1) { // L: 1038 + for (var10 = 0; var10 < this.faceCount; ++var10) { + if (this.textureCoords[var10] != -1) { ++var9[this.textureCoords[var10] & 255]; } } - var8.field2438 = 0; // L: 1040 + var8.field2423 = 0; - for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041 - if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042 - ++var8.field2438; + for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { + if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { + ++var8.field2423; } } - var8.field2449 = new int[var8.field2438]; // L: 1044 - var8.field2440 = new int[var8.field2438]; // L: 1045 - var8.field2441 = new int[var8.field2438]; // L: 1046 - var10 = 0; // L: 1047 + var8.field2453 = new int[var8.field2423]; + var8.field2425 = new int[var8.field2423]; + var8.field2426 = new int[var8.field2423]; + var10 = 0; int var11; - for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048 - if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049 - var8.field2449[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 - var8.field2440[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 - var8.field2441[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 - var9[var11] = var10++; // L: 1053 + for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { + if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { + var8.field2453[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field2425[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field2426[var10] = this.texTriangleZ[var11] & '\uffff'; + var9[var11] = var10++; } else { - var9[var11] = -1; // L: 1055 + var9[var11] = -1; } } - var8.field2448 = new byte[this.faceCount]; // L: 1057 + var8.field2440 = new byte[this.faceCount]; - for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058 - if (this.textureCoords[var11] != -1) { // L: 1059 - var8.field2448[var11] = (byte)var9[this.textureCoords[var11] & 255]; + for (var11 = 0; var11 < this.faceCount; ++var11) { + if (this.textureCoords[var11] != -1) { + var8.field2440[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2448[var11] = -1; // L: 1060 + var8.field2440[var11] = -1; } } } - for (int var16 = 0; var16 < this.faceCount; ++var16) { // L: 1063 + for (int var16 = 0; var16 < this.faceCount; ++var16) { byte var17; - if (this.faceRenderTypes == null) { // L: 1065 + if (this.faceRenderTypes == null) { var17 = 0; } else { - var17 = this.faceRenderTypes[var16]; // L: 1066 + var17 = this.faceRenderTypes[var16]; } byte var18; - if (this.faceAlphas == null) { // L: 1068 + if (this.faceAlphas == null) { var18 = 0; } else { - var18 = this.faceAlphas[var16]; // L: 1069 + var18 = this.faceAlphas[var16]; } short var12; - if (this.faceTextures == null) { // L: 1071 + if (this.faceTextures == null) { var12 = -1; } else { - var12 = this.faceTextures[var16]; // L: 1072 + var12 = this.faceTextures[var16]; } - if (var18 == -2) { // L: 1073 + if (var18 == -2) { var17 = 3; } - if (var18 == -1) { // L: 1074 + if (var18 == -1) { var17 = 2; } VertexNormal var13; int var14; FaceNormal var19; - if (var12 == -1) { // L: 1075 - if (var17 != 0) { // L: 1076 - if (var17 == 1) { // L: 1093 - var19 = this.faceNormals[var16]; // L: 1094 - var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095 - var8.faceColors1[var16] = method3887(this.faceColors[var16] & '\uffff', var14); // L: 1096 - var8.faceColors3[var16] = -1; // L: 1097 - } else if (var17 == 3) { // L: 1099 - var8.faceColors1[var16] = 128; // L: 1100 - var8.faceColors3[var16] = -1; // L: 1101 + if (var12 == -1) { + if (var17 != 0) { + if (var17 == 1) { + var19 = this.faceNormals[var16]; + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; + var8.faceColors1[var16] = method3838(this.faceColors[var16] & '\uffff', var14); + var8.faceColors3[var16] = -1; + } else if (var17 == 3) { + var8.faceColors1[var16] = 128; + var8.faceColors3[var16] = -1; } else { - var8.faceColors3[var16] = -2; // L: 1104 + var8.faceColors3[var16] = -2; } } else { - int var15 = this.faceColors[var16] & '\uffff'; // L: 1079 - if (this.field2168 != null && this.field2168[this.indices1[var16]] != null) { // L: 1080 - var13 = this.field2168[this.indices1[var16]]; + int var15 = this.faceColors[var16] & '\uffff'; + if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { + var13 = this.field2175[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081 + var13 = this.vertexNormals[this.indices1[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082 - var8.faceColors1[var16] = method3887(var15, var14); // L: 1083 - if (this.field2168 != null && this.field2168[this.indices2[var16]] != null) { // L: 1084 - var13 = this.field2168[this.indices2[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors1[var16] = method3838(var15, var14); + if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { + var13 = this.field2175[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085 + var13 = this.vertexNormals[this.indices2[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086 - var8.faceColors2[var16] = method3887(var15, var14); // L: 1087 - if (this.field2168 != null && this.field2168[this.indices3[var16]] != null) { // L: 1088 - var13 = this.field2168[this.indices3[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors2[var16] = method3838(var15, var14); + if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { + var13 = this.field2175[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089 + var13 = this.vertexNormals[this.indices3[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090 - var8.faceColors3[var16] = method3887(var15, var14); // L: 1091 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors3[var16] = method3838(var15, var14); } - } else if (var17 != 0) { // L: 1108 - if (var17 == 1) { // L: 1124 - var19 = this.faceNormals[var16]; // L: 1125 - var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126 - var8.faceColors1[var16] = method3888(var14); // L: 1127 - var8.faceColors3[var16] = -1; // L: 1128 + } else if (var17 != 0) { + if (var17 == 1) { + var19 = this.faceNormals[var16]; + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; + var8.faceColors1[var16] = method3815(var14); + var8.faceColors3[var16] = -1; } else { - var8.faceColors3[var16] = -2; // L: 1131 + var8.faceColors3[var16] = -2; } } else { - if (this.field2168 != null && this.field2168[this.indices1[var16]] != null) { // L: 1111 - var13 = this.field2168[this.indices1[var16]]; + if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { + var13 = this.field2175[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112 + var13 = this.vertexNormals[this.indices1[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113 - var8.faceColors1[var16] = method3888(var14); // L: 1114 - if (this.field2168 != null && this.field2168[this.indices2[var16]] != null) { // L: 1115 - var13 = this.field2168[this.indices2[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors1[var16] = method3815(var14); + if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { + var13 = this.field2175[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116 + var13 = this.vertexNormals[this.indices2[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117 - var8.faceColors2[var16] = method3888(var14); // L: 1118 - if (this.field2168 != null && this.field2168[this.indices3[var16]] != null) { // L: 1119 - var13 = this.field2168[this.indices3[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors2[var16] = method3815(var14); + if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { + var13 = this.field2175[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120 + var13 = this.vertexNormals[this.indices3[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121 - var8.faceColors3[var16] = method3888(var14); // L: 1122 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors3[var16] = method3815(var14); } } - this.method3872(); // L: 1135 - var8.verticesCount = this.verticesCount; // L: 1136 - var8.verticesX = this.verticesX; // L: 1137 - var8.verticesY = this.verticesY; // L: 1138 - var8.verticesZ = this.verticesZ; // L: 1139 - var8.indicesCount = this.faceCount; // L: 1140 - var8.indices1 = this.indices1; // L: 1141 - var8.indices2 = this.indices2; // L: 1142 - var8.indices3 = this.indices3; // L: 1143 - var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144 - var8.faceAlphas = this.faceAlphas; // L: 1145 - var8.field2437 = this.priority; // L: 1146 - var8.vertexLabels = this.vertexLabels; // L: 1147 - var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148 - var8.faceTextures = this.faceTextures; // L: 1149 - return var8; // L: 1150 + this.method3799(); + var8.verticesCount = this.verticesCount; + var8.verticesX = this.verticesX; + var8.verticesY = this.verticesY; + var8.verticesZ = this.verticesZ; + var8.indicesCount = this.faceCount; + var8.indices1 = this.indices1; + var8.indices2 = this.indices2; + var8.indices3 = this.indices3; + var8.faceRenderPriorities = this.faceRenderPriorities; + var8.faceAlphas = this.faceAlphas; + var8.field2441 = this.priority; + var8.vertexLabels = this.vertexLabels; + var8.faceLabelsAlpha = this.faceLabelsAlpha; + var8.faceTextures = this.faceTextures; + return var8; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lga;" + descriptor = "(Ljy;II)Lgz;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 53 - return var3 == null ? null : new ModelData(var3); // L: 54 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lga;Lga;IIIZ)V" + descriptor = "(Lgz;Lgz;IIIZ)V" ) - static void method3885(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { - var0.calculateBounds(); // L: 972 - var0.calculateVertexNormals(); // L: 973 - var1.calculateBounds(); // L: 974 - var1.calculateVertexNormals(); // L: 975 - ++field2199; // L: 976 - int var6 = 0; // L: 977 - int[] var7 = var1.verticesX; // L: 978 - int var8 = var1.verticesCount; // L: 979 + static void method3812(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + var0.calculateBounds(); + var0.calculateVertexNormals(); + var1.calculateBounds(); + var1.calculateVertexNormals(); + ++field2186; + int var6 = 0; + int[] var7 = var1.verticesX; + int var8 = var1.verticesCount; int var9; - for (var9 = 0; var9 < var0.verticesCount; ++var9) { // L: 980 - VertexNormal var10 = var0.vertexNormals[var9]; // L: 981 - if (var10.magnitude != 0) { // L: 982 - int var11 = var0.verticesY[var9] - var3; // L: 983 - if (var11 <= var1.field2192) { // L: 984 - int var12 = var0.verticesX[var9] - var2; // L: 985 - if (var12 >= var1.field2193 && var12 <= var1.field2194) { // L: 986 - int var13 = var0.verticesZ[var9] - var4; // L: 987 - if (var13 >= var1.field2195 && var13 <= var1.field2176) { // L: 988 - for (int var14 = 0; var14 < var8; ++var14) { // L: 989 - VertexNormal var15 = var1.vertexNormals[var14]; // L: 990 - if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991 - if (var0.field2168 == null) { // L: 992 - var0.field2168 = new VertexNormal[var0.verticesCount]; + for (var9 = 0; var9 < var0.verticesCount; ++var9) { + VertexNormal var10 = var0.vertexNormals[var9]; + if (var10.magnitude != 0) { + int var11 = var0.verticesY[var9] - var3; + if (var11 <= var1.field2179) { + int var12 = var0.verticesX[var9] - var2; + if (var12 >= var1.field2180 && var12 <= var1.field2181) { + int var13 = var0.verticesZ[var9] - var4; + if (var13 >= var1.field2182 && var13 <= var1.field2161) { + for (int var14 = 0; var14 < var8; ++var14) { + VertexNormal var15 = var1.vertexNormals[var14]; + if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { + if (var0.field2175 == null) { + var0.field2175 = new VertexNormal[var0.verticesCount]; } - if (var1.field2168 == null) { // L: 993 - var1.field2168 = new VertexNormal[var8]; + if (var1.field2175 == null) { + var1.field2175 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field2168[var9]; // L: 994 - if (var16 == null) { // L: 995 - var16 = var0.field2168[var9] = new VertexNormal(var10); + VertexNormal var16 = var0.field2175[var9]; + if (var16 == null) { + var16 = var0.field2175[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field2168[var14]; // L: 996 + VertexNormal var17 = var1.field2175[var14]; if (var17 == null) { - var17 = var1.field2168[var14] = new VertexNormal(var15); // L: 997 + var17 = var1.field2175[var14] = new VertexNormal(var15); } - var16.x += var15.x; // L: 998 - var16.y += var15.y; // L: 999 - var16.z += var15.z; // L: 1000 - var16.magnitude += var15.magnitude; // L: 1001 - var17.x += var10.x; // L: 1002 - var17.y += var10.y; // L: 1003 - var17.z += var10.z; // L: 1004 - var17.magnitude += var10.magnitude; // L: 1005 - ++var6; // L: 1006 - field2197[var9] = field2199; // L: 1007 - field2179[var14] = field2199; // L: 1008 + var16.x += var15.x; + var16.y += var15.y; + var16.z += var15.z; + var16.magnitude += var15.magnitude; + var17.x += var10.x; + var17.y += var10.y; + var17.z += var10.z; + var17.magnitude += var10.magnitude; + ++var6; + field2184[var9] = field2186; + field2185[var14] = field2186; } } } @@ -1696,50 +1696,50 @@ public class ModelData extends Renderable { } } - if (var6 >= 3 && var5) { // L: 1012 - for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013 - if (field2197[var0.indices1[var9]] == field2199 && field2197[var0.indices2[var9]] == field2199 && field2197[var0.indices3[var9]] == field2199) { // L: 1014 - if (var0.faceRenderTypes == null) { // L: 1015 + if (var6 >= 3 && var5) { + for (var9 = 0; var9 < var0.faceCount; ++var9) { + if (field2184[var0.indices1[var9]] == field2186 && field2184[var0.indices2[var9]] == field2186 && field2184[var0.indices3[var9]] == field2186) { + if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } - var0.faceRenderTypes[var9] = 2; // L: 1016 + var0.faceRenderTypes[var9] = 2; } } - for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019 - if (field2199 == field2179[var1.indices1[var9]] && field2199 == field2179[var1.indices2[var9]] && field2199 == field2179[var1.indices3[var9]]) { // L: 1020 - if (var1.faceRenderTypes == null) { // L: 1021 + for (var9 = 0; var9 < var1.faceCount; ++var9) { + if (field2186 == field2185[var1.indices1[var9]] && field2186 == field2185[var1.indices2[var9]] && field2186 == field2185[var1.indices3[var9]]) { + if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } - var1.faceRenderTypes[var9] = 2; // L: 1022 + var1.faceRenderTypes[var9] = 2; } } } - } // L: 1025 + } - @ObfuscatedName("l") - static final int method3887(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1154 - if (var1 < 2) { // L: 1155 + @ObfuscatedName("d") + static final int method3838(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 1156 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 1157 + return (var0 & 65408) + var1; } - @ObfuscatedName("w") - static final int method3888(int var0) { - if (var0 < 2) { // L: 1161 + @ObfuscatedName("y") + static final int method3815(int var0) { + if (var0 < 2) { var0 = 2; } else if (var0 > 126) { - var0 = 126; // L: 1162 + var0 = 126; } - return var0; // L: 1163 + return var0; } } diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 126054ae21..4a4de967dc 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -3,22 +3,66 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("ho") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("z") - public static short[] field2517; - ModelData0() { - } // L: 4 + } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2137438684" + descriptor = "([BI)Lbd;", + garbageValue = "1231367855" ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 13 + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); + int var7; + int var8; + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); + + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? SoundSystem.method530(var8) : 1); + var1.switches[var7] = var9; + + while (var8-- > 0) { + int var10 = var2.readInt(); + int var11 = var2.readInt(); + var9.put(new IntegerNode(var11), (long)var10); + } + } + } + + var2.offset = 0; + var1.field862 = var2.readStringCp1252NullTerminatedOrNull(); + var1.opcodes = new int[var5]; + var1.intOperands = new int[var5]; + var1.stringOperands = new String[var5]; + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { + var8 = var2.readUnsignedShort(); + if (var8 == 3) { + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); + } + } + + return var1; } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 124f3900c9..e71b8c64bc 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,139 +3,140 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -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.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.Reflection; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ai") +@ObfuscatedName("i") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = 706955279943509111L - ) - @Export("MouseHandler_millis") - public static long MouseHandler_millis; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Li;" ) @Export("MouseHandler_instance") public static MouseHandler MouseHandler_instance; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -323054323 + intValue = -127535623 ) @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -885858399 + intValue = 372388207 ) @Export("MouseHandler_currentButtonVolatile") - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("r") + public static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1506829559 + intValue = 159798507 ) @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; - @ObfuscatedName("h") + public static volatile int MouseHandler_xVolatile; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -955747453 + intValue = 125919571 ) @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("d") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -8056893470675873067L + longValue = -478457892255382533L ) @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("z") + public static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1239059943 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1657999347 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1895436129 + intValue = 722992051 ) @Export("MouseHandler_y") public static int MouseHandler_y; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1211314155 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 674629047 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = 2656507994387135559L + ) + @Export("MouseHandler_millis") + public static long MouseHandler_millis; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 826495123 + intValue = -2068169775 ) @Export("MouseHandler_lastButtonVolatile") - static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("g") + public static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1870863145 + intValue = -2115271755 ) @Export("MouseHandler_lastPressedXVolatile") - static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("t") + public static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1293703447 + intValue = 1931155269 ) @Export("MouseHandler_lastPressedYVolatile") - static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("x") - @ObfuscatedGetter( - longValue = 1966416586161698317L - ) - @Export("MouseHandler_lastPressedTimeMillisVolatile") - static volatile long MouseHandler_lastPressedTimeMillisVolatile; + public static volatile int MouseHandler_lastPressedYVolatile; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1652979825 + longValue = -8913698754657264189L + ) + @Export("MouseHandler_lastPressedTimeMillisVolatile") + public static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -2067582723 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 5633659 + intValue = -1578752193 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 280210219 + intValue = 1995554585 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -6822610554360794767L + longValue = -1097286977085692753L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; + @ObfuscatedName("gu") + @ObfuscatedGetter( + intValue = 755406265 + ) + static int field136; + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "Lbb;" + ) + @Export("localPlayer") + static Player localPlayer; static { - MouseHandler_instance = new MouseHandler(); // L: 15 - MouseHandler_idleCycles = 0; // L: 16 - MouseHandler_currentButtonVolatile = 0; // L: 17 + MouseHandler_instance = new MouseHandler(); + MouseHandler_idleCycles = 0; + MouseHandler_currentButtonVolatile = 0; MouseHandler_xVolatile = -1; MouseHandler_yVolatile = -1; MouseHandler_lastMovedVolatile = -1L; @@ -144,7 +145,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler_y = 0; MouseHandler_millis = 0L; MouseHandler_lastButtonVolatile = 0; - MouseHandler_lastPressedXVolatile = 0; // L: 26 + MouseHandler_lastPressedXVolatile = 0; MouseHandler_lastPressedYVolatile = 0; MouseHandler_lastPressedTimeMillisVolatile = 0L; MouseHandler_lastButton = 0; @@ -156,15 +157,15 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("y") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "2128058823" + garbageValue = "139419703" ) @Export("getButton") final int getButton(MouseEvent var1) { int var2 = var1.getButton(); - if (!var1.isAltDown() && var2 != 2) { // L: 62 + if (!var1.isAltDown() && var2 != 2) { return !var1.isMetaDown() && var2 != 3 ? 1 : 2; } else { return 4; @@ -173,10 +174,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi public final synchronized void mouseMoved(MouseEvent var1) { if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; // L: 110 + MouseHandler_idleCycles = 0; MouseHandler_xVolatile = var1.getX(); MouseHandler_yVolatile = var1.getY(); - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 113 + MouseHandler_lastMovedVolatile = var1.getWhen(); } } @@ -184,46 +185,61 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi public final synchronized void mousePressed(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 70 + MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = ClientPacket.currentTimeMillis(); + MouseHandler_lastPressedTimeMillisVolatile = UrlRequester.method2125(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 76 + if (var1.isPopupTrigger()) { var1.consume(); } } - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 88 - var1.consume(); - } - - } // L: 89 - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 92 - } - public final synchronized void mouseExited(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = -1; // L: 98 + MouseHandler_xVolatile = -1; MouseHandler_yVolatile = -1; MouseHandler_lastMovedVolatile = var1.getWhen(); } } + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_currentButtonVolatile = 0; + } + + if (var1.isPopupTrigger()) { + var1.consume(); + } + + } + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { + var1.consume(); + } + + } + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); + } + public final synchronized void mouseDragged(MouseEvent var1) { this.mouseMoved(var1); } + public final void focusGained(FocusEvent var1) { + } + public final synchronized void focusLost(FocusEvent var1) { if (MouseHandler_instance != null) { MouseHandler_currentButtonVolatile = 0; @@ -231,441 +247,49 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final void focusGained(FocusEvent var1) { - } - - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 80 - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; // L: 82 - } - - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ILla;Ljf;I)V", - garbageValue = "1715760839" - ) - static void method727(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 - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 27 - if (ArchiveDiskActionHandler.field3557 == 0) { // L: 28 - class305.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 29 - class305.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 30 - class305.ArchiveDiskActionHandler_thread.start(); // L: 31 - class305.ArchiveDiskActionHandler_thread.setPriority(5); // L: 32 - } - - ArchiveDiskActionHandler.field3557 = 600; // L: 34 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lns;I)V", - garbageValue = "-1319930513" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class69.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) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } 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 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1544814105" - ) - static int method718(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 482 - ChatChannel.Interpreter_intStackSize -= 3; // L: 483 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 484 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 485 - int var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 486 - if (var4 == 0) { // L: 487 - throw new RuntimeException(); // L: 488 - } else { - Widget var6 = WorldMapData_1.getWidget(var9); // L: 490 - if (var6.children == null) { // L: 491 - var6.children = new Widget[var11 + 1]; - } - - if (var6.children.length <= var11) { // L: 492 - Widget[] var7 = new Widget[var11 + 1]; // L: 493 - - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 494 - var7[var8] = var6.children[var8]; - } - - var6.children = var7; // L: 495 - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 497 - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); // L: 498 - var12.type = var4; // L: 499 - var12.parentId = var12.id = var6.id; // L: 500 - var12.childIndex = var11; // L: 501 - var12.isIf3 = true; // L: 502 - var6.children[var11] = var12; // L: 503 - if (var2) { // L: 504 - UserComparator5.scriptDotWidget = var12; - } else { - User.scriptActiveWidget = var12; // L: 505 - } - - Script.invalidateWidget(var6); // L: 506 - return 1; // L: 507 - } - } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 509 - var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 510 - Widget var10 = WorldMapData_1.getWidget(var3.id); // L: 511 - var10.children[var3.childIndex] = null; // L: 512 - Script.invalidateWidget(var10); // L: 513 - return 1; // L: 514 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 516 - var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 517 - var3.children = null; // L: 518 - Script.invalidateWidget(var3); // L: 519 - return 1; // L: 520 - } else if (var0 == 103) { // L: 522 - ChatChannel.Interpreter_intStackSize -= 3; // L: 523 - return 1; // L: 524 - } else if (var0 == 104) { // L: 526 - --ChatChannel.Interpreter_intStackSize; // L: 527 - return 1; // L: 528 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 530 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 543 - var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 544 - if (var3 != null) { // L: 545 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 546 - if (var2) { // L: 547 - UserComparator5.scriptDotWidget = var3; - } else { - User.scriptActiveWidget = var3; // L: 548 - } - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 550 - } - - return 1; // L: 551 - } else if (var0 == 202) { // L: 553 - Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] = 0; // L: 554 - return 1; // L: 555 - } else if (var0 == 203) { // L: 557 - Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize + 1] = 0; // L: 558 - return 1; // L: 559 - } else { - return 2; // L: 561 - } - } else { - ChatChannel.Interpreter_intStackSize -= 2; // L: 531 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 532 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 533 - Widget var5 = class17.getWidgetChild(var9, var4); // L: 534 - if (var5 != null && var4 != -1) { // L: 535 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 536 - if (var2) { // L: 537 - UserComparator5.scriptDotWidget = var5; - } else { - User.scriptActiveWidget = var5; // L: 538 - } - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 540 - } - - return 1; // L: 541 - } - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Leq;", - garbageValue = "47395397" - ) - static HorizontalAlignment[] method726() { - return new HorizontalAlignment[]{HorizontalAlignment.field1632, HorizontalAlignment.field1630, HorizontalAlignment.HorizontalAlignment_centered}; // L: 14 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1550544078" - ) - static void method750(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 - if (var1 != null) { - var1.remove(); // L: 74 - } - } // L: 73 75 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "292035251" - ) - static int method747(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1364 - var5 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1365 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.itemId; // L: 1366 - return 1; // L: 1367 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1369 - var5 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1370 - if (var5.itemId != -1) { // L: 1371 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1372 - } - - return 1; // L: 1373 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1375 - int var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1376 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1377 - if (var4 != null) { // L: 1378 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1379 - } - - return 1; // L: 1380 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1382 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1383 - return 1; // L: 1384 - } else { - return 2; // L: 1386 - } - } - - @ObfuscatedName("gc") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1980065411" + garbageValue = "1516235475" ) - static void method741() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4772 - class160.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4773 + static void method349() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromFriend(); } - } // L: 4775 + } - @ObfuscatedName("iv") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "-205223779" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "0" ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class17.getWidgetChild(var1, var2); // L: 8818 - if (var5 != null) { // L: 8819 - if (var5.onOp != null) { // L: 8820 - ScriptEvent var6 = new ScriptEvent(); // L: 8821 - var6.widget = var5; // L: 8822 - var6.opIndex = var0; // L: 8823 - var6.targetName = var4; // L: 8824 - var6.args = var5.onOp; // L: 8825 - WorldMapSection1.runScriptEvent(var6); // L: 8826 - } - - boolean var8 = true; // L: 8828 - if (var5.contentType > 0) { // L: 8829 - var8 = class343.method6080(var5); - } - - if (var8) { // L: 8830 - if (class136.method2696(class22.getWidgetFlags(var5), var0 - 1)) { // L: 8831 - PacketBufferNode var7; - if (var0 == 1) { // L: 8834 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); // L: 8836 - var7.packetBuffer.writeInt(var1); // L: 8837 - var7.packetBuffer.writeShort(var2); // L: 8838 - var7.packetBuffer.writeShort(var3); // L: 8839 - Client.packetWriter.addNode(var7); // L: 8840 - } - - if (var0 == 2) { // L: 8842 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); // L: 8844 - var7.packetBuffer.writeInt(var1); // L: 8845 - var7.packetBuffer.writeShort(var2); // L: 8846 - var7.packetBuffer.writeShort(var3); // L: 8847 - Client.packetWriter.addNode(var7); // L: 8848 - } - - if (var0 == 3) { // L: 8850 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8852 - var7.packetBuffer.writeInt(var1); // L: 8853 - var7.packetBuffer.writeShort(var2); // L: 8854 - var7.packetBuffer.writeShort(var3); // L: 8855 - Client.packetWriter.addNode(var7); // L: 8856 - } - - if (var0 == 4) { // L: 8858 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); // L: 8860 - var7.packetBuffer.writeInt(var1); // L: 8861 - var7.packetBuffer.writeShort(var2); // L: 8862 - var7.packetBuffer.writeShort(var3); // L: 8863 - Client.packetWriter.addNode(var7); // L: 8864 - } - - if (var0 == 5) { // L: 8866 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); // L: 8868 - var7.packetBuffer.writeInt(var1); // L: 8869 - var7.packetBuffer.writeShort(var2); // L: 8870 - var7.packetBuffer.writeShort(var3); // L: 8871 - Client.packetWriter.addNode(var7); // L: 8872 - } - - if (var0 == 6) { // L: 8874 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2579, Client.packetWriter.isaacCipher); // L: 8876 - var7.packetBuffer.writeInt(var1); // L: 8877 - var7.packetBuffer.writeShort(var2); // L: 8878 - var7.packetBuffer.writeShort(var3); // L: 8879 - Client.packetWriter.addNode(var7); // L: 8880 - } - - if (var0 == 7) { // L: 8882 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); // L: 8884 - var7.packetBuffer.writeInt(var1); // L: 8885 - var7.packetBuffer.writeShort(var2); // L: 8886 - var7.packetBuffer.writeShort(var3); // L: 8887 - Client.packetWriter.addNode(var7); // L: 8888 - } - - if (var0 == 8) { // L: 8890 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2633, Client.packetWriter.isaacCipher); // L: 8892 - var7.packetBuffer.writeInt(var1); // L: 8893 - var7.packetBuffer.writeShort(var2); // L: 8894 - var7.packetBuffer.writeShort(var3); // L: 8895 - Client.packetWriter.addNode(var7); // L: 8896 - } - - if (var0 == 9) { // L: 8898 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2598, Client.packetWriter.isaacCipher); // L: 8900 - var7.packetBuffer.writeInt(var1); // L: 8901 - var7.packetBuffer.writeShort(var2); // L: 8902 - var7.packetBuffer.writeShort(var3); // L: 8903 - Client.packetWriter.addNode(var7); // L: 8904 - } - - if (var0 == 10) { // L: 8906 - var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); // L: 8908 - var7.packetBuffer.writeInt(var1); // L: 8909 - var7.packetBuffer.writeShort(var2); // L: 8910 - var7.packetBuffer.writeShort(var3); // L: 8911 - Client.packetWriter.addNode(var7); // L: 8912 - } + static final void method369(String var0) { + class120.addGameMessage(30, "", var0); + } + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "753807215" + ) + static final void method368(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2520()) { + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + if (var2.rank == -1) { + PacketWriter var3 = Client.packetWriter; + PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2645, var3.isaacCipher); + var4.packetBuffer.writeByte(3 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var2.username.getName())); + var4.packetBuffer.writeByte(var0); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); + var3.addNode(var4); } } } - } // L: 8832 8914 + } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index e3a2a543ee..930f0e2e87 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -4,105 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("bn") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("eq") - @ObfuscatedGetter( - intValue = -107969121 + @ObfuscatedName("qu") + @ObfuscatedSignature( + descriptor = "Llf;" ) - @Export("js5Port") - static int js5Port; - @ObfuscatedName("f") + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1994254709 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Ljr;" + ) + static StudioGame field975; + @ObfuscatedName("nw") + @ObfuscatedGetter( + intValue = -2054144083 + ) + static int field976; + @ObfuscatedName("s") @Export("isRunning") boolean isRunning; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("lock") Object lock; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -123388215 + intValue = -385453715 ) @Export("index") int index; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("xs") int[] xs; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("ys") int[] ys; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("millis") long[] millis; MouseRecorder() { - this.isRunning = true; // L: 7 - this.lock = new Object(); // L: 8 - this.index = 0; // L: 9 - this.xs = new int[500]; // L: 10 + this.isRunning = true; + this.lock = new Object(); + this.index = 0; + this.xs = new int[500]; this.ys = new int[500]; this.millis = new long[500]; } public void run() { - for (; this.isRunning; class18.method272(50L)) { + for (; this.isRunning; SceneTilePaint.method4322(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; this.ys[this.index] = MouseHandler.MouseHandler_y; this.millis[this.index] = MouseHandler.MouseHandler_millis; - ++this.index; // L: 23 + ++this.index; } } } } - @ObfuscatedName("f") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;", - garbageValue = "0" + descriptor = "(ILbd;ZI)I", + garbageValue = "-190219841" ) - public static String method2203(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { // L: 11 - return ""; - } else if (var2 == 1) { // L: 12 - CharSequence var10 = var0[var1]; // L: 13 - return var10 == null ? "null" : var10.toString(); // L: 14 15 + static int method1811(int var0, Script var1, boolean var2) { + if (var0 == 6900) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 6950) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; } else { - int var3 = var2 + var1; // L: 17 - int var4 = 0; // L: 18 - - for (int var5 = var1; var5 < var3; ++var5) { // L: 19 - CharSequence var9 = var0[var5]; // L: 20 - if (var9 == null) { // L: 21 - var4 += 4; - } else { - var4 += var9.length(); // L: 22 - } - } - - StringBuilder var8 = new StringBuilder(var4); // L: 24 - - for (int var6 = var1; var6 < var3; ++var6) { // L: 25 - CharSequence var7 = var0[var6]; // L: 26 - if (var7 == null) { // L: 27 - var8.append("null"); - } else { - var8.append(var7); // L: 28 - } - } - - return var8.toString(); // L: 30 + return 2; } } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2020302651" - ) - public static void method2202() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 98 - } // L: 99 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index d4ea392778..0a08586f67 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("ei") +@ObfuscatedName("eo") @Implements("MouseWheel") public interface MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-39" + descriptor = "(I)I", + garbageValue = "1411156190" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index cab950bc00..ddfa2bf553 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,53 +7,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("x") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -425672547 + intValue = -847468095 ) @Export("rotation") int rotation; MouseWheelHandler() { - this.rotation = 0; // L: 8 - } // L: 10 + this.rotation = 0; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "43" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "174403044" ) @Export("addTo") void addTo(Component var1) { - var1.addMouseWheelListener(this); // L: 13 - } // L: 14 + var1.addMouseWheelListener(this); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1293933370" + garbageValue = "668328279" ) @Export("removeFrom") void removeFrom(Component var1) { - var1.removeMouseWheelListener(this); // L: 17 - } // L: 18 + var1.removeMouseWheelListener(this); + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-39" + descriptor = "(I)I", + garbageValue = "1411156190" ) @Export("useRotation") public synchronized int useRotation() { - int var1 = this.rotation; // L: 26 - this.rotation = 0; // L: 27 - return var1; // L: 28 + int var1 = this.rotation; + this.rotation = 0; + return var1; } public synchronized void mouseWheelMoved(MouseWheelEvent var1) { - this.rotation += var1.getWheelRotation(); // L: 22 - } // L: 23 + this.rotation += var1.getWheelRotation(); + } } diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 1243179e49..f2dc17835d 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,330 +1,331 @@ +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("id") +@ObfuscatedName("if") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 835733951 + intValue = -793096347 ) - int field2885; - @ObfuscatedName("e") + int field2870; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lar;" + descriptor = "[Lz;" ) @Export("rawSounds") RawSound[] rawSounds; @ObfuscatedName("v") - short[] field2882; - @ObfuscatedName("y") - byte[] field2883; + short[] field2868; @ObfuscatedName("j") - byte[] field2880; - @ObfuscatedName("o") + byte[] field2873; + @ObfuscatedName("l") + byte[] field2867; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lho;" + descriptor = "[Lhd;" ) - MusicPatchNode2[] field2884; - @ObfuscatedName("m") - byte[] field2886; - @ObfuscatedName("r") - int[] field2887; + MusicPatchNode2[] field2871; + @ObfuscatedName("w") + byte[] field2872; + @ObfuscatedName("f") + int[] field2874; MusicPatch(byte[] var1) { - this.rawSounds = new RawSound[128]; // L: 21 - this.field2882 = new short[128]; // L: 22 - this.field2883 = new byte[128]; // L: 23 - this.field2880 = new byte[128]; // L: 24 - this.field2884 = new MusicPatchNode2[128]; // L: 25 - this.field2886 = new byte[128]; // L: 26 - this.field2887 = new int[128]; // L: 27 - Buffer var2 = new Buffer(var1); // L: 28 + this.rawSounds = new RawSound[128]; + this.field2868 = new short[128]; + this.field2873 = new byte[128]; + this.field2867 = new byte[128]; + this.field2871 = new MusicPatchNode2[128]; + this.field2872 = new byte[128]; + this.field2874 = new int[128]; + Buffer var2 = new Buffer(var1); int var3; - for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 + for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { } - byte[] var4 = new byte[var3]; // L: 31 + byte[] var4 = new byte[var3]; int var5; - for (var5 = 0; var5 < var3; ++var5) { // L: 32 + for (var5 = 0; var5 < var3; ++var5) { var4[var5] = var2.readByte(); } - ++var2.offset; // L: 33 - ++var3; // L: 34 - var5 = var2.offset; // L: 35 - var2.offset += var3; // L: 36 + ++var2.offset; + ++var3; + var5 = var2.offset; + var2.offset += var3; int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38 + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { } - byte[] var7 = new byte[var6]; // L: 39 + byte[] var7 = new byte[var6]; int var8; - for (var8 = 0; var8 < var6; ++var8) { // L: 40 + for (var8 = 0; var8 < var6; ++var8) { var7[var8] = var2.readByte(); } - ++var2.offset; // L: 41 - ++var6; // L: 42 - var8 = var2.offset; // L: 43 - var2.offset += var6; // L: 44 + ++var2.offset; + ++var6; + var8 = var2.offset; + var2.offset += var6; int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46 + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { } - byte[] var10 = new byte[var9]; // L: 47 + byte[] var10 = new byte[var9]; - for (int var11 = 0; var11 < var9; ++var11) { // L: 48 + for (int var11 = 0; var11 < var9; ++var11) { var10[var11] = var2.readByte(); } - ++var2.offset; // L: 49 - ++var9; // L: 50 - byte[] var36 = new byte[var9]; // L: 51 + ++var2.offset; + ++var9; + byte[] var36 = new byte[var9]; int var12; int var14; - if (var9 > 1) { // L: 53 - var36[1] = 1; // L: 54 - int var13 = 1; // L: 55 - var12 = 2; // L: 56 + if (var9 > 1) { + var36[1] = 1; + int var13 = 1; + var12 = 2; - for (var14 = 2; var14 < var9; ++var14) { // L: 57 - int var41 = var2.readUnsignedByte(); // L: 58 - if (var41 == 0) { // L: 59 + for (var14 = 2; var14 < var9; ++var14) { + int var41 = var2.readUnsignedByte(); + if (var41 == 0) { var13 = var12++; } else { - if (var41 <= var13) { // L: 61 + if (var41 <= var13) { --var41; } - var13 = var41; // L: 62 + var13 = var41; } - var36[var14] = (byte)var13; // L: 64 + var36[var14] = (byte)var13; } } else { - var12 = var9; // L: 67 + var12 = var9; } - MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; // L: 68 + MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; MusicPatchNode2 var15; - 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.field2821 = new byte[var40 * 2]; + for (var14 = 0; var14 < var37.length; ++var14) { + var15 = var37[var14] = new MusicPatchNode2(); + int var40 = var2.readUnsignedByte(); + if (var40 > 0) { + var15.field2808 = new byte[var40 * 2]; } - var40 = var2.readUnsignedByte(); // L: 73 - if (var40 > 0) { // L: 74 - var15.field2828 = new byte[var40 * 2 + 2]; // L: 75 - var15.field2828[1] = 64; // L: 76 + var40 = var2.readUnsignedByte(); + if (var40 > 0) { + var15.field2811 = new byte[var40 * 2 + 2]; + var15.field2811[1] = 64; } } - 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 + var14 = var2.readUnsignedByte(); + byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; + var14 = var2.readUnsignedByte(); + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84 + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { } - byte[] var18 = new byte[var17]; // L: 85 + byte[] var18 = new byte[var17]; int var19; - for (var19 = 0; var19 < var17; ++var19) { // L: 86 + for (var19 = 0; var19 < var17; ++var19) { var18[var19] = var2.readByte(); } - ++var2.offset; // L: 87 - ++var17; // L: 88 - var19 = 0; // L: 89 + ++var2.offset; + ++var17; + var19 = 0; int var20; - for (var20 = 0; var20 < 128; ++var20) { // L: 90 - var19 += var2.readUnsignedByte(); // L: 91 - this.field2882[var20] = (short)var19; // L: 92 + for (var20 = 0; var20 < 128; ++var20) { + var19 += var2.readUnsignedByte(); + this.field2868[var20] = (short)var19; } - var19 = 0; // L: 94 + var19 = 0; short[] var48; - for (var20 = 0; var20 < 128; ++var20) { // L: 95 - var19 += var2.readUnsignedByte(); // L: 96 - var48 = this.field2882; // L: 97 + for (var20 = 0; var20 < 128; ++var20) { + var19 += var2.readUnsignedByte(); + var48 = this.field2868; var48[var20] = (short)(var48[var20] + (var19 << 8)); } - var20 = 0; // L: 99 - int var21 = 0; // L: 100 - int var22 = 0; // L: 101 + var20 = 0; + int var21 = 0; + int var22 = 0; int var23; - for (var23 = 0; var23 < 128; ++var23) { // L: 102 - if (var20 == 0) { // L: 103 - if (var21 < var18.length) { // L: 104 + for (var23 = 0; var23 < 128; ++var23) { + if (var20 == 0) { + if (var21 < var18.length) { var20 = var18[var21++]; } else { - var20 = -1; // L: 105 + var20 = -1; } - var22 = var2.readVarInt(); // L: 106 + var22 = var2.readVarInt(); } - var48 = this.field2882; // L: 108 + var48 = this.field2868; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2887[var23] = var22; // L: 109 - --var20; // L: 110 + this.field2874[var23] = var22; + --var20; } - var20 = 0; // L: 112 - var21 = 0; // L: 113 - var23 = 0; // L: 114 + var20 = 0; + var21 = 0; + var23 = 0; int var24; - for (var24 = 0; var24 < 128; ++var24) { // L: 115 - if (this.field2887[var24] != 0) { // L: 116 - if (var20 == 0) { // L: 117 - if (var21 < var4.length) { // L: 118 + for (var24 = 0; var24 < 128; ++var24) { + if (this.field2874[var24] != 0) { + if (var20 == 0) { + if (var21 < var4.length) { var20 = var4[var21++]; } else { - var20 = -1; // L: 119 + var20 = -1; } - var23 = var2.array[var5++] - 1; // L: 120 + var23 = var2.array[var5++] - 1; } - this.field2886[var24] = (byte)var23; // L: 122 - --var20; // L: 123 + this.field2872[var24] = (byte)var23; + --var20; } } - var20 = 0; // L: 125 - var21 = 0; // L: 126 - var24 = 0; // L: 127 + var20 = 0; + var21 = 0; + var24 = 0; - for (int var25 = 0; var25 < 128; ++var25) { // L: 128 - if (this.field2887[var25] != 0) { // L: 129 - if (var20 == 0) { // L: 130 - if (var21 < var7.length) { // L: 131 + for (int var25 = 0; var25 < 128; ++var25) { + if (this.field2874[var25] != 0) { + if (var20 == 0) { + if (var21 < var7.length) { var20 = var7[var21++]; } else { - var20 = -1; // L: 132 + var20 = -1; } - var24 = var2.array[var8++] + 16 << 2; // L: 133 + var24 = var2.array[var8++] + 16 << 2; } - this.field2880[var25] = (byte)var24; // L: 135 - --var20; // L: 136 + this.field2867[var25] = (byte)var24; + --var20; } } - var20 = 0; // L: 138 - var21 = 0; // L: 139 - MusicPatchNode2 var38 = null; // L: 140 + var20 = 0; + var21 = 0; + MusicPatchNode2 var38 = null; int var26; - for (var26 = 0; var26 < 128; ++var26) { // L: 141 - if (this.field2887[var26] != 0) { // L: 142 - if (var20 == 0) { // L: 143 - var38 = var37[var36[var21]]; // L: 144 - if (var21 < var10.length) { // L: 145 + for (var26 = 0; var26 < 128; ++var26) { + if (this.field2874[var26] != 0) { + if (var20 == 0) { + var38 = var37[var36[var21]]; + if (var21 < var10.length) { var20 = var10[var21++]; } else { - var20 = -1; // L: 146 + var20 = -1; } } - this.field2884[var26] = var38; // L: 148 - --var20; // L: 149 + this.field2871[var26] = var38; + --var20; } } - var20 = 0; // L: 151 - var21 = 0; // L: 152 - var26 = 0; // L: 153 + var20 = 0; + var21 = 0; + var26 = 0; int var27; - for (var27 = 0; var27 < 128; ++var27) { // L: 154 - if (var20 == 0) { // L: 155 - if (var21 < var18.length) { // L: 156 + for (var27 = 0; var27 < 128; ++var27) { + if (var20 == 0) { + if (var21 < var18.length) { var20 = var18[var21++]; } else { - var20 = -1; // L: 157 + var20 = -1; } - if (this.field2887[var27] > 0) { // L: 158 + if (this.field2874[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2883[var27] = (byte)var26; // L: 160 - --var20; // L: 161 + this.field2873[var27] = (byte)var26; + --var20; } - this.field2885 = var2.readUnsignedByte() + 1; // L: 163 + this.field2870 = var2.readUnsignedByte() + 1; int var29; MusicPatchNode2 var39; - for (var27 = 0; var27 < var12; ++var27) { // L: 164 - var39 = var37[var27]; // L: 165 - if (var39.field2821 != null) { // L: 166 - for (var29 = 1; var29 < var39.field2821.length; var29 += 2) { // L: 167 - var39.field2821[var29] = var2.readByte(); + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field2808 != null) { + for (var29 = 1; var29 < var39.field2808.length; var29 += 2) { + var39.field2808[var29] = var2.readByte(); } } - if (var39.field2828 != null) { // L: 169 - for (var29 = 3; var29 < var39.field2828.length - 2; var29 += 2) { // L: 170 - var39.field2828[var29] = var2.readByte(); + if (var39.field2811 != null) { + for (var29 = 3; var29 < var39.field2811.length - 2; var29 += 2) { + var39.field2811[var29] = var2.readByte(); } } } - if (var42 != null) { // L: 173 - for (var27 = 1; var27 < var42.length; var27 += 2) { // L: 174 + if (var42 != null) { + for (var27 = 1; var27 < var42.length; var27 += 2) { var42[var27] = var2.readByte(); } } - if (var16 != null) { // L: 176 - for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177 + if (var16 != null) { + for (var27 = 1; var27 < var16.length; var27 += 2) { var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 179 - var39 = var37[var27]; // L: 180 - if (var39.field2828 != null) { // L: 181 - var19 = 0; // L: 182 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field2811 != null) { + var19 = 0; - for (var29 = 2; var29 < var39.field2828.length; var29 += 2) { // L: 183 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184 - var39.field2828[var29] = (byte)var19; // L: 185 + for (var29 = 2; var29 < var39.field2811.length; var29 += 2) { + var19 = 1 + var19 + var2.readUnsignedByte(); + var39.field2811[var29] = (byte)var19; } } } - for (var27 = 0; var27 < var12; ++var27) { // L: 189 - var39 = var37[var27]; // L: 190 - if (var39.field2821 != null) { // L: 191 - var19 = 0; // L: 192 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field2808 != null) { + var19 = 0; - for (var29 = 2; var29 < var39.field2821.length; var29 += 2) { // L: 193 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 - var39.field2821[var29] = (byte)var19; // L: 195 + for (var29 = 2; var29 < var39.field2808.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var39.field2808[var29] = (byte)var19; } } } @@ -335,194 +336,295 @@ public class MusicPatch extends Node { int var34; int var45; byte var47; - if (var42 != null) { // L: 199 - var19 = var2.readUnsignedByte(); // L: 200 - var42[0] = (byte)var19; // L: 201 + if (var42 != null) { + var19 = var2.readUnsignedByte(); + var42[0] = (byte)var19; - for (var27 = 2; var27 < var42.length; var27 += 2) { // L: 202 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203 - var42[var27] = (byte)var19; // L: 204 + for (var27 = 2; var27 < var42.length; var27 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var42[var27] = (byte)var19; } - var47 = var42[0]; // L: 206 - byte var28 = var42[1]; // L: 207 + var47 = var42[0]; + byte var28 = var42[1]; - for (var29 = 0; var29 < var47; ++var29) { // L: 208 - this.field2883[var29] = (byte)(var28 * this.field2883[var29] + 32 >> 6); + for (var29 = 0; var29 < var47; ++var29) { + this.field2873[var29] = (byte)(var28 * this.field2873[var29] + 32 >> 6); } - 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 (var29 = 2; var29 < var42.length; var29 += 2) { + var30 = var42[var29]; + byte var31 = var42[var29 + 1]; + var32 = var28 * (var30 - var47) + (var30 - var47) / 2; - for (var33 = var47; var33 < var30; ++var33) { // L: 214 - var34 = NPCComposition.method2841(var32, var30 - var47); // L: 215 - this.field2883[var33] = (byte)(var34 * this.field2883[var33] + 32 >> 6); // L: 216 - var32 += var31 - var28; // L: 217 + for (var33 = var47; var33 < var30; ++var33) { + var34 = Login.method1658(var32, var30 - var47); + this.field2873[var33] = (byte)(var34 * this.field2873[var33] + 32 >> 6); + var32 += var31 - var28; } - var47 = var30; // L: 219 - var28 = var31; // L: 220 + var47 = var30; + var28 = var31; } - for (var45 = var47; var45 < 128; ++var45) { // L: 223 - this.field2883[var45] = (byte)(var28 * this.field2883[var45] + 32 >> 6); + for (var45 = var47; var45 < 128; ++var45) { + this.field2873[var45] = (byte)(var28 * this.field2873[var45] + 32 >> 6); } - var15 = null; // L: 224 + var15 = null; } - if (var16 != null) { // L: 226 - var19 = var2.readUnsignedByte(); // L: 227 - var16[0] = (byte)var19; // L: 228 + if (var16 != null) { + var19 = var2.readUnsignedByte(); + var16[0] = (byte)var19; - for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 229 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 230 - var16[var27] = (byte)var19; // L: 231 + for (var27 = 2; var27 < var16.length; var27 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var16[var27] = (byte)var19; } - var47 = var16[0]; // L: 233 - int var44 = var16[1] << 1; // L: 234 + var47 = var16[0]; + int var44 = var16[1] << 1; - for (var29 = 0; var29 < var47; ++var29) { // L: 235 - var45 = var44 + (this.field2880[var29] & 255); // L: 236 - if (var45 < 0) { // L: 237 + for (var29 = 0; var29 < var47; ++var29) { + var45 = var44 + (this.field2867[var29] & 255); + if (var45 < 0) { var45 = 0; } - if (var45 > 128) { // L: 238 + if (var45 > 128) { var45 = 128; } - this.field2880[var29] = (byte)var45; // L: 239 + this.field2867[var29] = (byte)var45; } 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 (var29 = 2; var29 < var16.length; var29 += 2) { + var30 = var16[var29]; + var46 = var16[var29 + 1] << 1; + var32 = var44 * (var30 - var47) + (var30 - var47) / 2; - for (var33 = var47; var33 < var30; ++var33) { // L: 246 - var34 = NPCComposition.method2841(var32, var30 - var47); // L: 247 - int var35 = var34 + (this.field2880[var33] & 255); // L: 248 - if (var35 < 0) { // L: 249 + for (var33 = var47; var33 < var30; ++var33) { + var34 = Login.method1658(var32, var30 - var47); + int var35 = var34 + (this.field2867[var33] & 255); + if (var35 < 0) { var35 = 0; } - if (var35 > 128) { // L: 250 + if (var35 > 128) { var35 = 128; } - this.field2880[var33] = (byte)var35; // L: 251 - var32 += var46 - var44; // L: 252 + this.field2867[var33] = (byte)var35; + var32 += var46 - var44; } - var47 = var30; // L: 254 - var44 = var46; // L: 255 + var47 = var30; + var44 = var46; } - for (var45 = var47; var45 < 128; ++var45) { // L: 258 - var46 = var44 + (this.field2880[var45] & 255); // L: 259 - if (var46 < 0) { // L: 260 + for (var45 = var47; var45 < 128; ++var45) { + var46 = var44 + (this.field2867[var45] & 255); + if (var46 < 0) { var46 = 0; } - if (var46 > 128) { // L: 261 + if (var46 > 128) { var46 = 128; } - this.field2880[var45] = (byte)var46; // L: 262 + this.field2867[var45] = (byte)var46; } - Object var43 = null; // L: 264 + Object var43 = null; } - for (var27 = 0; var27 < var12; ++var27) { // L: 266 - var37[var27].field2823 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { + var37[var27].field2806 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { // L: 267 - var39 = var37[var27]; // L: 268 - if (var39.field2821 != null) { // L: 269 - var39.field2824 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field2808 != null) { + var39.field2807 = var2.readUnsignedByte(); } - if (var39.field2828 != null) { // L: 270 - var39.field2825 = var2.readUnsignedByte(); + if (var39.field2811 != null) { + var39.field2805 = var2.readUnsignedByte(); } - if (var39.field2823 > 0) { // L: 271 - var39.field2822 = var2.readUnsignedByte(); + if (var39.field2806 > 0) { + var39.field2809 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 273 - var37[var27].field2827 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { + var37[var27].field2810 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { // L: 274 - var39 = var37[var27]; // L: 275 - if (var39.field2827 > 0) { // L: 276 - var39.field2826 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field2810 > 0) { + var39.field2804 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 278 - var39 = var37[var27]; // L: 279 - if (var39.field2826 > 0) { // L: 280 - var39.field2829 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field2804 > 0) { + var39.field2812 = var2.readUnsignedByte(); } } - } // L: 282 + } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lbz;[B[II)Z", - garbageValue = "-1683954246" + descriptor = "(Lan;[B[II)Z", + garbageValue = "782174668" ) - boolean method4731(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; // L: 285 - int var5 = 0; // L: 286 - RawSound var6 = null; // L: 287 + boolean method4635(SoundCache var1, byte[] var2, int[] var3) { + boolean var4 = true; + int var5 = 0; + RawSound var6 = null; - for (int var7 = 0; var7 < 128; ++var7) { // L: 288 - if (var2 == null || var2[var7] != 0) { // L: 289 - int var8 = this.field2887[var7]; // L: 290 - if (var8 != 0) { // L: 291 - if (var8 != var5) { // L: 292 - var5 = var8--; // L: 293 294 - if ((var8 & 1) == 0) { // L: 295 + for (int var7 = 0; var7 < 128; ++var7) { + if (var2 == null || var2[var7] != 0) { + int var8 = this.field2874[var7]; + if (var8 != 0) { + if (var5 != var8) { + var5 = var8--; + if ((var8 & 1) == 0) { var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); // L: 296 + var6 = var1.getMusicSample(var8 >> 2, var3); } - if (var6 == null) { // L: 297 + if (var6 == null) { var4 = false; } } - if (var6 != null) { // L: 299 - this.rawSounds[var7] = var6; // L: 300 - this.field2887[var7] = 0; // L: 301 + if (var6 != null) { + this.rawSounds[var7] = var6; + this.field2874[var7] = 0; } } } } - return var4; // L: 305 + return var4; } - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "18" + descriptor = "(I)V", + garbageValue = "-57490262" ) @Export("clear") void clear() { - this.field2887 = null; // L: 309 - } // L: 310 + this.field2874 = null; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;ZII)V", + garbageValue = "100696029" + ) + static void method4636(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { + if (var3 == 4) { + Login.loginIndex = 4; + } + + } else { + Login.loginIndex = var3; + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + Login.leftTitleSprite = ClientPreferences.convertJpgToSprite(var4); + Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); + int var5 = Client.worldProperties; + if ((var5 & 536870912) != 0) { + UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((var5 & 1073741824) != 0) { + UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else { + UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + + class304.titleboxSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + Login.titlebuttonSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + int var7 = var1.getGroupId("runes"); + int var8 = var1.getFileId(var7, ""); + IndexedSprite[] var6 = FileSystem.method2628(var1, var7, var8); + Login.runesSprite = var6; + var8 = var1.getGroupId("title_mute"); + int var9 = var1.getFileId(var8, ""); + IndexedSprite[] var10 = FileSystem.method2628(var1, var8, var9); + FileSystem.title_muteSprite = var10; + GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + UserComparator5.field1239 = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + class172.options_buttons_2Sprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + GraphicsDefaults.field3919 = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + ClanSettings.field1386 = GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite.subWidth; + World.field704 = GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite.subHeight; + class6.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + } + + class282.field3639 = 0; + HorizontalAlignment.otp = ""; + Login.field820 = true; + Login.worldSelectOpen = false; + if (!Decimator.clientPreferences.titleMusicDisabled) { + SpotAnimationDefinition.method2875(2, class108.archive6, "scape main", "", 255, false); + } else { + class234.musicPlayerStatus = 1; + class234.musicTrackArchive = null; + class234.musicTrackGroupId = -1; + UserComparator6.musicTrackFileId = -1; + HorizontalAlignment.musicTrackVolume = 0; + EnumComposition.musicTrackBoolean = false; + ClanChannel.pcmSampleLength = 2; + } + + if (NetCache.NetCache_socket != null) { + try { + Buffer var11 = new Buffer(4); + var11.writeByte(3); + var11.writeMedium(0); + NetCache.NetCache_socket.write(var11.array, 0, 4); + } catch (IOException var14) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var13) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + Login.clearLoginScreen = true; + Login.xPadding = (MouseRecorder.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + WorldMapSection2.loginBoxCenter = Login.loginBoxX + 180; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + UserComparator4.logoSprite.drawAt(Login.xPadding + 382 - UserComparator4.logoSprite.subWidth / 2, 18); + } + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "8" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; + } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 4a0730047e..38d2499bf3 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,165 +4,233 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("iu") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("lb") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -830745709 + intValue = -1874854043 ) - int field2898; - @ObfuscatedName("e") + int field2902; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Lif;" ) @Export("patch") MusicPatch patch; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lz;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lho;" - ) - MusicPatchNode2 field2904; @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 461020611 + @ObfuscatedSignature( + descriptor = "Lhd;" ) - int field2897; + MusicPatchNode2 field2885; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -48173435 + ) + int field2887; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 75053875 + ) + int field2893; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1488956187 + ) + int field2888; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 2005146559 + ) + int field2889; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -127033357 + intValue = 471656565 ) - int field2910; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -259364835 - ) - int field2900; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -465046883 - ) - int field2902; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1421225285 - ) - int field2907; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1943082417 - ) - int field2901; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 903145849 - ) - int field2914; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1537236139 - ) - int field2894; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -920697405 - ) - int field2906; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1809682869 - ) - int field2905; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 997505503 - ) - int field2903; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 725888983 - ) - int field2909; + int field2882; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1407978861 + intValue = 509100341 ) - int field2908; + int field2891; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 278878597 + ) + int field2892; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1333282019 + ) + int field2883; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 458384481 + ) + int field2899; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1998786171 + ) + int field2895; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 2084962731 + ) + int field2896; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1291835317 + ) + int field2897; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2142706347 + intValue = 1301679329 ) - int field2911; - @ObfuscatedName("q") + int field2886; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -154309947 + ) + int field2894; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lbv;" + descriptor = "Lal;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1220588121 + intValue = -1589222961 ) - int field2913; - @ObfuscatedName("c") + int field2901; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1263258455 + intValue = 1653433433 ) - int field2899; + int field2898; MusicPatchNode() { - } // L: 31 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-818920920" + garbageValue = "-2112668994" ) - void method4772() { - this.patch = null; // L: 34 - this.rawSound = null; // L: 35 - this.field2904 = null; // L: 36 - this.stream = null; // L: 37 - } // L: 38 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1957500664" - ) - public static int method4776(int var0, int var1) { - return (var0 << 8) + var1; // L: 13 + void method4686() { + this.patch = null; + this.rawSound = null; + this.field2885 = null; + this.stream = null; } - @ObfuscatedName("ji") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "-68" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-2130267956" ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 9906 - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9907 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9908 - } - - if (var1.length() > 9) { // L: 9910 - return " " + SecureRandomFuture.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + public static byte[] method4683(Object var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0 instanceof byte[]) { + byte[] var3 = (byte[])((byte[])var0); + return var1 ? TextureProvider.method4203(var3) : var3; + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); } else { - return var1.length() > 6 ? " " + SecureRandomFuture.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + SecureRandomFuture.colorStartTag(16776960) + var1 + ""; // L: 9911 9912 + throw new IllegalArgumentException(); } } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "277375642" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + if (var1 && var0 >= 0) { + int var3 = var0; + String var2; + if (var1 && var0 >= 0) { + int var4 = 2; + + for (int var5 = var0 / 10; var5 != 0; ++var4) { + var5 /= 10; + } + + char[] var6 = new char[var4]; + var6[0] = '+'; + + for (int var7 = var4 - 1; var7 > 0; --var7) { + int var8 = var3; + var3 /= 10; + int var9 = var8 - var3 * 10; + if (var9 >= 10) { + var6[var7] = (char)(var9 + 87); + } else { + var6[var7] = (char)(var9 + 48); + } + } + + var2 = new String(var6); + } else { + var2 = Integer.toString(var0, 10); + } + + return var2; + } else { + return Integer.toString(var0); + } + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(Lbx;II)V", + garbageValue = "456956891" + ) + static final void method4684(Actor var0, int var1) { + FriendLoginUpdate.worldToScreen(var0.x, var0.y, var1); + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-6" + ) + static final void method4685(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : FriendLoginUpdate.guestClanChannel; + if (var2 != null && var1 >= 0 && var1 < var2.method2520()) { + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); + if (var3.rank == -1) { + String var4 = var3.username.getName(); + PacketWriter var5 = Client.packetWriter; + PacketBufferNode var6 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2671, var5.isaacCipher); + var6.packetBuffer.writeByte(3 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var4)); + var6.packetBuffer.writeByte(var0); + var6.packetBuffer.writeShort(var1); + var6.packetBuffer.writeStringCp1252NullTerminated(var4); + var5.addNode(var6); + } + } + } + + @ObfuscatedName("kg") + @ObfuscatedSignature( + descriptor = "(Lio;B)I", + garbageValue = "100" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); + return var1 != null ? var1.integer : var0.flags; + } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 6514bf4bb5..1a1af35bf3 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,63 +1,50 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hd") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("f") - byte[] field2821; - @ObfuscatedName("e") - byte[] field2828; + @ObfuscatedName("s") + byte[] field2808; + @ObfuscatedName("t") + byte[] field2811; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 660158301 + intValue = 1588389919 ) - int field2823; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1122289667 - ) - int field2824; + int field2806; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1506593887 + intValue = -561843993 ) - int field2825; + int field2807; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 2024434103 + ) + int field2805; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 642207547 + ) + int field2809; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1981052655 + ) + int field2804; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 704049347 + ) + int field2810; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1063297041 + intValue = 515822455 ) - int field2822; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1150913277 - ) - int field2826; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1271826479 - ) - int field2827; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -12467387 - ) - int field2829; + int field2812; MusicPatchNode2() { - } // L: 14 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1118422723" - ) - static final void method4537(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); // L: 114 - UserComparator10.addGameMessage(30, "", var1); // L: 116 - } // L: 118 + } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 5427d6238d..9b1ab4568b 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -6,245 +6,346 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("it") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("f") + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Lex;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Liv;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("queue") NodeDeque queue; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lm;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lie;)V" + descriptor = "(Liv;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { - this.queue = new NodeDeque(); // L: 11 - this.mixer = new PcmStreamMixer(); // L: 12 - this.superStream = var1; // L: 15 - } // L: 16 + this.queue = new NodeDeque(); + this.mixer = new PcmStreamMixer(); + this.superStream = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lib;[IIIIB)V", - garbageValue = "0" + descriptor = "(Liu;[IIIII)V", + garbageValue = "-1715787417" ) - void method4761(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2851[var1.field2898] & 4) != 0 && var1.field2903 < 0) { // L: 73 - int var6 = this.superStream.field2856[var1.field2898] / class341.field3921; // L: 74 + void method4648(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2830[var1.field2902] & 4) != 0 && var1.field2896 < 0) { + int var6 = this.superStream.field2841[var1.field2902] / GrandExchangeOfferAgeComparator.field3633; while (true) { - int var7 = (var6 + 1048575 - var1.field2899) / var6; // L: 76 - if (var7 > var4) { // L: 77 - var1.field2899 += var4 * var6; // L: 99 + int var7 = (var6 + 1048575 - var1.field2898) / var6; + if (var7 > var4) { + var1.field2898 += var4 * var6; break; } - var1.stream.fill(var2, var3, var7); // L: 78 - var3 += var7; // L: 79 - var4 -= var7; // L: 80 - var1.field2899 += var7 * var6 - 1048576; // L: 81 - int var8 = class341.field3921 / 100; // L: 82 - int var9 = 262144 / var6; // L: 83 - if (var9 < var8) { // L: 84 + var1.stream.fill(var2, var3, var7); + var3 += var7; + var4 -= var7; + var1.field2898 += var6 * var7 - 1048576; + int var8 = GrandExchangeOfferAgeComparator.field3633 / 100; + int var9 = 262144 / var6; + if (var9 < var8) { var8 = var9; } - RawPcmStream var10 = var1.stream; // L: 85 - if (this.superStream.field2854[var1.field2898] == 0) { // L: 86 - var1.stream = RawPcmStream.method937(var1.rawSound, var10.method957(), var10.method948(), var10.method949()); // L: 87 + RawPcmStream var10 = var1.stream; + if (this.superStream.field2839[var1.field2902] == 0) { + var1.stream = RawPcmStream.method554(var1.rawSound, var10.method569(), var10.method560(), var10.method561()); } else { - var1.stream = RawPcmStream.method937(var1.rawSound, var10.method957(), 0, var10.method949()); // L: 90 - this.superStream.method4567(var1, var1.patch.field2882[var1.field2910] < 0); // L: 91 - var1.stream.method953(var8, var10.method948()); // L: 92 + var1.stream = RawPcmStream.method554(var1.rawSound, var10.method569(), 0, var10.method561()); + this.superStream.method4472(var1, var1.patch.field2868[var1.field2893] < 0); + var1.stream.method565(var8, var10.method560()); } - if (var1.patch.field2882[var1.field2910] < 0) { // L: 94 + if (var1.patch.field2868[var1.field2893] < 0) { var1.stream.setNumLoops(-1); } - var10.method955(var8); // L: 95 - var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method959()) { // L: 97 + var10.method567(var8); + var10.fill(var2, var3, var5 - var3); + if (var10.method571()) { this.mixer.addSubStream(var10); } } } - var1.stream.fill(var2, var3, var4); // L: 101 - } // L: 102 + var1.stream.fill(var2, var3, var4); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lib;II)V", - garbageValue = "-1540806393" + descriptor = "(Liu;IB)V", + garbageValue = "4" ) - void method4744(MusicPatchNode var1, int var2) { - if ((this.superStream.field2851[var1.field2898] & 4) != 0 && var1.field2903 < 0) { // L: 105 - int var3 = this.superStream.field2856[var1.field2898] / class341.field3921; // L: 106 - int var4 = (var3 + 1048575 - var1.field2899) / var3; // L: 107 - var1.field2899 = var3 * var2 + var1.field2899 & 1048575; // L: 108 - if (var4 <= var2) { // L: 109 - if (this.superStream.field2854[var1.field2898] == 0) { // L: 110 - var1.stream = RawPcmStream.method937(var1.rawSound, var1.stream.method957(), var1.stream.method948(), var1.stream.method949()); // L: 111 + void method4645(MusicPatchNode var1, int var2) { + if ((this.superStream.field2830[var1.field2902] & 4) != 0 && var1.field2896 < 0) { + int var3 = this.superStream.field2841[var1.field2902] / GrandExchangeOfferAgeComparator.field3633; + int var4 = (var3 + 1048575 - var1.field2898) / var3; + var1.field2898 = var3 * var2 + var1.field2898 & 1048575; + if (var4 <= var2) { + if (this.superStream.field2839[var1.field2902] == 0) { + var1.stream = RawPcmStream.method554(var1.rawSound, var1.stream.method569(), var1.stream.method560(), var1.stream.method561()); } else { - var1.stream = RawPcmStream.method937(var1.rawSound, var1.stream.method957(), 0, var1.stream.method949()); // L: 114 - this.superStream.method4567(var1, var1.patch.field2882[var1.field2910] < 0); // L: 115 + var1.stream = RawPcmStream.method554(var1.rawSound, var1.stream.method569(), 0, var1.stream.method561()); + this.superStream.method4472(var1, var1.patch.field2868[var1.field2893] < 0); } - if (var1.patch.field2882[var1.field2910] < 0) { // L: 117 + if (var1.patch.field2868[var1.field2893] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2899 / var3; // L: 118 + var2 = var1.field2898 / var3; } } - var1.stream.skip(var2); // L: 121 - } // L: 122 + var1.stream.skip(var2); + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 - if (var1 == null) { // L: 20 + MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); + if (var1 == null) { return null; } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { - var1 = (MusicPatchNode)this.queue.previous(); // L: 27 + var1 = (MusicPatchNode)this.queue.previous(); if (var1 == null) { - return null; // L: 28 + return null; } - } while(var1.stream == null); // L: 29 + } while(var1.stream == null); return var1.stream; } - @ObfuscatedName("r") - protected int vmethod4740() { - return 0; // L: 34 + @ObfuscatedName("f") + protected int vmethod4662() { + return 0; } - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("fill") protected void fill(int[] var1, int var2, int var3) { - this.mixer.fill(var1, var2, var3); // L: 40 + this.mixer.fill(var1, var2, var3); - for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 - if (!this.superStream.method4589(var6)) { // L: 42 - int var4 = var2; // L: 43 - int var5 = var3; // L: 44 + for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { + if (!this.superStream.method4507(var6)) { + int var4 = var2; + int var5 = var3; do { - if (var5 <= var6.field2913) { // L: 45 - this.method4761(var6, var1, var4, var5, var4 + var5); // L: 51 - var6.field2913 -= var5; // L: 52 + if (var5 <= var6.field2901) { + this.method4648(var6, var1, var4, var5, var5 + var4); + var6.field2901 -= var5; break; } - this.method4761(var6, var1, var4, var6.field2913, var4 + var5); // L: 46 - var4 += var6.field2913; // L: 47 - var5 -= var6.field2913; // L: 48 - } while(!this.superStream.method4590(var6, var1, var4, var5)); // L: 49 + this.method4648(var6, var1, var4, var6.field2901, var5 + var4); + var4 += var6.field2901; + var5 -= var6.field2901; + } while(!this.superStream.method4508(var6, var1, var4, var5)); } } - } // L: 54 - - @ObfuscatedName("z") - @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.method4589(var3)) { // L: 60 - int var2 = var1; // L: 61 - - do { - if (var2 <= var3.field2913) { // L: 62 - this.method4744(var3, var2); // L: 67 - var3.field2913 -= var2; // L: 68 - break; - } - - this.method4744(var3, var3.field2913); // L: 63 - var2 -= var3.field2913; // L: 64 - } while(!this.superStream.method4590(var3, (int[])null, 0, var2)); // L: 65 - } - } - - } // L: 70 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IS)Ljava/lang/String;", - garbageValue = "-8788" - ) - static String method4743(int var0) { - return ""; // L: 18 } - @ObfuscatedName("gd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1611002250" - ) - static final void method4762() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4826 4827 4844 - if (var0.plane == SoundSystem.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4828 - if (Client.cycle >= var0.cycleStart) { // L: 4829 - if (var0.targetIndex > 0) { // L: 4830 - NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4831 - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4832 - var0.setDestination(var1.x, var1.y, ItemContainer.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } + @ObfuscatedName("r") + @Export("skip") + protected void skip(int var1) { + this.mixer.skip(var1); + + for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { + if (!this.superStream.method4507(var3)) { + int var2 = var1; + + do { + if (var2 <= var3.field2901) { + this.method4645(var3, var2); + var3.field2901 -= var2; + break; } - if (var0.targetIndex < 0) { // L: 4834 - int var2 = -var0.targetIndex - 1; // L: 4836 - Player var3; - if (var2 == Client.localPlayerIndex) { // L: 4837 - var3 = class262.localPlayer; - } else { - var3 = Client.players[var2]; // L: 4838 - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, ItemContainer.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4839 - } - } - - var0.advance(Client.field683); // L: 4841 - DevicePcmPlayerProvider.scene.drawEntity(SoundSystem.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4842 - } - } else { - var0.remove(); + this.method4645(var3, var3.field2901); + var2 -= var3.field2901; + } while(!this.superStream.method4508(var3, (int[])null, 0, var2)); } } - } // L: 4846 + } + + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1801326233" + ) + static final void method4644() { + if (Players.field1182) { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.method1825(); + } + + Players.field1182 = false; + } + + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(ZLnu;I)V", + garbageValue = "793662428" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var2; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + var2 = var1.method6696(); + int var3 = var1.method6785(); + var4 = var1.readUnsignedShort(); + ScriptFrame.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + ScriptFrame.xteaKeys[var5][var6] = var1.readInt(); + } + } + + class234.regions = new int[var4]; + Huffman.regionMapArchiveIds = new int[var4]; + UserComparator6.regionLandArchiveIds = new int[var4]; + ClientPacket.regionLandArchives = new byte[var4][]; + PlatformInfo.regionMapArchives = new byte[var4][]; + boolean var16 = false; + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { + var16 = true; + } + + if (var3 / 8 == 48 && var2 / 8 == 148) { + var16 = true; + } + + var4 = 0; + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { + var8 = var7 + (var6 << 8); + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { + class234.regions[var4] = var8; + Huffman.regionMapArchiveIds[var4] = Skeleton.archive5.getGroupId("m" + var6 + "_" + var7); + UserComparator6.regionLandArchiveIds[var4] = Skeleton.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; + } + } + } + + class98.method2208(var3, var2, true); + } else { + var2 = var1.method6697(); + boolean var15 = var1.method6688() == 1; + var4 = var1.readUnsignedShort(); + var5 = var1.readUnsignedShort(); + var1.importIndex(); + + int var9; + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = var1.readBits(1); + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; + } + } + } + } + + var1.exportIndex(); + ScriptFrame.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + ScriptFrame.xteaKeys[var6][var7] = var1.readInt(); + } + } + + class234.regions = new int[var5]; + Huffman.regionMapArchiveIds = new int[var5]; + UserComparator6.regionLandArchiveIds = new int[var5]; + ClientPacket.regionLandArchives = new byte[var5][]; + PlatformInfo.regionMapArchives = new byte[var5][]; + var5 = 0; + + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = Client.instanceChunkTemplates[var6][var7][var8]; + if (var9 != -1) { + int var10 = var9 >> 14 & 1023; + int var11 = var9 >> 3 & 2047; + int var12 = (var10 / 8 << 8) + var11 / 8; + + int var13; + for (var13 = 0; var13 < var5; ++var13) { + if (class234.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + class234.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + Huffman.regionMapArchiveIds[var5] = Skeleton.archive5.getGroupId("m" + var13 + "_" + var14); + UserComparator6.regionLandArchiveIds[var5] = Skeleton.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + class98.method2208(var2, var4, !var15); + } + + } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index afbb7f837d..218c9abc0d 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,130 +3,130 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("il") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) MusicTrack(Buffer var1) { - var1.offset = var1.array.length - 3; // L: 22 - int var2 = var1.readUnsignedByte(); // L: 23 - int var3 = var1.readUnsignedShort(); // L: 24 - int var4 = var2 * 10 + 14; // L: 25 - var1.offset = 0; // L: 26 - int var5 = 0; // L: 27 - int var6 = 0; // L: 28 - int var7 = 0; // L: 29 - int var8 = 0; // L: 30 - int var9 = 0; // L: 31 - int var10 = 0; // L: 32 - int var11 = 0; // L: 33 - int var12 = 0; // L: 34 + var1.offset = var1.array.length - 3; + int var2 = var1.readUnsignedByte(); + int var3 = var1.readUnsignedShort(); + int var4 = var2 * 10 + 14; + var1.offset = 0; + int var5 = 0; + int var6 = 0; + int var7 = 0; + int var8 = 0; + int var9 = 0; + int var10 = 0; + int var11 = 0; + int var12 = 0; int var13; int var14; int var15; - for (var13 = 0; var13 < var2; ++var13) { // L: 35 - var14 = -1; // L: 36 + for (var13 = 0; var13 < var2; ++var13) { + var14 = -1; while (true) { - var15 = var1.readUnsignedByte(); // L: 38 - if (var15 != var14) { // L: 39 + var15 = var1.readUnsignedByte(); + if (var15 != var14) { ++var4; } - var14 = var15 & 15; // L: 40 - if (var15 == 7) { // L: 41 + var14 = var15 & 15; + if (var15 == 7) { break; } - if (var15 == 23) { // L: 42 - ++var5; // L: 43 - } else if (var14 == 0) { // L: 46 - ++var7; // L: 47 - } else if (var14 == 1) { // L: 50 - ++var8; // L: 51 - } else if (var14 == 2) { // L: 54 - ++var6; // L: 55 - } else if (var14 == 3) { // L: 58 - ++var9; // L: 59 - } else if (var14 == 4) { // L: 62 - ++var10; // L: 63 - } else if (var14 == 5) { // L: 66 - ++var11; // L: 67 + if (var15 == 23) { + ++var5; + } else if (var14 == 0) { + ++var7; + } else if (var14 == 1) { + ++var8; + } else if (var14 == 2) { + ++var6; + } else if (var14 == 3) { + ++var9; + } else if (var14 == 4) { + ++var10; + } else if (var14 == 5) { + ++var11; } else { - if (var14 != 6) { // L: 70 - throw new RuntimeException(); // L: 74 + if (var14 != 6) { + throw new RuntimeException(); } - ++var12; // L: 71 + ++var12; } } } - var4 += var5 * 5; // L: 77 - var4 += (var7 + var8 + var6 + var9 + var11) * 2; // L: 78 - var4 = var4 + var10 + var12; // L: 79 - var13 = var1.offset; // L: 80 - var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; // L: 81 + var4 += var5 * 5; + var4 += (var7 + var8 + var6 + var9 + var11) * 2; + var4 = var4 + var10 + var12; + var13 = var1.offset; + var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; - for (var15 = 0; var15 < var14; ++var15) { // L: 82 + for (var15 = 0; var15 < var14; ++var15) { var1.readVarInt(); } - var4 += var1.offset - var13; // L: 83 - var15 = var1.offset; // L: 84 - int var16 = 0; // L: 85 - int var17 = 0; // L: 86 - int var18 = 0; // L: 87 - int var19 = 0; // L: 88 - int var20 = 0; // L: 89 - int var21 = 0; // L: 90 - int var22 = 0; // L: 91 - int var23 = 0; // L: 92 - int var24 = 0; // L: 93 - int var25 = 0; // L: 94 - int var26 = 0; // L: 95 - int var27 = 0; // L: 96 - int var28 = 0; // L: 97 + var4 += var1.offset - var13; + var15 = var1.offset; + int var16 = 0; + int var17 = 0; + int var18 = 0; + int var19 = 0; + int var20 = 0; + int var21 = 0; + int var22 = 0; + int var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; int var29; - for (var29 = 0; var29 < var6; ++var29) { // L: 98 - var28 = var28 + var1.readUnsignedByte() & 127; // L: 99 - if (var28 != 0 && var28 != 32) { // L: 100 - if (var28 == 1) { // L: 101 + for (var29 = 0; var29 < var6; ++var29) { + var28 = var28 + var1.readUnsignedByte() & 127; + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { ++var16; - } else if (var28 == 33) { // L: 102 + } else if (var28 == 33) { ++var17; - } else if (var28 == 7) { // L: 103 + } else if (var28 == 7) { ++var18; - } else if (var28 == 39) { // L: 104 + } else if (var28 == 39) { ++var19; - } else if (var28 == 10) { // L: 105 + } else if (var28 == 10) { ++var20; - } else if (var28 == 42) { // L: 106 + } else if (var28 == 42) { ++var21; - } else if (var28 == 99) { // L: 107 + } else if (var28 == 99) { ++var22; - } else if (var28 == 98) { // L: 108 + } else if (var28 == 98) { ++var23; - } else if (var28 == 101) { // L: 109 + } else if (var28 == 101) { ++var24; - } else if (var28 == 100) { // L: 110 + } else if (var28 == 100) { ++var25; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 111 - ++var27; // L: 112 + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + ++var27; } else { ++var26; } @@ -135,153 +135,153 @@ public class MusicTrack extends Node { } } - var29 = 0; // L: 114 - int var30 = var1.offset; // L: 115 - var1.offset += var26; // L: 116 - int var31 = var1.offset; // L: 117 - var1.offset += var11; // L: 118 - int var32 = var1.offset; // L: 119 - var1.offset += var10; // L: 120 - int var33 = var1.offset; // L: 121 - var1.offset += var9; // L: 122 - int var34 = var1.offset; // L: 123 - var1.offset += var16; // L: 124 - int var35 = var1.offset; // L: 125 - var1.offset += var18; // L: 126 - int var36 = var1.offset; // L: 127 - var1.offset += var20; // L: 128 - int var37 = var1.offset; // L: 129 - var1.offset += var7 + var8 + var11; // L: 130 - int var38 = var1.offset; // L: 131 - var1.offset += var7; // L: 132 - int var39 = var1.offset; // L: 133 - var1.offset += var27; // L: 134 - int var40 = var1.offset; // L: 135 - var1.offset += var8; // L: 136 - int var41 = var1.offset; // L: 137 - var1.offset += var17; // L: 138 - int var42 = var1.offset; // L: 139 - var1.offset += var19; // L: 140 - int var43 = var1.offset; // L: 141 - var1.offset += var21; // L: 142 - int var44 = var1.offset; // L: 143 - var1.offset += var12; // L: 144 - int var45 = var1.offset; // L: 145 - var1.offset += var9; // L: 146 - int var46 = var1.offset; // L: 147 - var1.offset += var22; // L: 148 - int var47 = var1.offset; // L: 149 - var1.offset += var23; // L: 150 - int var48 = var1.offset; // L: 151 - var1.offset += var24; // L: 152 - int var49 = var1.offset; // L: 153 - var1.offset += var25; // L: 154 - int var50 = var1.offset; // L: 155 - var1.offset += var5 * 3; // L: 156 - this.midi = new byte[var4]; // L: 157 - Buffer var51 = new Buffer(this.midi); // L: 158 - var51.writeInt(1297377380); // L: 159 - var51.writeInt(6); // L: 160 - var51.writeShort(var2 > 1 ? 1 : 0); // L: 161 - var51.writeShort(var2); // L: 162 - var51.writeShort(var3); // L: 163 - var1.offset = var13; // L: 164 - int var52 = 0; // L: 165 - int var53 = 0; // L: 166 - int var54 = 0; // L: 167 - int var55 = 0; // L: 168 - int var56 = 0; // L: 169 - int var57 = 0; // L: 170 - int var58 = 0; // L: 171 - int[] var59 = new int[128]; // L: 172 - var28 = 0; // L: 173 + var29 = 0; + int var30 = var1.offset; + var1.offset += var26; + int var31 = var1.offset; + var1.offset += var11; + int var32 = var1.offset; + var1.offset += var10; + int var33 = var1.offset; + var1.offset += var9; + int var34 = var1.offset; + var1.offset += var16; + int var35 = var1.offset; + var1.offset += var18; + int var36 = var1.offset; + var1.offset += var20; + int var37 = var1.offset; + var1.offset += var7 + var8 + var11; + int var38 = var1.offset; + var1.offset += var7; + int var39 = var1.offset; + var1.offset += var27; + int var40 = var1.offset; + var1.offset += var8; + int var41 = var1.offset; + var1.offset += var17; + int var42 = var1.offset; + var1.offset += var19; + int var43 = var1.offset; + var1.offset += var21; + int var44 = var1.offset; + var1.offset += var12; + int var45 = var1.offset; + var1.offset += var9; + int var46 = var1.offset; + var1.offset += var22; + int var47 = var1.offset; + var1.offset += var23; + int var48 = var1.offset; + var1.offset += var24; + int var49 = var1.offset; + var1.offset += var25; + int var50 = var1.offset; + var1.offset += var5 * 3; + this.midi = new byte[var4]; + Buffer var51 = new Buffer(this.midi); + var51.writeInt(1297377380); + var51.writeInt(6); + var51.writeShort(var2 > 1 ? 1 : 0); + var51.writeShort(var2); + var51.writeShort(var3); + var1.offset = var13; + int var52 = 0; + int var53 = 0; + int var54 = 0; + int var55 = 0; + int var56 = 0; + int var57 = 0; + int var58 = 0; + int[] var59 = new int[128]; + var28 = 0; label243: - for (int var60 = 0; var60 < var2; ++var60) { // L: 174 - var51.writeInt(1297379947); // L: 175 - var51.offset += 4; // L: 176 - int var61 = var51.offset; // L: 177 - int var62 = -1; // L: 178 + for (int var60 = 0; var60 < var2; ++var60) { + var51.writeInt(1297379947); + var51.offset += 4; + int var61 = var51.offset; + int var62 = -1; while (true) { while (true) { - int var63 = var1.readVarInt(); // L: 180 - var51.writeVarInt(var63); // L: 181 - int var64 = var1.array[var29++] & 255; // L: 182 - boolean var65 = var64 != var62; // L: 183 - var62 = var64 & 15; // L: 184 - if (var64 == 7) { // L: 185 - if (var65) { // L: 186 + int var63 = var1.readVarInt(); + var51.writeVarInt(var63); + int var64 = var1.array[var29++] & 255; + boolean var65 = var64 != var62; + var62 = var64 & 15; + if (var64 == 7) { + if (var65) { var51.writeByte(255); } - var51.writeByte(47); // L: 187 - var51.writeByte(0); // L: 188 - var51.writeLengthInt(var51.offset - var61); // L: 269 + var51.writeByte(47); + var51.writeByte(0); + var51.writeLengthInt(var51.offset - var61); continue label243; } - if (var64 == 23) { // L: 191 - if (var65) { // L: 192 + if (var64 == 23) { + if (var65) { var51.writeByte(255); } - var51.writeByte(81); // L: 193 - var51.writeByte(3); // L: 194 - var51.writeByte(var1.array[var50++]); // L: 195 - var51.writeByte(var1.array[var50++]); // L: 196 - var51.writeByte(var1.array[var50++]); // L: 197 + var51.writeByte(81); + var51.writeByte(3); + var51.writeByte(var1.array[var50++]); + var51.writeByte(var1.array[var50++]); + var51.writeByte(var1.array[var50++]); } else { - var52 ^= var64 >> 4; // L: 200 - if (var62 == 0) { // L: 201 - if (var65) { // L: 202 + var52 ^= var64 >> 4; + if (var62 == 0) { + if (var65) { var51.writeByte(var52 + 144); } - var53 += var1.array[var37++]; // L: 203 - var54 += var1.array[var38++]; // L: 204 - var51.writeByte(var53 & 127); // L: 205 - var51.writeByte(var54 & 127); // L: 206 - } else if (var62 == 1) { // L: 209 - if (var65) { // L: 210 + var53 += var1.array[var37++]; + var54 += var1.array[var38++]; + var51.writeByte(var53 & 127); + var51.writeByte(var54 & 127); + } else if (var62 == 1) { + if (var65) { var51.writeByte(var52 + 128); } - var53 += var1.array[var37++]; // L: 211 - var55 += var1.array[var40++]; // L: 212 - var51.writeByte(var53 & 127); // L: 213 - var51.writeByte(var55 & 127); // L: 214 - } else if (var62 == 2) { // L: 217 - if (var65) { // L: 218 + var53 += var1.array[var37++]; + var55 += var1.array[var40++]; + var51.writeByte(var53 & 127); + var51.writeByte(var55 & 127); + } else if (var62 == 2) { + if (var65) { var51.writeByte(var52 + 176); } - var28 = var28 + var1.array[var15++] & 127; // L: 219 - var51.writeByte(var28); // L: 220 + var28 = var28 + var1.array[var15++] & 127; + var51.writeByte(var28); byte var66; - if (var28 != 0 && var28 != 32) { // L: 222 - if (var28 == 1) { // L: 223 + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { var66 = var1.array[var34++]; - } else if (var28 == 33) { // L: 224 + } else if (var28 == 33) { var66 = var1.array[var41++]; - } else if (var28 == 7) { // L: 225 + } else if (var28 == 7) { var66 = var1.array[var35++]; - } else if (var28 == 39) { // L: 226 + } else if (var28 == 39) { var66 = var1.array[var42++]; - } else if (var28 == 10) { // L: 227 + } else if (var28 == 10) { var66 = var1.array[var36++]; - } else if (var28 == 42) { // L: 228 + } else if (var28 == 42) { var66 = var1.array[var43++]; - } else if (var28 == 99) { // L: 229 + } else if (var28 == 99) { var66 = var1.array[var46++]; - } else if (var28 == 98) { // L: 230 + } else if (var28 == 98) { var66 = var1.array[var47++]; - } else if (var28 == 101) { // L: 231 + } else if (var28 == 101) { var66 = var1.array[var48++]; - } else if (var28 == 100) { // L: 232 + } else if (var28 == 100) { var66 = var1.array[var49++]; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 233 - var66 = var1.array[var39++]; // L: 234 + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + var66 = var1.array[var39++]; } else { var66 = var1.array[var30++]; } @@ -289,146 +289,146 @@ public class MusicTrack extends Node { var66 = var1.array[var44++]; } - int var67 = var66 + var59[var28]; // L: 235 - var59[var28] = var67; // L: 236 - var51.writeByte(var67 & 127); // L: 237 - } else if (var62 == 3) { // L: 240 - if (var65) { // L: 241 + int var67 = var66 + var59[var28]; + var59[var28] = var67; + var51.writeByte(var67 & 127); + } else if (var62 == 3) { + if (var65) { var51.writeByte(var52 + 224); } - var56 += var1.array[var45++]; // L: 242 - var56 += var1.array[var33++] << 7; // L: 243 - var51.writeByte(var56 & 127); // L: 244 - var51.writeByte(var56 >> 7 & 127); // L: 245 - } else if (var62 == 4) { // L: 248 - if (var65) { // L: 249 + var56 += var1.array[var45++]; + var56 += var1.array[var33++] << 7; + var51.writeByte(var56 & 127); + var51.writeByte(var56 >> 7 & 127); + } else if (var62 == 4) { + if (var65) { var51.writeByte(var52 + 208); } - var57 += var1.array[var32++]; // L: 250 - var51.writeByte(var57 & 127); // L: 251 - } else if (var62 == 5) { // L: 254 - if (var65) { // L: 255 + var57 += var1.array[var32++]; + var51.writeByte(var57 & 127); + } else if (var62 == 5) { + if (var65) { var51.writeByte(var52 + 160); } - var53 += var1.array[var37++]; // L: 256 - var58 += var1.array[var31++]; // L: 257 - var51.writeByte(var53 & 127); // L: 258 - var51.writeByte(var58 & 127); // L: 259 + var53 += var1.array[var37++]; + var58 += var1.array[var31++]; + var51.writeByte(var53 & 127); + var51.writeByte(var58 & 127); } else { - if (var62 != 6) { // L: 262 - throw new RuntimeException(); // L: 267 + if (var62 != 6) { + throw new RuntimeException(); } - if (var65) { // L: 263 + if (var65) { var51.writeByte(var52 + 192); } - var51.writeByte(var1.array[var44++]); // L: 264 + var51.writeByte(var1.array[var44++]); } } } } } - } // L: 271 + } - @ObfuscatedName("e") - void method4771() { - if (this.table == null) { // L: 274 - this.table = new NodeHashTable(16); // L: 275 - int[] var1 = new int[16]; // L: 276 - int[] var2 = new int[16]; // L: 277 - var2[9] = 128; // L: 279 - var1[9] = 128; // L: 280 - MidiFileReader var4 = new MidiFileReader(this.midi); // L: 281 - int var5 = var4.trackCount(); // L: 282 + @ObfuscatedName("t") + void method4672() { + if (this.table == null) { + this.table = new NodeHashTable(16); + int[] var1 = new int[16]; + int[] var2 = new int[16]; + var2[9] = 128; + var1[9] = 128; + MidiFileReader var4 = new MidiFileReader(this.midi); + int var5 = var4.trackCount(); int var6; - for (var6 = 0; var6 < var5; ++var6) { // L: 283 - var4.gotoTrack(var6); // L: 284 - var4.readTrackLength(var6); // L: 285 - var4.markTrackPosition(var6); // L: 286 + for (var6 = 0; var6 < var5; ++var6) { + var4.gotoTrack(var6); + var4.readTrackLength(var6); + var4.markTrackPosition(var6); } label56: do { while (true) { - var6 = var4.getPrioritizedTrack(); // L: 289 - int var7 = var4.trackLengths[var6]; // L: 290 + var6 = var4.getPrioritizedTrack(); + int var7 = var4.trackLengths[var6]; - while (var7 == var4.trackLengths[var6]) { // L: 291 - var4.gotoTrack(var6); // L: 292 - int var8 = var4.readMessage(var6); // L: 293 - if (var8 == 1) { // L: 294 - var4.setTrackDone(); // L: 295 - var4.markTrackPosition(var6); // L: 296 + while (var7 == var4.trackLengths[var6]) { + var4.gotoTrack(var6); + int var8 = var4.readMessage(var6); + if (var8 == 1) { + var4.setTrackDone(); + var4.markTrackPosition(var6); continue label56; } - int var9 = var8 & 240; // L: 300 + int var9 = var8 & 240; int var10; int var11; int var12; - if (var9 == 176) { // L: 301 - var10 = var8 & 15; // L: 302 - var11 = var8 >> 8 & 127; // L: 303 - var12 = var8 >> 16 & 127; // L: 304 - if (var11 == 0) { // L: 305 + if (var9 == 176) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var12 = var8 >> 16 & 127; + if (var11 == 0) { var1[var10] = (var12 << 14) + (var1[var10] & -2080769); } - if (var11 == 32) { // L: 306 + if (var11 == 32) { var1[var10] = (var1[var10] & -16257) + (var12 << 7); } } - if (var9 == 192) { // L: 308 - var10 = var8 & 15; // L: 309 - var11 = var8 >> 8 & 127; // L: 310 - var2[var10] = var11 + var1[var10]; // L: 311 + if (var9 == 192) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var2[var10] = var11 + var1[var10]; } - if (var9 == 144) { // L: 313 - var10 = var8 & 15; // L: 314 - var11 = var8 >> 8 & 127; // L: 315 - var12 = var8 >> 16 & 127; // L: 316 - if (var12 > 0) { // L: 317 - int var13 = var2[var10]; // L: 318 - ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); // L: 319 - if (var14 == null) { // L: 320 - var14 = new ByteArrayNode(new byte[128]); // L: 321 - this.table.put(var14, (long)var13); // L: 322 + if (var9 == 144) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var12 = var8 >> 16 & 127; + if (var12 > 0) { + int var13 = var2[var10]; + ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); + if (var14 == null) { + var14 = new ByteArrayNode(new byte[128]); + this.table.put(var14, (long)var13); } - var14.byteArray[var11] = 1; // L: 324 + var14.byteArray[var11] = 1; } } - var4.readTrackLength(var6); // L: 327 - var4.markTrackPosition(var6); // L: 328 + var4.readTrackLength(var6); + var4.markTrackPosition(var6); } } - } while(!var4.isDone()); // L: 297 + } while(!var4.isDone()); } - } // L: 331 + } @ObfuscatedName("v") @Export("clear") void clear() { - this.table = null; // L: 334 - } // L: 335 + this.table = null; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lio;" + descriptor = "(Ljy;II)Lil;" ) @Export("readTrack") 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 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new MusicTrack(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 91c9b23267..082e31624f 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,169 +1,235 @@ +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("du") +@ObfuscatedName("be") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("h") - static int[][] field1328; - @ObfuscatedName("f") + @ObfuscatedName("tu") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Lcd;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("gk") + @ObfuscatedGetter( + intValue = 618846461 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lej;" ) @Export("definition") NPCComposition definition; NPC() { - } // L: 12 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IBI)V", - garbageValue = "464713679" + descriptor = "(IBB)V", + garbageValue = "-46" ) - final void method2343(int var1, byte var2) { - int var3 = super.pathX[0]; // L: 15 - int var4 = super.pathY[0]; // L: 16 - if (var1 == 0) { // L: 17 - --var3; // L: 18 - ++var4; // L: 19 - } - - if (var1 == 1) { // L: 21 + final void method1956(int var1, byte var2) { + int var3 = super.pathX[0]; + int var4 = super.pathY[0]; + if (var1 == 0) { + --var3; ++var4; } - if (var1 == 2) { // L: 22 - ++var3; // L: 23 - ++var4; // L: 24 + if (var1 == 1) { + ++var4; } - if (var1 == 3) { // L: 26 + if (var1 == 2) { + ++var3; + ++var4; + } + + if (var1 == 3) { --var3; } - if (var1 == 4) { // L: 27 + if (var1 == 4) { ++var3; } - if (var1 == 5) { // L: 28 - --var3; // L: 29 - --var4; // L: 30 - } - - if (var1 == 6) { // L: 32 + if (var1 == 5) { + --var3; --var4; } - if (var1 == 7) { // L: 33 - ++var3; // L: 34 - --var4; // L: 35 + if (var1 == 6) { + --var4; } - if (super.sequence != -1 && WorldMapScaleHandler.SequenceDefinition_get(super.sequence).field1893 == 1) { // L: 37 + if (var1 == 7) { + ++var3; + --var4; + } + + if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) { super.sequence = -1; } - if (super.pathLength < 9) { // L: 38 + if (super.pathLength < 9) { ++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 - super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42 + 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]; } - super.pathX[0] = var3; // L: 44 - super.pathY[0] = var4; // L: 45 - super.pathTraversed[0] = var2; // L: 46 - } // L: 47 + super.pathX[0] = var3; + super.pathY[0] = var4; + super.pathTraversed[0] = var2; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lgd;", - garbageValue = "326918784" + descriptor = "(I)Lgl;", + garbageValue = "1291603774" ) @Export("getModel") protected final Model getModel() { - if (this.definition == null) { // L: 77 + if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapScaleHandler.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : WorldMapScaleHandler.SequenceDefinition_get(super.movementSequence); // L: 79 - Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 - if (var3 == null) { // L: 81 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? World.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? World.SequenceDefinition_get(super.movementSequence) : null; + Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (var3 == null) { return null; } else { - var3.calculateBoundsCylinder(); // L: 82 - super.defaultHeight = var3.height; // L: 83 - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 - Model var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 - if (var4 != null) { // L: 86 - var4.offsetBy(0, -super.field1263, 0); // L: 87 - Model[] var5 = new Model[]{var3, var4}; // L: 88 - var3 = new Model(var5, 2); // L: 89 + var3.calculateBoundsCylinder(); + super.defaultHeight = var3.height; + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + Model var4 = PcmPlayer.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + if (var4 != null) { + var4.offsetBy(0, -super.field1061, 0); + Model[] var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); } } - if (this.definition.size == 1) { // L: 92 + if (this.definition.size == 1) { var3.isSingleTile = true; } - return var3; // L: 93 + return var3; } } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "3" + descriptor = "(IIZI)V", + garbageValue = "1892581067" ) - final void method2347(int var1, int var2, boolean var3) { - if (super.sequence != -1 && WorldMapScaleHandler.SequenceDefinition_get(super.sequence).field1893 == 1) { // L: 50 + final void method1957(int var1, int var2, boolean var3) { + if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) { super.sequence = -1; } - if (!var3) { // L: 51 - int var4 = var1 - super.pathX[0]; // L: 52 - int var5 = var2 - super.pathY[0]; // L: 53 - if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { // L: 54 - if (super.pathLength < 9) { // L: 55 + if (!var3) { + int var4 = var1 - super.pathX[0]; + int var5 = var2 - super.pathY[0]; + if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { + if (super.pathLength < 9) { ++super.pathLength; } - for (int var6 = super.pathLength; var6 > 0; --var6) { // L: 56 - super.pathX[var6] = super.pathX[var6 - 1]; // L: 57 - super.pathY[var6] = super.pathY[var6 - 1]; // L: 58 - super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; // L: 59 + for (int var6 = super.pathLength; var6 > 0; --var6) { + super.pathX[var6] = super.pathX[var6 - 1]; + super.pathY[var6] = super.pathY[var6 - 1]; + super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; } - super.pathX[0] = var1; // L: 61 - super.pathY[0] = var2; // L: 62 - super.pathTraversed[0] = 1; // L: 63 - return; // L: 64 + super.pathX[0] = var1; + super.pathY[0] = var2; + super.pathTraversed[0] = 1; + return; } } - super.pathLength = 0; // L: 67 - super.field1281 = 0; // L: 68 - super.field1242 = 0; // L: 69 - super.pathX[0] = var1; // L: 70 - super.pathY[0] = var2; // L: 71 - super.x = super.pathX[0] * 128 + super.field1225 * 64; // L: 72 - super.y = super.field1225 * 64 + super.pathY[0] * 128; // L: 73 - } // L: 74 + super.pathLength = 0; + super.field1066 = 0; + super.field1078 = 0; + super.pathX[0] = var1; + super.pathY[0] = var2; + super.x = super.pathX[0] * 128 + super.field1023 * 64; + super.y = super.field1023 * 64 + super.pathY[0] * 128; + } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "3" + garbageValue = "74" ) @Export("isVisible") final boolean isVisible() { - return this.definition != null; // L: 97 + return this.definition != null; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1386902670" + ) + public static int method1960() { + return ViewportMouse.ViewportMouse_entityCount; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lnx;", + garbageValue = "-76" + ) + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { + } + } + + String var4 = ""; + if (AttackOption.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (AttackOption.cacheGamebuild == 34) { + var4 = "_wip"; + } + + File var5 = new File(class234.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + AccessFile var6; + if (!var2 && var5.exists()) { + try { + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); + } } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index 721306a7b1..ab48301db5 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -5,433 +5,427 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ev") +@ObfuscatedName("ej") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("NpcDefinition_cached") - static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("NpcDefinition_cachedModels") - static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "[Loa;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("j") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 524920995 + intValue = 940328853 ) @Export("id") public int id; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -382124903 + intValue = 1796529403 ) @Export("size") public int size; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("models") int[] models; - @ObfuscatedName("h") - int[] field1644; - @ObfuscatedName("d") + @ObfuscatedName("o") + int[] field1618; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1765271701 + intValue = -1528364407 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1898618439 + intValue = 294614701 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2020012415 + intValue = 551564371 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -941027459 + intValue = -107235243 ) @Export("walkSequence") public int walkSequence; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1631754867 + intValue = 315681919 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1695340251 + intValue = -733412579 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1096930091 + intValue = 155841755 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("actions") public String[] actions; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 880136129 + intValue = -528938809 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -759959591 + intValue = 236333335 ) @Export("widthScale") int widthScale; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1143359783 + intValue = 866117837 ) @Export("heightScale") int heightScale; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 210983141 + intValue = -1250251837 ) @Export("ambient") int ambient; - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -2083023515 + intValue = 1468547667 ) @Export("contrast") int contrast; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 2052657801 + intValue = 1505915281 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1072203595 + intValue = -1393364313 ) @Export("rotation") public int rotation; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @Export("transforms") public int[] transforms; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1263939441 + intValue = 1025376657 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 2131435543 + intValue = -678188047 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("ab") + @ObfuscatedName("au") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("aq") + @ObfuscatedName("av") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ae") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("params") IterableNodeHashTable params; static { - NpcDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18 - NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 19 + NpcDefinition_cached = new EvictingDualNodeHashTable(64); + NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); } NPCComposition() { - this.name = "null"; // L: 21 - this.size = 1; // L: 22 - this.idleSequence = -1; // L: 25 - this.turnLeftSequence = -1; // L: 26 - this.turnRightSequence = -1; // L: 27 - this.walkSequence = -1; // L: 28 - this.walkBackSequence = -1; // L: 29 - this.walkLeftSequence = -1; // L: 30 - this.walkRightSequence = -1; // L: 31 - this.actions = new String[5]; // L: 36 - this.drawMapDot = true; // L: 37 - this.combatLevel = -1; // L: 38 - this.widthScale = 128; // L: 39 - this.heightScale = 128; // L: 40 - this.isVisible = false; // L: 41 - this.ambient = 0; // L: 42 - this.contrast = 0; // L: 43 - this.headIconPrayer = -1; // L: 44 - this.rotation = 32; // L: 45 - this.transformVarbit = -1; // L: 47 - this.transformVarp = -1; // L: 48 - this.isInteractable = true; // L: 49 - this.isClickable = true; // L: 50 - this.isFollower = false; // L: 51 - } // L: 54 + this.name = "null"; + this.size = 1; + this.idleSequence = -1; + this.turnLeftSequence = -1; + this.turnRightSequence = -1; + this.walkSequence = -1; + this.walkBackSequence = -1; + this.walkLeftSequence = -1; + this.walkRightSequence = -1; + this.actions = new String[5]; + this.drawMapDot = true; + this.combatLevel = -1; + this.widthScale = 128; + this.heightScale = 128; + this.isVisible = false; + this.ambient = 0; + this.contrast = 0; + this.headIconPrayer = -1; + this.rotation = 32; + this.transformVarbit = -1; + this.transformVarp = -1; + this.isInteractable = true; + this.isClickable = true; + this.isFollower = false; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1067902872" + garbageValue = "344168702" ) @Export("postDecode") void postDecode() { - } // L: 68 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;B)V", - garbageValue = "-22" + descriptor = "(Lnv;B)V", + garbageValue = "-32" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 72 - if (var2 == 0) { // L: 73 - return; // L: 76 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 74 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "124" + descriptor = "(Lnv;IB)V", + garbageValue = "67" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 79 - var3 = var1.readUnsignedByte(); // L: 80 - this.models = new int[var3]; // L: 81 + if (var2 == 1) { + var3 = var1.readUnsignedByte(); + this.models = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 82 + for (var4 = 0; var4 < var3; ++var4) { this.models[var4] = var1.readUnsignedShort(); } - } else if (var2 == 2) { // L: 84 + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 12) { // L: 85 + } else if (var2 == 12) { this.size = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 86 + } else if (var2 == 13) { this.idleSequence = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 87 + } else if (var2 == 14) { this.walkSequence = var1.readUnsignedShort(); - } else if (var2 == 15) { // L: 88 + } else if (var2 == 15) { this.turnLeftSequence = var1.readUnsignedShort(); - } else if (var2 == 16) { // L: 89 + } else if (var2 == 16) { this.turnRightSequence = var1.readUnsignedShort(); - } else if (var2 == 17) { // L: 90 - this.walkSequence = var1.readUnsignedShort(); // L: 91 - this.walkBackSequence = var1.readUnsignedShort(); // L: 92 - this.walkLeftSequence = var1.readUnsignedShort(); // L: 93 - this.walkRightSequence = var1.readUnsignedShort(); // L: 94 - } else if (var2 == 18) { // L: 96 - var1.readUnsignedShort(); // L: 97 - } else if (var2 >= 30 && var2 < 35) { // L: 99 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 100 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 101 + } else if (var2 == 17) { + this.walkSequence = var1.readUnsignedShort(); + this.walkBackSequence = var1.readUnsignedShort(); + this.walkLeftSequence = var1.readUnsignedShort(); + this.walkRightSequence = var1.readUnsignedShort(); + } else if (var2 == 18) { + var1.readUnsignedShort(); + } else if (var2 >= 30 && var2 < 35) { + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { this.actions[var2 - 30] = null; } - } else if (var2 == 40) { // L: 103 - var3 = var1.readUnsignedByte(); // L: 104 - this.recolorFrom = new short[var3]; // L: 105 - this.recolorTo = new short[var3]; // L: 106 + } else if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 107 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 108 + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 41) { // L: 112 - var3 = var1.readUnsignedByte(); // L: 113 - this.retextureFrom = new short[var3]; // L: 114 - this.retextureTo = new short[var3]; // L: 115 + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 116 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 117 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 118 + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 60) { // L: 121 - var3 = var1.readUnsignedByte(); // L: 122 - this.field1644 = new int[var3]; // L: 123 + } else if (var2 == 60) { + var3 = var1.readUnsignedByte(); + this.field1618 = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 124 - this.field1644[var4] = var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { + this.field1618[var4] = var1.readUnsignedShort(); } - } else if (var2 == 93) { // L: 126 + } else if (var2 == 93) { this.drawMapDot = false; - } else if (var2 == 95) { // L: 127 + } else if (var2 == 95) { this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 128 + } else if (var2 == 97) { this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 129 + } else if (var2 == 98) { this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { // L: 130 + } else if (var2 == 99) { this.isVisible = true; - } else if (var2 == 100) { // L: 131 + } else if (var2 == 100) { this.ambient = var1.readByte(); - } else if (var2 == 101) { // L: 132 + } else if (var2 == 101) { this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { // L: 133 + } else if (var2 == 102) { this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { // L: 134 + } else if (var2 == 103) { this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { // L: 135 - if (var2 == 107) { // L: 153 + } else if (var2 != 106 && var2 != 118) { + if (var2 == 107) { this.isInteractable = false; - } else if (var2 == 109) { // L: 154 + } else if (var2 == 109) { this.isClickable = false; - } else if (var2 == 111) { // L: 155 + } else if (var2 == 111) { this.isFollower = true; - } else if (var2 == 249) { // L: 156 - this.params = class19.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { + this.params = ObjectSound.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 136 + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { - this.transformVarbit = -1; // L: 137 + this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 138 - if (this.transformVarp == 65535) { // L: 139 + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } - var3 = -1; // L: 140 - if (var2 == 118) { // L: 141 - var3 = var1.readUnsignedShort(); // L: 142 - if (var3 == 65535) { // L: 143 + var3 = -1; + if (var2 == 118) { + var3 = var1.readUnsignedShort(); + if (var3 == 65535) { var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 145 - this.transforms = new int[var4 + 2]; // L: 146 + var4 = var1.readUnsignedByte(); + this.transforms = new int[var4 + 2]; - for (int var5 = 0; var5 <= var4; ++var5) { // L: 147 - this.transforms[var5] = var1.readUnsignedShort(); // L: 148 - if (this.transforms[var5] == 65535) { // L: 149 + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.readUnsignedShort(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 151 + this.transforms[var4 + 1] = var3; } - } // L: 158 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lfm;ILfm;IB)Lgd;", - garbageValue = "1" + descriptor = "(Lfz;ILfz;II)Lgl;", + garbageValue = "-301742939" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.transforms != null) { // L: 161 - NPCComposition var12 = this.transform(); // L: 162 - return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 163 164 + if (this.transforms != null) { + NPCComposition var12 = this.transform(); + return var12 == null ? null : var12.getModel(var1, var2, var3, var4); } else { - Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 166 - if (var5 == null) { // L: 167 - boolean var6 = false; // L: 168 + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); + if (var5 == null) { + boolean var6 = false; - for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 169 + for (int var7 = 0; var7 < this.models.length; ++var7) { if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { var6 = true; } } - if (var6) { // L: 170 + if (var6) { return null; } - ModelData[] var8 = new ModelData[this.models.length]; // L: 172 + ModelData[] var8 = new ModelData[this.models.length]; int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { // L: 173 + for (var9 = 0; var9 < this.models.length; ++var9) { var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); } ModelData var10; - if (var8.length == 1) { // L: 174 + if (var8.length == 1) { var10 = var8[0]; } else { - var10 = new ModelData(var8, var8.length); // L: 175 + var10 = new ModelData(var8, var8.length); } - if (this.recolorFrom != null) { // L: 176 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 177 - var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 178 + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); } } - if (this.retextureFrom != null) { // L: 181 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 182 - var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 183 + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); } } - var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 186 - NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 187 + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); + NpcDefinition_cachedModels.put(var5, (long)this.id); } Model var11; @@ -453,370 +447,206 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lga;", - garbageValue = "936474541" + descriptor = "(B)Lgz;", + garbageValue = "7" ) @Export("getModelData") public final ModelData getModelData() { - if (this.transforms != null) { // L: 199 - NPCComposition var7 = this.transform(); // L: 200 - return var7 == null ? null : var7.getModelData(); // L: 201 202 - } else if (this.field1644 == null) { // L: 204 + if (this.transforms != null) { + NPCComposition var7 = this.transform(); + return var7 == null ? null : var7.getModelData(); + } else if (this.field1618 == null) { return null; } else { - boolean var1 = false; // L: 205 + boolean var1 = false; - for (int var2 = 0; var2 < this.field1644.length; ++var2) { // L: 206 - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1644[var2], 0)) { + for (int var2 = 0; var2 < this.field1618.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1618[var2], 0)) { var1 = true; } } - if (var1) { // L: 207 + if (var1) { return null; } else { - ModelData[] var5 = new ModelData[this.field1644.length]; // L: 208 + ModelData[] var5 = new ModelData[this.field1618.length]; - for (int var3 = 0; var3 < this.field1644.length; ++var3) { // L: 209 - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1644[var3], 0); + for (int var3 = 0; var3 < this.field1618.length; ++var3) { + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1618[var3], 0); } ModelData var6; if (var5.length == 1) { - var6 = var5[0]; // L: 211 + var6 = var5[0]; } else { - var6 = new ModelData(var5, var5.length); // L: 212 + var6 = new ModelData(var5, var5.length); } int var4; - if (this.recolorFrom != null) { // L: 213 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 214 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 215 + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - if (this.retextureFrom != null) { // L: 218 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 219 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 220 + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - return var6; // L: 223 + return var6; } } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Lev;", - garbageValue = "1438500977" + descriptor = "(I)Lej;", + garbageValue = "719222119" ) @Export("transform") public final NPCComposition transform() { - int var1 = -1; // L: 227 - if (this.transformVarbit != -1) { // L: 228 - var1 = ScriptFrame.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 229 + int var1 = -1; + if (this.transformVarbit != -1) { + var1 = WorldMapSection0.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 231 - var2 = this.transforms[var1]; // L: 232 + if (var1 >= 0 && var1 < this.transforms.length - 1) { + var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class248.getNpcDefinition(var2) : null; // L: 233 234 + return var2 != -1 ? UserComparator6.getNpcDefinition(var2) : null; } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-263969679" + garbageValue = "-1286437510" ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { // L: 238 + if (this.transforms == null) { return true; } else { - int var1 = -1; // L: 239 - if (this.transformVarbit != -1) { // L: 240 - var1 = ScriptFrame.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 241 + int var1 = -1; + if (this.transformVarbit != -1) { + var1 = WorldMapSection0.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } - if (var1 >= 0 && var1 < this.transforms.length) { // L: 242 - return this.transforms[var1] != -1; // L: 243 + if (var1 >= 0 && var1 < this.transforms.length) { + return this.transforms[var1] != -1; } else { return this.transforms[this.transforms.length - 1] != -1; } } } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "121544801" + descriptor = "(IIB)I", + garbageValue = "-23" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 248 + IterableNodeHashTable var4 = this.params; int var3; - if (var4 == null) { // L: 250 - var3 = var2; // L: 251 + if (var4 == null) { + var3 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 254 - if (var5 == null) { // L: 255 - var3 = var2; // L: 256 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; } else { - var3 = var5.integer; // L: 259 + var3 = var5.integer; } } - return var3; // L: 261 + return var3; } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-2089556399" + garbageValue = "-1135104647" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return WorldMapElement.method2742(this.params, var1, var2); // L: 265 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljp;Ljp;I)V", - garbageValue = "1926659100" - ) - public static void method2868(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - AttackOption.Widget_archive = var0; // L: 190 - class375.Widget_modelsArchive = var1; // L: 191 - class44.Widget_spritesArchive = var2; // L: 192 - ChatChannel.Widget_fontsArchive = var3; // L: 193 - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents = new Widget[AttackOption.Widget_archive.getGroupCount()][]; // L: 194 - Widget.Widget_loadedInterfaces = new boolean[AttackOption.Widget_archive.getGroupCount()]; // L: 195 - } // L: 196 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "4" - ) - public static int method2841(int var0, int var1) { - int var2 = var0 >>> 31; // L: 109 - return (var0 + var2) / var1 - var2; // L: 110 - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-355441861" - ) - static int method2857(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { // L: 2784 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2785 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2786 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2787 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 + var4; // L: 2788 - return 1; // L: 2789 - } else if (var0 == ScriptOpcodes.SUB) { // L: 2791 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2792 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2793 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2794 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 - var4; // L: 2795 - return 1; // L: 2796 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2798 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2799 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2800 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2801 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 * var4; // L: 2802 - return 1; // L: 2803 - } else if (var0 == ScriptOpcodes.DIV) { // L: 2805 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2806 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2807 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2808 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 / var4; // L: 2809 - return 1; // L: 2810 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2812 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2813 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2814 - return 1; // L: 2815 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2817 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2818 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2819 - return 1; // L: 2820 + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; } else { - int var5; - int var6; - int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2822 - ChatChannel.Interpreter_intStackSize -= 5; // L: 2823 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2824 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2825 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2826 - var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 2827 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 4]; // L: 2828 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); // L: 2829 - return 1; // L: 2830 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2832 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2833 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2834 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2835 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 2836 - return 1; // L: 2837 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2839 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2840 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2841 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2842 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2843 - return 1; // L: 2844 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2846 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2847 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2848 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2849 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2850 - return 1; // L: 2851 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2853 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2854 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2855 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2856 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2857 - return 1; // L: 2858 - } else if (var0 == ScriptOpcodes.MOD) { // L: 2860 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2861 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2862 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2863 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 % var4; // L: 2864 - return 1; // L: 2865 - } else if (var0 == ScriptOpcodes.POW) { // L: 2867 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2868 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2869 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2870 - if (var3 == 0) { // L: 2871 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2872 - } - - return 1; // L: 2873 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2875 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2876 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2877 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2878 - if (var3 == 0) { // L: 2879 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2880 - return 1; // L: 2881 - } else { - switch(var4) { // L: 2883 - case 0: - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2896 - break; // L: 2897 - case 1: - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 2906 - break; // L: 2907 - case 2: - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2886 - break; - case 3: - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2891 - break; // L: 2892 - case 4: - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2901 - break; // L: 2902 - default: - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2911 - } - - return 1; // L: 2915 - } - } else if (var0 == ScriptOpcodes.AND) { // L: 2917 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2918 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2919 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2920 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 & var4; // L: 2921 - return 1; // L: 2922 - } else if (var0 == ScriptOpcodes.OR) { // L: 2924 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2925 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2926 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2927 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 | var4; // L: 2928 - return 1; // L: 2929 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 2931 - ChatChannel.Interpreter_intStackSize -= 3; // L: 2932 - long var9 = (long)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2933 - long var11 = (long)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2934 - long var13 = (long)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2935 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 2936 - return 1; // L: 2937 - } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 2939 - var3 = class269.method4992(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 2940 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 2941 - return 1; // L: 2942 - } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 2944 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2945 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2946 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2947 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2948 - return 1; // L: 2949 - } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 2951 - ChatChannel.Interpreter_intStackSize -= 3; // L: 2952 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2953 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2954 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2955 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapLabel.method3714(var3, var4, var5); // L: 2956 - return 1; // L: 2957 - } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 2959 - ChatChannel.Interpreter_intStackSize -= 3; // L: 2960 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2961 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2962 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2963 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.method3785(var3, var4, var5); // L: 2964 - return 1; // L: 2965 - } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 2967 - ChatChannel.Interpreter_intStackSize -= 3; // L: 2968 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2969 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2970 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2971 - var6 = 31 - var5; // L: 2972 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; // L: 2973 - return 1; // L: 2974 - } else if (var0 == 4030) { // L: 2976 - ChatChannel.Interpreter_intStackSize -= 4; // L: 2977 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2978 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2979 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2980 - var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 2981 - var3 = AbstractWorldMapIcon.method3785(var3, var5, var6); // L: 2982 - var7 = UserComparator2.method6890(var6 - var5 + 1); // L: 2983 - if (var4 > var7) { // L: 2984 - var4 = var7; - } - - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 2985 - return 1; // L: 2986 + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; } else { - return 2; // L: 2988 + var3 = (String)var5.obj; } } + + return var3; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1476033843" + ) + static int method2841(int var0, Script var1, boolean var2) { + Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } } - @ObfuscatedName("kq") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-5" + descriptor = "(II)I", + garbageValue = "-635332422" ) - static final void method2882(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11138 - class4.clientPreferences.areaSoundEffectsVolume = var0; // L: 11139 - Actor.savePreferences(); // L: 11140 - } // L: 11141 + static int method2847(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field756 - 7.0D) * 256.0D); + } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-201795226" + ) + static final void method2830(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field617[var4] = true; + } + } + + } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 6972a485a2..b19e385591 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,55 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("dd") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -7053847469093771861L + longValue = 9166610774773850729L ) @Export("lastTimeNano") long lastTimeNano; public NanoClock() { - this.lastTimeNano = System.nanoTime(); // L: 10 - } // L: 11 + this.lastTimeNano = System.nanoTime(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-111" + descriptor = "(I)V", + garbageValue = "-296506208" ) @Export("mark") public void mark() { - this.lastTimeNano = System.nanoTime(); // L: 14 - } // L: 15 + this.lastTimeNano = System.nanoTime(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-104" + descriptor = "(III)I", + garbageValue = "2079435375" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; // L: 18 - long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 - if (var5 < var3) { // L: 20 + long var3 = (long)var2 * 1000000L; + long var5 = this.lastTimeNano - System.nanoTime(); + if (var5 < var3) { var5 = var3; } - class18.method272(var5 / 1000000L); // L: 21 - long var7 = System.nanoTime(); // L: 22 + SceneTilePaint.method4322(var5 / 1000000L); + long var7 = System.nanoTime(); int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 - ++var9; // L: 25 + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { + ++var9; } - if (this.lastTimeNano < var7) { // L: 28 + if (this.lastTimeNano < var7) { this.lastTimeNano = var7; } - return var9; // L: 29 + return var9; } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index d87beabad1..0d08bcebf4 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -4,206 +4,179 @@ 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("jb") @Implements("NetCache") public class NetCache { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Llk;" - ) - @Export("NetCache_socket") - public static AbstractSocket NetCache_socket; - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -371422605 + intValue = -1518348987 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("NetCache_socket") + public static AbstractSocket NetCache_socket; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -6267907732532608685L + longValue = -6196624692712558443L ) - public static long field3604; - @ObfuscatedName("y") + public static long field3596; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 786077645 + intValue = 339430119 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1874437275 + intValue = -181649067 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lks;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("NetCache_pendingWrites") static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 470761029 + intValue = -1394799651 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -535814739 + intValue = -1172502871 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Ljm;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lnv;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1970079707 + intValue = 2062741245 ) - public static int field3615; - @ObfuscatedName("q") + public static int field3608; + @ObfuscatedName("c") @Export("NetCache_crc") public static CRC32 NetCache_crc; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Ljf;" + descriptor = "Lnv;" + ) + @Export("NetCache_reference") + public static Buffer NetCache_reference; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "[Ljs;" ) @Export("NetCache_archives") public static Archive[] NetCache_archives; - @ObfuscatedName("c") - public static byte field3618; - @ObfuscatedName("n") + @ObfuscatedName("b") + public static byte field3612; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1816313081 + intValue = -1207728323 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1810903915 + intValue = 461247647 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; static { - NetCache_loadTime = 0; // L: 13 - NetCache_pendingPriorityWrites = new NodeHashTable(4096); // L: 15 - NetCache_pendingPriorityWritesCount = 0; // L: 16 - NetCache_pendingPriorityResponses = new NodeHashTable(32); // L: 17 - NetCache_pendingPriorityResponsesCount = 0; // L: 18 - NetCache_pendingWritesQueue = new DualNodeDeque(); // L: 19 - NetCache_pendingWrites = new NodeHashTable(4096); // L: 20 - NetCache_pendingWritesCount = 0; // L: 21 - NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 - NetCache_pendingResponsesCount = 0; // L: 23 - NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3615 = 0; // L: 28 - NetCache_crc = new CRC32(); // L: 30 - NetCache_archives = new Archive[256]; // L: 32 - field3618 = 0; // L: 33 - NetCache_crcMismatches = 0; // L: 34 - NetCache_ioExceptions = 0; // L: 35 + NetCache_loadTime = 0; + NetCache_pendingPriorityWrites = new NodeHashTable(4096); + NetCache_pendingPriorityWritesCount = 0; + NetCache_pendingPriorityResponses = new NodeHashTable(32); + NetCache_pendingPriorityResponsesCount = 0; + NetCache_pendingWritesQueue = new DualNodeDeque(); + NetCache_pendingWrites = new NodeHashTable(4096); + NetCache_pendingWritesCount = 0; + NetCache_pendingResponses = new NodeHashTable(4096); + NetCache_pendingResponsesCount = 0; + NetCache_responseHeaderBuffer = new Buffer(8); + field3608 = 0; + NetCache_crc = new CRC32(); + NetCache_archives = new Archive[256]; + field3612 = 0; + NetCache_crcMismatches = 0; + NetCache_ioExceptions = 0; } - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2090121313" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-2098377035" ) - static void method5177() { - 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 - } + public static int method5088(CharSequence var0) { + return ScriptFrame.method852(var0, 10, true); + } - } // L: 152 - - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "71" + descriptor = "(IIIIIIII)Z", + garbageValue = "1812279831" ) - static int method5178(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1266 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1267 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.x; // L: 1268 - return 1; // L: 1269 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1271 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.y; // L: 1272 - return 1; // L: 1273 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1275 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.width; // L: 1276 - return 1; // L: 1277 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1279 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.height; // L: 1280 - return 1; // L: 1281 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1283 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1284 - return 1; // L: 1285 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1287 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.parentId; // L: 1288 - return 1; // L: 1289 + static final boolean method5089(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; + if (var7 < var0 && var7 < var1 && var7 < var2) { + return false; } else { - return 2; // L: 1291 + var7 = ViewportMouse.ViewportMouse_y - var6; + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; + if (var7 < var3 && var7 < var4 && var7 < var5) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; + return var7 <= var3 || var7 <= var4 || var7 <= var5; + } + } } } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 311a782e97..50e3256e44 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,23 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("jm") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("b") + @ObfuscatedName("gl") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "[Lof;" ) - static IndexedSprite field3577; - @ObfuscatedName("f") + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljs;" ) @Export("archive") public Archive archive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1109753371 + intValue = -1308436771 ) @Export("crc") public int crc; @@ -29,372 +30,5 @@ public class NetFileRequest extends DualNode { public byte padding; NetFileRequest() { - } // L: 10 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;Lkj;I)V", - garbageValue = "1099473080" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (AttackOption.canvasWidth - 765) / 2; // L: 879 - Login.loginBoxX = Login.xPadding + 202; // L: 880 - class25.loginBoxCenter = Login.loginBoxX + 180; // L: 881 - if (Login.worldSelectOpen) { // L: 882 - class27.method353(var0, var1); // L: 883 - } else { - class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 886 - class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 887 - Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 888 - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { // L: 889 - byte var3 = 20; // L: 890 - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 891 - var4 = 253 - var3; // L: 892 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 893 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 894 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 895 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 896 - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 897 - } - - String var5; - String var6; - short var16; - int var17; - short var18; - if (Client.gameState == 20) { // L: 899 - Coord.titleboxSprite.drawAt(Login.loginBoxX + 180 - Coord.titleboxSprite.subWidth / 2, 271 - Coord.titleboxSprite.subHeight / 2); // L: 900 - var16 = 201; // L: 901 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); // L: 902 - var17 = var16 + 15; // L: 903 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); // L: 904 - var17 += 15; // L: 905 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); // L: 906 - var17 += 15; // L: 907 - var17 += 7; // L: 908 - if (Login.loginIndex != 4) { // L: 909 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var17, 16777215, 0); // L: 910 - var18 = 200; // L: 911 - - for (var5 = class17.method255(); var0.stringWidth(var5) > var18; var5 = var5.substring(0, var5.length() - 1)) { // L: 912 913 914 - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var17, 16777215, 0); // L: 916 - var17 += 15; // L: 917 - - for (var6 = class22.method315(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { // L: 918 919 920 - } - - var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var17, 16777215, 0); // L: 922 - var17 += 15; // L: 923 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 926 - Coord.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 927 - short var11; - if (Login.loginIndex == 0) { // L: 928 - var16 = 251; // L: 929 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var16, 16776960, 0); // L: 930 - var17 = var16 + 30; // L: 931 - var4 = Login.loginBoxX + 180 - 80; // L: 932 - var11 = 291; // L: 933 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 934 - var0.drawLines("New User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 935 - var4 = Login.loginBoxX + 180 + 80; // L: 936 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 937 - var0.drawLines("Existing User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 938 - } else if (Login.loginIndex == 1) { // L: 940 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 941 - var16 = 236; // L: 942 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); // L: 943 - var17 = var16 + 15; // L: 944 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); // L: 945 - var17 += 15; // L: 946 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); // L: 947 - var17 += 15; // L: 948 - var4 = Login.loginBoxX + 180 - 80; // L: 949 - var11 = 321; // L: 950 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 951 - var0.drawCentered("Continue", var4, var11 + 5, 16777215, 0); // L: 952 - var4 = Login.loginBoxX + 180 + 80; // L: 953 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 954 - var0.drawCentered("Cancel", var4, var11 + 5, 16777215, 0); // L: 955 - } else { - int var7; - if (Login.loginIndex == 2) { // L: 957 - var16 = 201; // L: 958 - var0.drawCentered(Login.Login_response1, class25.loginBoxCenter, var16, 16776960, 0); // L: 959 - var17 = var16 + 15; // L: 960 - var0.drawCentered(Login.Login_response2, class25.loginBoxCenter, var17, 16776960, 0); // L: 961 - var17 += 15; // L: 962 - var0.drawCentered(Login.Login_response3, class25.loginBoxCenter, var17, 16776960, 0); // L: 963 - var17 += 15; // L: 964 - var17 += 7; // L: 965 - var0.draw("Login: ", class25.loginBoxCenter - 110, var17, 16777215, 0); // L: 966 - var18 = 200; // L: 967 - - for (var5 = class17.method255(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { // L: 968 969 970 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), class25.loginBoxCenter - 70, var17, 16777215, 0); // L: 972 - var17 += 15; // L: 973 - - for (var6 = class22.method315(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { // L: 974 975 976 - } - - var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), class25.loginBoxCenter - 108, var17, 16777215, 0); // L: 978 - var17 += 15; // L: 979 - var16 = 277; // L: 980 - var7 = class25.loginBoxCenter + -117; // L: 981 - IndexedSprite var14 = Archive.method5021(Client.Login_isUsernameRemembered, Login.field1006); // L: 982 - var14.drawAt(var7, var16); // L: 983 - var7 = var7 + var14.subWidth + 5; // L: 984 - var1.draw("Remember username", var7, var16 + 13, 16776960, 0); // L: 985 - var7 = class25.loginBoxCenter + 24; // L: 986 - var14 = Archive.method5021(class4.clientPreferences.hideUsername, Login.field1021); // L: 987 - var14.drawAt(var7, var16); // L: 988 - var7 = var7 + var14.subWidth + 5; // L: 989 - var1.draw("Hide username", var7, var16 + 13, 16776960, 0); // L: 990 - var17 = var16 + 15; // L: 991 - int var9 = class25.loginBoxCenter - 80; // L: 992 - short var10 = 321; // L: 993 - class289.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); // L: 994 - var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); // L: 995 - var9 = class25.loginBoxCenter + 80; // L: 996 - class289.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); // L: 997 - var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); // L: 998 - var16 = 357; // L: 999 - switch(Login.field1012) { // L: 1000 - case 2: - class215.field2557 = "Having trouble logging in?"; // L: 1005 - break; - default: - class215.field2557 = "Can't login? Click here."; // L: 1002 - } - - Client.field903 = new Bounds(class25.loginBoxCenter, var16, var1.stringWidth(class215.field2557), 11); // L: 1008 - DefaultsGroup.field3891 = new Bounds(class25.loginBoxCenter, var16, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1009 - var1.drawCentered(class215.field2557, class25.loginBoxCenter, var16, 16777215, 0); // L: 1010 - } else if (Login.loginIndex == 3) { // L: 1012 - var16 = 201; // L: 1013 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var16, 16776960, 0); // L: 1014 - var17 = var16 + 20; // L: 1015 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1016 - var17 += 15; // L: 1017 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1018 - var17 += 15; // L: 1019 - var4 = Login.loginBoxX + 180; // L: 1020 - var11 = 276; // L: 1021 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1022 - var2.drawCentered("Try again", var4, var11 + 5, 16777215, 0); // L: 1023 - var4 = Login.loginBoxX + 180; // L: 1024 - var11 = 326; // L: 1025 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1026 - var2.drawCentered("Forgotten password?", var4, var11 + 5, 16777215, 0); // L: 1027 - } else { - short var8; - if (Login.loginIndex == 4) { // L: 1029 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1030 - var16 = 236; // L: 1031 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); // L: 1032 - var17 = var16 + 15; // L: 1033 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1034 - var17 += 15; // L: 1035 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1036 - var17 += 15; // L: 1037 - var0.draw("PIN: " + class22.method315(ItemLayer.otp) + (Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var17, 16777215, 0); // L: 1038 - var17 -= 8; // L: 1039 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var17, 16776960, 0); // L: 1040 - var17 += 15; // L: 1041 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var17, 16776960, 0); // L: 1042 - var4 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1043 - int var21 = var17 - var0.ascent; // L: 1044 - IndexedSprite var19; - if (Login.field1022) { // L: 1046 - var19 = WorldMapCacheName.options_buttons_2Sprite; // L: 1047 - } else { - var19 = Login.options_buttons_0Sprite; // L: 1050 - } - - var19.drawAt(var4, var21); // L: 1052 - var17 += 15; // L: 1053 - var7 = Login.loginBoxX + 180 - 80; // L: 1054 - var8 = 321; // L: 1055 - class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1056 - var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); // L: 1057 - var7 = Login.loginBoxX + 180 + 80; // L: 1058 - class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1059 - var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); // L: 1060 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1061 - } else if (Login.loginIndex == 5) { // L: 1063 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1064 - var16 = 221; // L: 1065 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); // L: 1066 - var17 = var16 + 15; // L: 1067 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1068 - var17 += 15; // L: 1069 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1070 - var17 += 15; // L: 1071 - var17 += 14; // L: 1072 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var17, 16777215, 0); // L: 1073 - var18 = 174; // L: 1074 - - for (var5 = class17.method255(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { // L: 1075 1076 1077 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var17, 16777215, 0); // L: 1079 - var17 += 15; // L: 1080 - int var13 = Login.loginBoxX + 180 - 80; // L: 1081 - short var20 = 321; // L: 1082 - class289.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); // L: 1083 - var0.drawCentered("Recover", var13, var20 + 5, 16777215, 0); // L: 1084 - var13 = Login.loginBoxX + 180 + 80; // L: 1085 - class289.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); // L: 1086 - var0.drawCentered("Back", var13, var20 + 5, 16777215, 0); // L: 1087 - var20 = 356; // L: 1088 - var1.drawCentered("Still having trouble logging in?", class25.loginBoxCenter, var20, 268435455, 0); // L: 1089 - } else if (Login.loginIndex == 6) { // L: 1091 - var16 = 201; // L: 1092 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); // L: 1093 - var17 = var16 + 15; // L: 1094 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1095 - var17 += 15; // L: 1096 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1097 - var17 += 15; // L: 1098 - var4 = Login.loginBoxX + 180; // L: 1099 - var11 = 321; // L: 1100 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1101 - var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); // L: 1102 - } else if (Login.loginIndex == 7) { // L: 1104 - var16 = 216; // L: 1105 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var16, 16776960, 0); // L: 1106 - var17 = var16 + 15; // L: 1107 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1108 - var17 += 15; // L: 1109 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1110 - var17 += 15; // L: 1111 - var4 = Login.loginBoxX + 180 - 80; // L: 1112 - var11 = 321; // L: 1113 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1114 - var0.drawCentered("Set Date of Birth", var4, var11 + 5, 16777215, 0); // L: 1115 - var4 = Login.loginBoxX + 180 + 80; // L: 1116 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1117 - var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); // L: 1118 - } else if (Login.loginIndex == 8) { // L: 1120 - var16 = 216; // L: 1121 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var16, 16776960, 0); // L: 1122 - var17 = var16 + 15; // L: 1123 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1124 - var17 += 15; // L: 1125 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1126 - var17 += 15; // L: 1127 - var4 = Login.loginBoxX + 180 - 80; // L: 1128 - var11 = 321; // L: 1129 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1130 - var0.drawCentered("Privacy Policy", var4, var11 + 5, 16777215, 0); // L: 1131 - var4 = Login.loginBoxX + 180 + 80; // L: 1132 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1133 - var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); // L: 1134 - } else if (Login.loginIndex == 12) { // L: 1136 - var16 = 201; // L: 1137 - String var12 = ""; // L: 1138 - var5 = ""; // L: 1139 - var6 = ""; // L: 1140 - switch(Login.field1011) { // L: 1141 - case 0: - var12 = "Your account has been disabled."; // L: 1144 - var5 = Strings.field3284; // L: 1145 - var6 = ""; // L: 1146 - break; - case 1: - var12 = "Account locked as we suspect it has been stolen."; // L: 1151 - var5 = Strings.field3529; // L: 1152 - var6 = ""; // L: 1153 - break; // L: 1154 - default: - class69.Login_promptCredentials(false); // L: 1158 - } - - var0.drawCentered(var12, Login.loginBoxX + 180, var16, 16776960, 0); // L: 1162 - var17 = var16 + 15; // L: 1163 - var2.drawCentered(var5, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1164 - var17 += 15; // L: 1165 - var2.drawCentered(var6, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1166 - var17 += 15; // L: 1167 - var7 = Login.loginBoxX + 180; // L: 1168 - var8 = 276; // L: 1169 - class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1170 - var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); // L: 1171 - var7 = Login.loginBoxX + 180; // L: 1172 - var8 = 326; // L: 1173 - class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1174 - var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); // L: 1175 - } else if (Login.loginIndex == 24) { // L: 1177 - var16 = 221; // L: 1178 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); // L: 1179 - var17 = var16 + 15; // L: 1180 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1181 - var17 += 15; // L: 1182 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1183 - var17 += 15; // L: 1184 - var4 = Login.loginBoxX + 180; // L: 1185 - var11 = 301; // L: 1186 - class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1187 - var0.drawCentered("Ok", var4, var11 + 5, 16777215, 0); // L: 1188 - } - } - } - } - - if (Client.gameState >= 10) { // L: 1191 - int[] var15 = new int[4]; // L: 1192 - Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 1193 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class0.canvasHeight); // L: 1194 - PendingSpawn.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1195 - PendingSpawn.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1196 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 1197 - } - - GrandExchangeEvents.title_muteSprite[class4.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1199 - if (Client.gameState > 5 && AbstractArchive.clientLanguage == Language.Language_EN) { // L: 1200 - if (class35.field244 != null) { // L: 1201 - var17 = Login.xPadding + 5; // L: 1202 - var18 = 463; // L: 1203 - byte var23 = 100; // L: 1204 - byte var22 = 35; // L: 1205 - class35.field244.drawAt(var17, var18); // L: 1206 - var0.drawCentered("World" + " " + Client.worldId, var23 / 2 + var17, var22 / 2 + var18 - 2, 16777215, 0); // L: 1207 - if (World.World_request != null) { // L: 1208 - var1.drawCentered("Loading...", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0); // L: 1209 - } - } else { - class35.field244 = TextureProvider.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "sl_button", ""); // L: 1212 - } - } - - } - } // L: 884 1215 - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lbc;I)V", - garbageValue = "2038899006" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; // L: 263 - if (var0.sound != null) { // L: 264 - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); // L: 265 - } - - } // L: 266 + } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 83eff64812..ffc1547949 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -3,206 +3,208 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; +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("ea") +@ObfuscatedName("ek") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("outputStream") OutputStream outputStream; @ObfuscatedName("v") @Export("socket") Socket socket; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("isClosed") boolean isClosed; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldz;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lex;" ) @Export("task") Task task; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1328963059 + intValue = 2140398327 ) @Export("outLength") int outLength; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1887422677 + intValue = -430888233 ) @Export("outOffset") int outOffset; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 957852253 + intValue = -1829022253 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1007889337 + intValue = 1103416471 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Lda;I)V" + descriptor = "(Ljava/net/Socket;Ldz;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { - this.isClosed = false; // L: 16 - this.outLength = 0; // L: 20 - this.outOffset = 0; // L: 21 - this.exceptionWriting = false; // L: 22 - this.taskHandler = var2; // L: 28 - this.socket = var1; // L: 29 - this.bufferLength = var3; // L: 30 - this.maxPacketLength = var3 - 100; // L: 31 - this.socket.setSoTimeout(30000); // L: 32 - this.socket.setTcpNoDelay(true); // L: 33 - this.socket.setReceiveBufferSize(65536); // L: 34 - this.socket.setSendBufferSize(65536); // L: 35 - this.inputStream = this.socket.getInputStream(); // L: 36 - this.outputStream = this.socket.getOutputStream(); // L: 37 - } // L: 38 + this.isClosed = false; + this.outLength = 0; + this.outOffset = 0; + this.exceptionWriting = false; + this.taskHandler = var2; + this.socket = var1; + this.bufferLength = var3; + this.maxPacketLength = var3 - 100; + this.socket.setSoTimeout(30000); + this.socket.setTcpNoDelay(true); + this.socket.setReceiveBufferSize(65536); + this.socket.setSendBufferSize(65536); + this.inputStream = this.socket.getInputStream(); + this.outputStream = this.socket.getOutputStream(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1854440694" + descriptor = "(S)V", + garbageValue = "-27454" ) @Export("close") public void close() { - if (!this.isClosed) { // L: 41 - synchronized(this) { // L: 42 - this.isClosed = true; // L: 43 - this.notifyAll(); // L: 44 - } // L: 45 + if (!this.isClosed) { + synchronized(this) { + this.isClosed = true; + this.notifyAll(); + } - if (this.task != null) { // L: 46 - while (this.task.status == 0) { // L: 47 - class18.method272(1L); // L: 48 + if (this.task != null) { + while (this.task.status == 0) { + SceneTilePaint.method4322(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("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "574875272" + garbageValue = "1311148246" ) @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("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2063198043" + descriptor = "(B)I", + garbageValue = "88" ) @Export("available") public int available() throws IOException { - return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2019948581" - ) - @Export("isAvailable") - public boolean isAvailable(int var1) throws IOException { - if (this.isClosed) { // L: 75 - return false; - } else { - return this.inputStream.available() >= var1; // L: 76 - } + return this.isClosed ? 0 : this.inputStream.available(); } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-60" + ) + @Export("isAvailable") + public boolean isAvailable(int var1) throws IOException { + if (this.isClosed) { + return false; + } else { + return this.inputStream.available() >= var1; + } + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-334344092" + garbageValue = "1814286008" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - if (this.isClosed) { // L: 80 + if (this.isClosed) { return 0; } else { int var4; int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { // L: 81 82 86 - var5 = this.inputStream.read(var1, var2, var3); // L: 83 - if (var5 <= 0) { // L: 84 + for (var4 = var3; var3 > 0; var3 -= var5) { + var5 = this.inputStream.read(var1, var2, var3); + if (var5 <= 0) { throw new EOFException(); } - var2 += var5; // L: 85 + var2 += var5; } - return var4; // L: 88 + return var4; } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-94" + descriptor = "([BIII)V", + garbageValue = "1961891652" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { - if (!this.isClosed) { // L: 92 - if (this.exceptionWriting) { // L: 93 - this.exceptionWriting = false; // L: 94 - throw new IOException(); // L: 95 + if (!this.isClosed) { + if (this.exceptionWriting) { + this.exceptionWriting = false; + throw new IOException(); } else { - if (this.outBuffer == null) { // L: 97 + if (this.outBuffer == null) { this.outBuffer = new byte[this.bufferLength]; } - synchronized(this) { // L: 98 - for (int var5 = 0; var5 < var3; ++var5) { // L: 99 - this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100 - this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101 - if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { // L: 102 - throw new IOException(); // L: 103 + synchronized(this) { + for (int var5 = 0; var5 < var3; ++var5) { + this.outBuffer[this.outOffset] = var1[var5 + var2]; + this.outOffset = (this.outOffset + 1) % this.bufferLength; + if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { + throw new IOException(); } } - if (this.task == null) { // L: 106 - this.task = this.taskHandler.newThreadTask(this, 3); // L: 107 + if (this.task == null) { + this.task = this.taskHandler.newThreadTask(this, 3); } this.notifyAll(); @@ -211,19 +213,15 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1206684972" + descriptor = "([BIIB)V", + garbageValue = "-30" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); // L: 160 - } // L: 161 - - protected void finalize() { - this.close(); // L: 61 - } // L: 62 + this.write0(var1, var2, var3); + } public void run() { try { @@ -232,7 +230,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { int var1; int var2; synchronized(this) { - if (this.outLength == this.outOffset) { + if (this.outOffset == this.outLength) { if (this.isClosed) { break label84; } @@ -251,12 +249,12 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - if (var1 <= 0) { // L: 130 + if (var1 <= 0) { continue; } try { - this.outputStream.write(this.outBuffer, var2, var1); // L: 132 + this.outputStream.write(this.outBuffer, var2, var1); } catch (IOException var9) { this.exceptionWriting = true; } @@ -274,92 +272,140 @@ public final class NetSocket extends AbstractSocket implements Runnable { } try { - if (this.inputStream != null) { // L: 147 + if (this.inputStream != null) { this.inputStream.close(); } - if (this.outputStream != null) { // L: 148 + if (this.outputStream != null) { this.outputStream.close(); } - if (this.socket != null) { // L: 149 + if (this.socket != null) { this.socket.close(); } - } catch (IOException var7) { // L: 151 + } catch (IOException var7) { } - this.outBuffer = null; // L: 152 + this.outBuffer = null; break; } - } catch (Exception var12) { // L: 154 - FriendsChat.RunException_sendStackTrace((String)null, var12); // L: 155 + } catch (Exception var12) { + BufferedSink.RunException_sendStackTrace((String)null, var12); } - } // L: 157 + } - @ObfuscatedName("v") + protected void finalize() { + this.close(); + } + + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([BI)Lcf;", - garbageValue = "1671409942" + descriptor = "(Ljs;IIIBZI)V", + garbageValue = "1569285753" ) - @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 + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); + if (var8 != null) { + if (var5) { + var8.removeDual(); + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingPriorityWritesCount; + } - for (var7 = 0; var7 < var6; ++var7) { // L: 122 - var8 = var2.readUnsignedShort(); // L: 123 - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? UrlRequester.method2504(var8) : 1); // L: 124 - var1.switches[var7] = var9; // L: 125 + } else { + if (!var5) { + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); + if (var8 != null) { + return; + } + } + + var8 = new NetFileRequest(); + var8.archive = var0; + var8.crc = var3; + var8.padding = var4; + if (var5) { + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + ++NetCache.NetCache_pendingPriorityWritesCount; + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); + NetCache.NetCache_pendingWrites.put(var8, var6); + ++NetCache.NetCache_pendingWritesCount; + } - 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.field1069 = 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 + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ldz;III)Ly;", + garbageValue = "-1978264697" + ) + public static final PcmPlayer method2634(TaskHandler var0, int var1, int var2) { + if (GrandExchangeOfferAgeComparator.field3633 == 0) { + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; + } - 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 + try { + PcmPlayer var3 = class181.pcmPlayerProvider.player(); + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; + var3.field180 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; + } + + var3.open(var3.capacity); + if (PcmPlayer.field181 > 0 && BoundaryObject.soundSystem == null) { + BoundaryObject.soundSystem = new SoundSystem(); + ArchiveDisk.soundSystemExecutor = Executors.newScheduledThreadPool(1); + ArchiveDisk.soundSystemExecutor.scheduleAtFixedRate(BoundaryObject.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (BoundaryObject.soundSystem != null) { + if (BoundaryObject.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); + } + + BoundaryObject.soundSystem.players[var1] = var3; + } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-873884067" + ) + static final void method2629() { + for (int var0 = 0; var0 < Client.npcCount; ++var0) { + int var1 = Client.npcIndices[var0]; + NPC var2 = Client.npcs[var1]; + if (var2 != null) { + class16.updateActorSequence(var2, var2.definition.size); } } - return var1; // L: 146 - } - - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "582256450" - ) - static int method2676(int var0) { - return var0 * 3 + 600; // L: 1723 } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 73938193a2..90c00ba794 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,39 +3,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mf") +@ObfuscatedName("ml") @Implements("Node") public class Node { - @ObfuscatedName("fu") + @ObfuscatedName("fx") @Export("key") public long key; - @ObfuscatedName("fb") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("previous") public Node previous; - @ObfuscatedName("fp") + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("next") public Node next; - @ObfuscatedName("eo") + @ObfuscatedName("fc") @Export("remove") public void remove() { - if (this.next != null) { // L: 9 - this.next.previous = this.previous; // L: 10 - this.previous.next = this.next; // L: 11 - this.previous = null; // L: 12 - this.next = null; // L: 13 + if (this.next != null) { + this.next.previous = this.previous; + this.previous.next = this.next; + this.previous = null; + this.next = null; } - } // L: 14 + } - @ObfuscatedName("ew") + @ObfuscatedName("fi") @Export("hasNext") public boolean hasNext() { - return this.next != null; // L: 17 + return this.next != null; } } diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 57c92bb501..6664d6e5fa 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,181 +3,181 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("ke") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("current") Node current; public NodeDeque() { - this.sentinel = new Node(); // L: 6 - this.sentinel.previous = this.sentinel; // L: 10 - this.sentinel.next = this.sentinel; // L: 11 - } // L: 12 + this.sentinel = new Node(); + this.sentinel.previous = this.sentinel; + this.sentinel.next = this.sentinel; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("clear") public void clear() { while (true) { - Node var1 = this.sentinel.previous; // L: 16 - if (var1 == this.sentinel) { // L: 17 - this.current = null; // L: 20 - return; // L: 21 + Node var1 = this.sentinel.previous; + if (var1 == this.sentinel) { + this.current = null; + return; } - var1.remove(); // L: 18 + var1.remove(); } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lml;)V" ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { // L: 24 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel.next; // L: 25 - var1.previous = this.sentinel; // L: 26 - var1.next.previous = var1; // L: 27 - var1.previous.next = var1; // L: 28 - } // L: 29 + var1.next = this.sentinel.next; + var1.previous = this.sentinel; + var1.next.previous = var1; + var1.previous.next = var1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lml;)V" ) @Export("addLast") public void addLast(Node var1) { - if (var1.next != null) { // L: 32 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel; // L: 33 - var1.previous = this.sentinel.previous; // L: 34 - var1.next.previous = var1; // L: 35 - var1.previous.next = var1; // L: 36 - } // L: 37 + var1.next = this.sentinel; + var1.previous = this.sentinel.previous; + var1.next.previous = var1; + var1.previous.next = var1; + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" ) @Export("removeLast") public Node removeLast() { - Node var1 = this.sentinel.previous; // L: 48 + Node var1 = this.sentinel.previous; if (var1 == this.sentinel) { - return null; // L: 49 + return null; } else { - var1.remove(); // L: 50 - return var1; // L: 51 + var1.remove(); + return var1; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "()Lml;" + ) + @Export("removeFirst") + public Node removeFirst() { + Node var1 = this.sentinel.next; + if (var1 == this.sentinel) { + return null; + } else { + var1.remove(); + return var1; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "()Lml;" + ) + @Export("last") + public Node last() { + Node var1 = this.sentinel.previous; + if (var1 == this.sentinel) { + this.current = null; + return null; + } else { + this.current = var1.previous; + return var1; + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "()Lml;" + ) + @Export("first") + public Node first() { + Node var1 = this.sentinel.next; + if (var1 == this.sentinel) { + this.current = null; + return null; + } else { + this.current = var1.next; + return var1; } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lmf;" - ) - @Export("removeFirst") - public Node removeFirst() { - Node var1 = this.sentinel.next; // L: 55 - if (var1 == this.sentinel) { - return null; // L: 56 - } else { - var1.remove(); // L: 57 - return var1; // L: 58 - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "()Lmf;" - ) - @Export("last") - public Node last() { - Node var1 = this.sentinel.previous; // L: 62 - if (var1 == this.sentinel) { // L: 63 - this.current = null; // L: 64 - return null; // L: 65 - } else { - this.current = var1.previous; // L: 67 - return var1; // L: 68 - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "()Lmf;" - ) - @Export("first") - public Node first() { - Node var1 = this.sentinel.next; // L: 72 - if (var1 == this.sentinel) { // L: 73 - this.current = null; // L: 74 - return null; // L: 75 - } else { - this.current = var1.next; // L: 77 - return var1; // L: 78 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" ) @Export("previous") public Node previous() { - Node var1 = this.current; // L: 82 - if (var1 == this.sentinel) { // L: 83 - this.current = null; // L: 84 - return null; // L: 85 + Node var1 = this.current; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.previous; // L: 87 - return var1; // L: 88 + this.current = var1.previous; + return var1; } } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" ) @Export("next") public Node next() { - Node var1 = this.current; // L: 92 - if (var1 == this.sentinel) { // L: 93 - this.current = null; // L: 94 - return null; // L: 95 + Node var1 = this.current; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.next; // L: 97 - return var1; // L: 98 + this.current = var1.next; + return var1; } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lmf;Lmf;)V" + descriptor = "(Lml;Lml;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { // L: 40 + if (var0.next != null) { var0.remove(); } - var0.next = var1.next; // L: 41 - var0.previous = var1; // L: 42 - var0.next.previous = var0; // L: 43 - var0.previous.next = var0; // L: 44 - } // L: 45 + var0.next = var1.next; + var0.previous = var1; + var0.next.previous = var0; + var0.previous.next = var0; + } } diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 04b9d6b021..96638609b6 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,117 +3,117 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mi") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("size") int size; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lmf;" + descriptor = "[Lml;" ) @Export("buckets") Node[] buckets; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lml;" ) @Export("current") Node current; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("index") int index; public NodeHashTable(int var1) { - this.index = 0; // L: 10 - this.size = var1; // L: 13 - this.buckets = new Node[var1]; // L: 14 + this.index = 0; + this.size = var1; + this.buckets = new Node[var1]; - for (int var2 = 0; var2 < var1; ++var2) { // L: 15 - Node var3 = this.buckets[var2] = new Node(); // L: 16 - var3.previous = var3; // L: 17 - var3.next = var3; // L: 18 + for (int var2 = 0; var2 < var1; ++var2) { + Node var3 = this.buckets[var2] = new Node(); + var3.previous = var3; + var3.next = var3; } - } // L: 20 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(J)Lmf;" + descriptor = "(J)Lml;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 23 + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; - for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 24 25 31 - if (this.currentGet.key == var1) { // L: 26 - Node var4 = this.currentGet; // L: 27 - this.currentGet = this.currentGet.previous; // L: 28 - return var4; // L: 29 + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { + if (this.currentGet.key == var1) { + Node var4 = this.currentGet; + this.currentGet = this.currentGet.previous; + return var4; } } - this.currentGet = null; // L: 33 - return null; // L: 34 + this.currentGet = null; + return null; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lmf;J)V" + descriptor = "(Lml;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { // L: 38 + if (var1.next != null) { var1.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 39 - var1.next = var4.next; // L: 40 - var1.previous = var4; // L: 41 - var1.next.previous = var1; // L: 42 - var1.previous.next = var1; // L: 43 - var1.key = var2; // L: 44 - } // L: 45 + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; + var1.next = var4.next; + var1.previous = var4; + var1.next.previous = var1; + var1.previous.next = var1; + var1.key = var2; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" ) @Export("first") public Node first() { - this.index = 0; // L: 48 - return this.next(); // L: 49 + this.index = 0; + return this.next(); } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lml;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 53 - var1 = this.current; // L: 54 - this.current = var1.previous; // L: 55 - return var1; // L: 56 + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { + var1 = this.current; + this.current = var1.previous; + return var1; } else { do { - if (this.index >= this.size) { // L: 58 - return null; // L: 65 + if (this.index >= this.size) { + return null; } - var1 = this.buckets[this.index++].previous; // L: 59 - } while(var1 == this.buckets[this.index - 1]); // L: 60 + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); - this.current = var1.previous; // L: 61 - return var1; // L: 62 + this.current = var1.previous; + return var1; } } } diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index b07dc690cf..d6cae51e6d 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -1,931 +1,1941 @@ +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.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("ez") +@ObfuscatedName("em") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("ObjectDefinition_isLowDetail") static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("ObjectDefinition_archive") static AbstractArchive ObjectDefinition_archive; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("ObjectDefinition_modelsArchive") static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Lga;" + descriptor = "[Lgz;" ) - static ModelData[] field1781; - @ObfuscatedName("h") + static ModelData[] field1740; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -299287981 + intValue = -1408525445 ) @Export("id") public int id; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("modelIds") int[] modelIds; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("models") int[] models; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("name") public String name; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("recolorFrom") short[] recolorFrom; @ObfuscatedName("k") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2087453689 + intValue = -417605631 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("u") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1592905647 + intValue = -1763413093 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 468402991 + intValue = -961392775 ) @Export("interactType") public int interactType; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1311902237 + intValue = 1499417859 ) @Export("int1") public int int1; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 771514781 + intValue = 1651761825 ) @Export("clipType") int clipType; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1229817209 + intValue = -1978264697 ) @Export("animationId") public int animationId; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1445120767 + intValue = -918805855 ) @Export("int2") public int int2; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 513103785 + intValue = 562720051 ) @Export("ambient") int ambient; - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -752104097 + intValue = -1077171653 ) @Export("contrast") int contrast; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("actions") public String[] actions; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1655247623 + intValue = -1571694919 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1328062479 + intValue = -703489529 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("clipped") public boolean clipped; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1365837635 + intValue = 1511755789 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1650256591 + intValue = 623120399 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("aq") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -2089911171 + intValue = -1557884319 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ae") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1183715057 + intValue = 18459679 ) @Export("offsetX") int offsetX; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1452192063 + intValue = 1121861285 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("an") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 2035086537 + intValue = 1080229989 ) @Export("offsetY") int offsetY; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("boolean2") public boolean boolean2; @ObfuscatedName("aj") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 2118223987 + intValue = 79121755 ) @Export("int3") public int int3; - @ObfuscatedName("as") + @ObfuscatedName("af") @Export("transforms") public int[] transforms; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1811920289 + intValue = 1865080169 ) @Export("transformVarbit") int transformVarbit; @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -385662773 + intValue = -684863883 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("am") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -298713219 + intValue = 1856717161 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -773175377 + intValue = 98405363 ) - public int field1801; - @ObfuscatedName("ai") + public int field1779; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -324754679 + intValue = -1845665365 ) @Export("int5") public int int5; - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1014383153 + intValue = -1527190911 ) @Export("int6") public int int6; - @ObfuscatedName("ax") + @ObfuscatedName("ad") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ar") - public boolean field1784; - @ObfuscatedName("af") + @ObfuscatedName("ac") + public boolean field1733; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("params") IterableNodeHashTable params; static { - 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 - field1781 = new ModelData[4]; // L: 24 + ObjectDefinition_isLowDetail = false; + ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); + ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); + ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); + ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); + field1740 = new ModelData[4]; } ObjectComposition() { - this.name = "null"; // L: 28 + this.name = "null"; this.sizeX = 1; this.sizeY = 1; - this.interactType = 2; // L: 35 - this.boolean1 = true; // L: 36 - this.int1 = -1; // L: 37 - this.clipType = -1; // L: 38 - this.nonFlatShading = false; // L: 39 - this.modelClipped = false; // L: 40 - this.animationId = -1; // L: 41 - this.int2 = 16; // L: 42 - this.ambient = 0; // L: 43 - this.contrast = 0; // L: 44 - this.actions = new String[5]; // L: 45 - this.mapIconId = -1; // L: 46 - this.mapSceneId = -1; // L: 47 - this.isRotated = false; // L: 48 - this.clipped = true; // L: 49 - this.modelSizeX = 128; // L: 50 - this.modelHeight = 128; // L: 51 - this.modelSizeY = 128; // L: 52 - this.offsetX = 0; // L: 53 - this.offsetHeight = 0; // L: 54 - this.offsetY = 0; // L: 55 - this.boolean2 = false; // L: 56 - this.isSolid = false; // L: 57 - this.int3 = -1; // L: 58 - this.transformVarbit = -1; // L: 60 - this.transformVarp = -1; // L: 61 - this.ambientSoundId = -1; // L: 62 - this.field1801 = 0; // L: 63 - this.int5 = 0; // L: 64 - this.int6 = 0; // L: 65 - this.field1784 = true; // L: 67 - } // L: 70 + this.interactType = 2; + this.boolean1 = true; + this.int1 = -1; + this.clipType = -1; + this.nonFlatShading = false; + this.modelClipped = false; + this.animationId = -1; + this.int2 = 16; + this.ambient = 0; + this.contrast = 0; + this.actions = new String[5]; + this.mapIconId = -1; + this.mapSceneId = -1; + this.isRotated = false; + this.clipped = true; + this.modelSizeX = 128; + this.modelHeight = 128; + this.modelSizeY = 128; + this.offsetX = 0; + this.offsetHeight = 0; + this.offsetY = 0; + this.boolean2 = false; + this.isSolid = false; + this.int3 = -1; + this.transformVarbit = -1; + this.transformVarp = -1; + this.ambientSoundId = -1; + this.field1779 = 0; + this.int5 = 0; + this.int6 = 0; + this.field1733 = true; + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-2" + garbageValue = "-19" ) @Export("postDecode") void postDecode() { - if (this.int1 == -1) { // L: 95 - this.int1 = 0; // L: 96 - if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97 + if (this.int1 == -1) { + this.int1 = 0; + if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { this.int1 = 1; } - for (int var1 = 0; var1 < 5; ++var1) { // L: 98 + for (int var1 = 0; var1 < 5; ++var1) { if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { // L: 100 + if (this.int3 == -1) { this.int3 = this.interactType != 0 ? 1 : 0; } - } // L: 101 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-104234518" - ) - @Export("decode") - void decode(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); // L: 105 - if (var2 == 0) { // L: 106 - return; // L: 109 - } - - this.decodeNext(var1, var2); // L: 107 - } } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "54" + descriptor = "(Lnv;I)V", + garbageValue = "-1024516162" + ) + @Export("decode") + void decode(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } + + this.decodeNext(var1, var2); + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lnv;II)V", + garbageValue = "-673374839" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 112 - var3 = var1.readUnsignedByte(); // L: 113 - if (var3 > 0) { // L: 114 - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 115 - var1.offset += var3 * 3; // L: 123 + if (var2 == 1) { + var3 = var1.readUnsignedByte(); + if (var3 > 0) { + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { + var1.offset += var3 * 3; } else { - this.models = new int[var3]; // L: 116 - this.modelIds = new int[var3]; // L: 117 + this.models = new int[var3]; + this.modelIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 118 - this.modelIds[var4] = var1.readUnsignedShort(); // L: 119 - this.models[var4] = var1.readUnsignedByte(); // L: 120 + for (var4 = 0; var4 < var3; ++var4) { + this.modelIds[var4] = var1.readUnsignedShort(); + this.models[var4] = var1.readUnsignedByte(); } } } - } else if (var2 == 2) { // L: 126 + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 5) { // L: 127 - var3 = var1.readUnsignedByte(); // L: 128 - if (var3 > 0) { // L: 129 - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 130 - var1.offset += var3 * 2; // L: 135 + } else if (var2 == 5) { + var3 = var1.readUnsignedByte(); + if (var3 > 0) { + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { + var1.offset += 2 * var3; } else { - this.models = null; // L: 131 - this.modelIds = new int[var3]; // L: 132 + this.models = null; + this.modelIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 133 + for (var4 = 0; var4 < var3; ++var4) { this.modelIds[var4] = var1.readUnsignedShort(); } } } - } else if (var2 == 14) { // L: 138 + } else if (var2 == 14) { this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 139 + } else if (var2 == 15) { this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { // L: 140 - this.interactType = 0; // L: 141 - this.boolean1 = false; // L: 142 - } else if (var2 == 18) { // L: 144 + } else if (var2 == 17) { + this.interactType = 0; this.boolean1 = false; - } else if (var2 == 19) { // L: 145 + } else if (var2 == 18) { + this.boolean1 = false; + } else if (var2 == 19) { this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { // L: 146 + } else if (var2 == 21) { this.clipType = 0; - } else if (var2 == 22) { // L: 147 + } else if (var2 == 22) { this.nonFlatShading = true; - } else if (var2 == 23) { // L: 148 + } else if (var2 == 23) { this.modelClipped = true; - } else if (var2 == 24) { // L: 149 - this.animationId = var1.readUnsignedShort(); // L: 150 - if (this.animationId == 65535) { // L: 151 + } else if (var2 == 24) { + this.animationId = var1.readUnsignedShort(); + if (this.animationId == 65535) { this.animationId = -1; } - } else if (var2 == 27) { // L: 153 + } else if (var2 == 27) { this.interactType = 1; - } else if (var2 == 28) { // L: 154 + } else if (var2 == 28) { this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { // L: 155 + } else if (var2 == 29) { this.ambient = var1.readByte(); - } else if (var2 == 39) { // L: 156 + } else if (var2 == 39) { this.contrast = var1.readByte() * 25; - } else if (var2 >= 30 && var2 < 35) { // L: 157 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 158 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159 + } else if (var2 >= 30 && var2 < 35) { + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { this.actions[var2 - 30] = null; } - } else if (var2 == 40) { // L: 161 - var3 = var1.readUnsignedByte(); // L: 162 - this.recolorFrom = new short[var3]; // L: 163 - this.recolorTo = new short[var3]; // L: 164 + } else if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 165 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167 + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 41) { // L: 170 - var3 = var1.readUnsignedByte(); // L: 171 - this.retextureFrom = new short[var3]; // L: 172 - this.retextureTo = new short[var3]; // L: 173 + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 174 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176 + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 61) { // L: 179 - var1.readUnsignedShort(); // L: 180 - } else if (var2 == 62) { // L: 182 + } else if (var2 == 61) { + var1.readUnsignedShort(); + } else if (var2 == 62) { this.isRotated = true; - } else if (var2 == 64) { // L: 183 + } else if (var2 == 64) { this.clipped = false; - } else if (var2 == 65) { // L: 184 + } else if (var2 == 65) { this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { // L: 185 + } else if (var2 == 66) { this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { // L: 186 + } else if (var2 == 67) { this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { // L: 187 + } else if (var2 == 68) { this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { // L: 188 - var1.readUnsignedByte(); // L: 189 - } else if (var2 == 70) { // L: 191 + } else if (var2 == 69) { + var1.readUnsignedByte(); + } else if (var2 == 70) { this.offsetX = var1.readShort(); - } else if (var2 == 71) { // L: 192 + } else if (var2 == 71) { this.offsetHeight = var1.readShort(); } else if (var2 == 72) { - this.offsetY = var1.readShort(); // L: 193 - } else if (var2 == 73) { // L: 194 + this.offsetY = var1.readShort(); + } else if (var2 == 73) { this.boolean2 = true; - } else if (var2 == 74) { // L: 195 + } else if (var2 == 74) { this.isSolid = true; - } else if (var2 == 75) { // L: 196 + } else if (var2 == 75) { this.int3 = var1.readUnsignedByte(); - } else if (var2 != 77 && var2 != 92) { // L: 197 - if (var2 == 78) { // L: 215 - this.ambientSoundId = var1.readUnsignedShort(); // L: 216 - this.field1801 = var1.readUnsignedByte(); // L: 217 - } else if (var2 == 79) { // L: 219 - this.int5 = var1.readUnsignedShort(); // L: 220 - this.int6 = var1.readUnsignedShort(); // L: 221 - this.field1801 = var1.readUnsignedByte(); // L: 222 - var3 = var1.readUnsignedByte(); // L: 223 - this.soundEffectIds = new int[var3]; // L: 224 + } else if (var2 != 77 && var2 != 92) { + if (var2 == 78) { + this.ambientSoundId = var1.readUnsignedShort(); + this.field1779 = var1.readUnsignedByte(); + } else if (var2 == 79) { + this.int5 = var1.readUnsignedShort(); + this.int6 = var1.readUnsignedShort(); + this.field1779 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByte(); + this.soundEffectIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 225 + for (var4 = 0; var4 < var3; ++var4) { this.soundEffectIds[var4] = var1.readUnsignedShort(); } - } else if (var2 == 81) { // L: 227 + } else if (var2 == 81) { this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { // L: 228 + } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 89) { // L: 229 - this.field1784 = false; - } else if (var2 == 249) { // L: 230 - this.params = class19.readStringIntParameters(var1, this.params); + } else if (var2 == 89) { + this.field1733 = false; + } else if (var2 == 249) { + this.params = ObjectSound.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 198 - if (this.transformVarbit == 65535) { // L: 199 + this.transformVarbit = var1.readUnsignedShort(); + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 200 - if (this.transformVarp == 65535) { // L: 201 + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } - var3 = -1; // L: 202 - if (var2 == 92) { // L: 203 - var3 = var1.readUnsignedShort(); // L: 204 - if (var3 == 65535) { // L: 205 + var3 = -1; + if (var2 == 92) { + var3 = var1.readUnsignedShort(); + if (var3 == 65535) { var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 207 - this.transforms = new int[var4 + 2]; // L: 208 + var4 = var1.readUnsignedByte(); + this.transforms = new int[var4 + 2]; - for (int var5 = 0; var5 <= var4; ++var5) { // L: 209 - this.transforms[var5] = var1.readUnsignedShort(); // L: 210 - if (this.transforms[var5] == 65535) { // L: 211 + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.readUnsignedShort(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 213 + this.transforms[var4 + 1] = var3; } - } // L: 232 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1935277260" + descriptor = "(IB)Z", + garbageValue = "2" ) - public final boolean method3019(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 + public final boolean method2993(int var1) { + if (this.models != null) { + for (int var4 = 0; var4 < this.models.length; ++var4) { + if (this.models[var4] == var1) { return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } - return true; // L: 248 - } else if (this.modelIds == null) { // L: 236 return true; - } else if (var1 != 10) { // L: 237 + } else if (this.modelIds == null) { + return true; + } else if (var1 != 10) { return true; } else { - boolean var2 = true; // L: 238 + boolean var2 = true; - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 239 - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240 + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); } - return var2; // L: 242 + return var2; } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "121" + descriptor = "(I)Z", + garbageValue = "-1503088298" ) @Export("needsModelFiles") public final boolean needsModelFiles() { - if (this.modelIds == null) { // L: 253 + if (this.modelIds == null) { return true; } else { - boolean var1 = true; // L: 254 + boolean var1 = true; - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 255 - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256 + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); } - return var1; // L: 258 - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgr;", - garbageValue = "-212944221" - ) - @Export("getEntity") - public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { - long var7; - if (this.models == null) { // L: 263 - var7 = (long)(var2 + (this.id << 10)); - } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 264 - } - - Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 265 - if (var9 == null) { // L: 266 - ModelData var10 = this.getModelData(var1, var2); // L: 267 - if (var10 == null) { // L: 268 - return null; - } - - if (!this.nonFlatShading) { // L: 269 - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - } else { - var10.ambient = (short)(this.ambient + 64); // L: 271 - var10.contrast = (short)(this.contrast + 768); // L: 272 - var10.calculateVertexNormals(); // L: 273 - var9 = var10; // L: 274 - } - - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 276 - } - - if (this.nonFlatShading) { // L: 278 - var9 = ((ModelData)var9).method3870(); // L: 279 - } - - if (this.clipType >= 0) { // L: 281 - if (var9 instanceof Model) { // L: 282 - var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); - } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method3933(var3, var4, var5, var6, true, this.clipType); // L: 283 - } - } - - return (Renderable)var9; // L: 285 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgd;", - garbageValue = "1736457663" - ) - @Export("getModel") - public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { - long var7; - if (this.models == null) { // L: 290 - var7 = (long)(var2 + (this.id << 10)); - } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 291 - } - - Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 292 - if (var9 == null) { // L: 293 - ModelData var10 = this.getModelData(var1, var2); // L: 294 - if (var10 == null) { // L: 295 - return null; - } - - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 296 - ObjectDefinition_cachedModels.put(var9, var7); // L: 297 - } - - if (this.clipType >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 299 - } - - return var9; // L: 300 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II[[IIIILfm;IB)Lgd;", - garbageValue = "-15" - ) - @Export("getModelDynamic") - public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { - long var9; - if (this.models == null) { // L: 305 - var9 = (long)(var2 + (this.id << 10)); - } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306 - } - - Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 307 - if (var11 == null) { // L: 308 - ModelData var12 = this.getModelData(var1, var2); // L: 309 - if (var12 == null) { // L: 310 - return null; - } - - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 311 - ObjectDefinition_cachedModels.put(var11, var9); // L: 312 - } - - if (var7 == null && this.clipType == -1) { - return var11; // L: 314 - } else { - if (var7 != null) { // L: 315 - var11 = var7.transformObjectModel(var11, var8, var2); - } else { - var11 = var11.toSharedSequenceModel(true); // L: 316 - } - - if (this.clipType >= 0) { // L: 317 - var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); - } - - return var11; // L: 318 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(III)Lga;", - garbageValue = "1848806272" - ) - @Export("getModelData") - final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; // L: 322 - boolean var4; - int var5; - int var7; - if (this.models == null) { // L: 323 - if (var1 != 10) { // L: 324 - return null; - } - - if (this.modelIds == null) { // L: 325 - return null; - } - - var4 = this.isRotated; // L: 326 - if (var1 == 2 && var2 > 3) { // L: 327 - var4 = !var4; - } - - var5 = this.modelIds.length; // L: 328 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 329 - var7 = this.modelIds[var6]; // L: 330 - if (var4) { // L: 331 - var7 += 65536; - } - - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 332 - if (var3 == null) { // L: 333 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 334 - if (var3 == null) { // L: 335 - return null; - } - - if (var4) { // L: 336 - var3.method3877(); - } - - ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 337 - } - - if (var5 > 1) { // L: 339 - field1781[var6] = var3; - } - } - - if (var5 > 1) { // L: 341 - var3 = new ModelData(field1781, var5); - } - } else { - int var9 = -1; // L: 344 - - for (var5 = 0; var5 < this.models.length; ++var5) { // L: 345 - if (this.models[var5] == var1) { // L: 346 - var9 = var5; // L: 347 - break; - } - } - - if (var9 == -1) { // L: 351 - return null; - } - - var5 = this.modelIds[var9]; // L: 352 - boolean var10 = this.isRotated ^ var2 > 3; // L: 353 - if (var10) { // L: 354 - var5 += 65536; - } - - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 355 - if (var3 == null) { // L: 356 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 357 - if (var3 == null) { // L: 358 - return null; - } - - if (var10) { // L: 359 - var3.method3877(); - } - - ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 360 - } - } - - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 364 - var4 = false; // L: 365 - } else { - var4 = true; - } - - boolean var11; - if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 367 - var11 = false; // L: 368 - } else { - var11 = true; - } - - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 369 - if (var1 == 4 && var2 > 3) { // L: 370 - var8.method3864(256); // L: 371 - var8.changeOffset(45, 0, -45); // L: 372 - } - - var2 &= 3; // L: 374 - if (var2 == 1) { // L: 375 - var8.method3873(); - } else if (var2 == 2) { // L: 376 - var8.method3874(); - } else if (var2 == 3) { // L: 377 - var8.method3875(); - } - - if (this.recolorFrom != null) { // L: 378 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 379 - var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 380 - } - } - - if (this.retextureFrom != null) { // L: 383 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 384 - var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 385 - } - } - - if (var4) { // L: 388 - var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); - } - - if (var11) { // L: 389 - var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); - } - - return var8; // L: 390 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)Lez;", - garbageValue = "-68" - ) - @Export("transform") - public final ObjectComposition transform() { - int var1 = -1; // L: 394 - if (this.transformVarbit != -1) { // L: 395 - var1 = ScriptFrame.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 396 - var1 = Varps.Varps_main[this.transformVarp]; - } - - int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 398 - var2 = this.transforms[var1]; // L: 399 - } else { - var2 = this.transforms[this.transforms.length - 1]; - } - - return var2 != -1 ? Tiles.getObjectDefinition(var2) : null; // L: 400 401 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-822504671" - ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 406 - int var3; - if (var4 == null) { // L: 408 - var3 = var2; // L: 409 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 412 - if (var5 == null) { // L: 413 - var3 = var2; // L: 414 - } else { - var3 = var5.integer; // L: 417 - } - } - - return var3; // L: 419 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "0" - ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return WorldMapElement.method2742(this.params, var1, var2); // L: 423 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "114" - ) - @Export("hasSound") - public boolean hasSound() { - if (this.transforms == null) { // L: 434 - return this.ambientSoundId != -1 || this.soundEffectIds != null; - } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 435 - if (this.transforms[var1] != -1) { // L: 436 - ObjectComposition var2 = Tiles.getObjectDefinition(this.transforms[var1]); // L: 437 - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 438 - return true; - } - } - } - - return false; // L: 441 + return var1; } } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;B)V", - garbageValue = "-24" + descriptor = "(II[[IIIIB)Lgy;", + garbageValue = "-49" ) - public static void method3069(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 - } // L: 34 + @Export("getEntity") + public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { + long var7; + if (this.models == null) { + var7 = (long)(var2 + (this.id << 10)); + } else { + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + } + + Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); + if (var9 == null) { + ModelData var10 = this.getModelData(var1, var2); + if (var10 == null) { + return null; + } + + if (!this.nonFlatShading) { + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + } else { + var10.ambient = (short)(this.ambient + 64); + var10.contrast = (short)(this.contrast + 768); + var10.calculateVertexNormals(); + var9 = var10; + } + + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); + } + + if (this.nonFlatShading) { + var9 = ((ModelData)var9).method3797(); + } + + if (this.clipType >= 0) { + if (var9 instanceof Model) { + var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); + } else if (var9 instanceof ModelData) { + var9 = ((ModelData)var9).method3798(var3, var4, var5, var6, true, this.clipType); + } + } + + return (Renderable)var9; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II[[IIIII)Lgl;", + garbageValue = "-1635720896" + ) + @Export("getModel") + public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { + long var7; + if (this.models == null) { + var7 = (long)(var2 + (this.id << 10)); + } else { + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + } + + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); + if (var9 == null) { + ModelData var10 = this.getModelData(var1, var2); + if (var10 == null) { + return null; + } + + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + ObjectDefinition_cachedModels.put(var9, var7); + } + + if (this.clipType >= 0) { + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); + } + + return var9; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(II[[IIIILfz;II)Lgl;", + garbageValue = "-994387691" + ) + @Export("getModelDynamic") + public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { + long var9; + if (this.models == null) { + var9 = (long)(var2 + (this.id << 10)); + } else { + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); + } + + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); + if (var11 == null) { + ModelData var12 = this.getModelData(var1, var2); + if (var12 == null) { + return null; + } + + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + ObjectDefinition_cachedModels.put(var11, var9); + } + + if (var7 == null && this.clipType == -1) { + return var11; + } else { + if (var7 != null) { + var11 = var7.transformObjectModel(var11, var8, var2); + } else { + var11 = var11.toSharedSequenceModel(true); + } + + if (this.clipType >= 0) { + var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); + } + + return var11; + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIB)Lgz;", + garbageValue = "-6" + ) + @Export("getModelData") + final ModelData getModelData(int var1, int var2) { + ModelData var3 = null; + boolean var4; + int var5; + int var7; + if (this.models == null) { + if (var1 != 10) { + return null; + } + + if (this.modelIds == null) { + return null; + } + + var4 = this.isRotated; + if (var1 == 2 && var2 > 3) { + var4 = !var4; + } + + var5 = this.modelIds.length; + + for (int var6 = 0; var6 < var5; ++var6) { + var7 = this.modelIds[var6]; + if (var4) { + var7 += 65536; + } + + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); + if (var3 == null) { + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); + if (var3 == null) { + return null; + } + + if (var4) { + var3.method3807(); + } + + ObjectDefinition_cachedModelData.put(var3, (long)var7); + } + + if (var5 > 1) { + field1740[var6] = var3; + } + } + + if (var5 > 1) { + var3 = new ModelData(field1740, var5); + } + } else { + int var9 = -1; + + for (var5 = 0; var5 < this.models.length; ++var5) { + if (this.models[var5] == var1) { + var9 = var5; + break; + } + } + + if (var9 == -1) { + return null; + } + + var5 = this.modelIds[var9]; + boolean var10 = this.isRotated ^ var2 > 3; + if (var10) { + var5 += 65536; + } + + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); + if (var3 == null) { + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); + if (var3 == null) { + return null; + } + + if (var10) { + var3.method3807(); + } + + ObjectDefinition_cachedModelData.put(var3, (long)var5); + } + } + + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { + var4 = false; + } else { + var4 = true; + } + + boolean var11; + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { + var11 = false; + } else { + var11 = true; + } + + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); + if (var1 == 4 && var2 > 3) { + var8.method3856(256); + var8.changeOffset(45, 0, -45); + } + + var2 &= 3; + if (var2 == 1) { + var8.method3792(); + } else if (var2 == 2) { + var8.method3801(); + } else if (var2 == 3) { + var8.method3802(); + } + + if (this.recolorFrom != null) { + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + } + } + + if (this.retextureFrom != null) { + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + } + } + + if (var4) { + var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); + } + + if (var11) { + var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); + } + + return var8; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Lem;", + garbageValue = "-1973196197" + ) + @Export("transform") + public final ObjectComposition transform() { + int var1 = -1; + if (this.transformVarbit != -1) { + var1 = WorldMapSection0.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { + var1 = Varps.Varps_main[this.transformVarp]; + } + + int var2; + if (var1 >= 0 && var1 < this.transforms.length - 1) { + var2 = this.transforms[var1]; + } else { + var2 = this.transforms[this.transforms.length - 1]; + } + + return var2 != -1 ? ClanChannel.getObjectDefinition(var2) : null; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIS)I", + garbageValue = "-16980" + ) + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + IterableNodeHashTable var4 = this.params; + int var3; + if (var4 == null) { + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } + } + + return var3; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "74" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = (String)var5.obj; + } + } + + return var3; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1596304691" + ) + @Export("hasSound") + public boolean hasSound() { + if (this.transforms == null) { + return this.ambientSoundId != -1 || this.soundEffectIds != null; + } else { + for (int var1 = 0; var1 < this.transforms.length; ++var1) { + if (this.transforms[var1] != -1) { + ObjectComposition var2 = ClanChannel.getObjectDefinition(this.transforms[var1]); + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { + return true; + } + } + } + + return false; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Les;", + garbageValue = "935857174" + ) + public static HitSplatDefinition method3044(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "-1246980701" + ) + static boolean method3015(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class16.field87.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var10.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; + } + } catch (Throwable var5) { + return false; + } + } else if (var1 == 1) { + try { + Object var3 = class14.method155(class16.applet, var2, new Object[]{(new URL(class16.applet.getCodeBase(), var0)).toString()}); + return var3 != null; + } catch (Throwable var6) { + return false; + } + } else if (var1 == 2) { + try { + class16.applet.getAppletContext().showDocument(new URL(class16.applet.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var7) { + return false; + } + } else if (var1 == 3) { + try { + class14.method148(class16.applet, "loggedout"); + } catch (Throwable var9) { + } + + try { + class16.applet.getAppletContext().showDocument(new URL(class16.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var8) { + return false; + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lc;B)V", + garbageValue = "81" + ) + @Export("doCycleTitle") + static void doCycleTitle(GameEngine var0) { + int var2; + int var3; + int var32; + if (Login.worldSelectOpen) { + while (true) { + if (!IgnoreList.isKeyDown()) { + if (MouseHandler.MouseHandler_lastButton != 1 && (class310.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { + break; + } + + int var1 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(0, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(0, 1); + break; + } + + var2 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(1, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(1, 1); + break; + } + + var3 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(2, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(2, 1); + break; + } + + var32 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var32 && MouseHandler.MouseHandler_lastPressedX <= var32 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(3, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var32 + 15 && MouseHandler.MouseHandler_lastPressedX <= var32 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Language.changeWorldSelectSorting(3, 1); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + ClanSettings.method2422(); + break; + } + + if (Login.hoveredWorldIndex != -1) { + World var5 = class15.World_worlds[Login.hoveredWorldIndex]; + ItemComposition.changeWorld(var5); + ClanSettings.method2422(); + } else { + if (Login.worldSelectPage > 0 && class137.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class137.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Client.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Client.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && BuddyRankComparator.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= MouseRecorder.canvasWidth - BuddyRankComparator.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= MouseRecorder.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Client.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Client.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + break; + } + + if (class120.field1417 == 13) { + ClanSettings.method2422(); + break; + } + + if (class120.field1417 == 96) { + if (Login.worldSelectPage > 0 && class137.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (class120.field1417 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && BuddyRankComparator.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } + } + + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + Decimator.clientPreferences.titleMusicDisabled = !Decimator.clientPreferences.titleMusicDisabled; + MilliClock.savePreferences(); + if (!Decimator.clientPreferences.titleMusicDisabled) { + Archive var20 = class108.archive6; + var2 = var20.getGroupId("scape main"); + var3 = var20.getFileId(var2, ""); + Players.method2022(var20, var2, var3, 255, false); + } else { + DynamicObject.method1727(); + } + } + + if (Client.gameState != 5) { + if (Login.field828 == -1L) { + Login.field828 = UrlRequester.method2125() + 1000L; + } + + long var21 = UrlRequester.method2125(); + if (class16.method173() && -1L == Login.field812) { + Login.field812 = var21; + if (Login.field812 > Login.field828) { + Login.field828 = Login.field812; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + if (GrandExchangeOfferWorldComparator.clientLanguage == Language.Language_EN) { + if (MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var3 = Login.xPadding + 5; + short var4 = 463; + byte var23 = 100; + byte var6 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var23 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) { + if (Strings.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + return; + } + } + + if (NPC.World_request != null && Strings.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + } + + var3 = MouseHandler.MouseHandler_lastButton; + var32 = MouseHandler.MouseHandler_lastPressedX; + int var43 = MouseHandler.MouseHandler_lastPressedY; + if (var3 == 0) { + var32 = MouseHandler.MouseHandler_x; + var43 = MouseHandler.MouseHandler_y; + } + + if (!class310.mouseCam && var3 == 4) { + var3 = 1; + } + + short var35; + int var36; + if (Login.loginIndex == 0) { + boolean var40 = false; + + while (IgnoreList.isKeyDown()) { + if (class120.field1417 == 84) { + var40 = true; + } + } + + var36 = WorldMapSection2.loginBoxCenter - 80; + var35 = 291; + if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { + InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var36 = WorldMapSection2.loginBoxCenter + 80; + if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20 || var40) { + if ((Client.worldProperties & 33554432) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + Login.loginIndex = 1; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else if ((Client.worldProperties & 4) != 0) { + if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; + } else { + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; + } + + Login.Login_response0 = "Warning!"; + Login.loginIndex = 1; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + Login.loginIndex = 1; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else { + class107.Login_promptCredentials(false); + } + } + } else { + short var7; + int var33; + if (Login.loginIndex == 1) { + while (true) { + if (!IgnoreList.isKeyDown()) { + var33 = WorldMapSection2.loginBoxCenter - 80; + var7 = 321; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + class107.Login_promptCredentials(false); + } + + var33 = WorldMapSection2.loginBoxCenter + 80; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + Login.loginIndex = 0; + } + break; + } + + if (class120.field1417 == 84) { + class107.Login_promptCredentials(false); + } else if (class120.field1417 == 13) { + Login.loginIndex = 0; + } + } + } else { + short var34; + boolean var37; + if (Login.loginIndex == 2) { + var34 = 201; + var33 = var34 + 52; + if (var3 == 1 && var43 >= var33 - 12 && var43 < var33 + 2) { + Login.currentLoginField = 0; + } + + var33 += 15; + if (var3 == 1 && var43 >= var33 - 12 && var43 < var33 + 2) { + Login.currentLoginField = 1; + } + + var33 += 15; + var34 = 361; + if (GameEngine.field127 != null) { + var36 = GameEngine.field127.highX / 2; + if (var3 == 1 && var32 >= GameEngine.field127.lowX - var36 && var32 <= var36 + GameEngine.field127.lowX && var43 >= var34 - 15 && var43 < var34) { + switch(Login.field809) { + case 1: + Client.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Login.loginIndex = 5; + return; + case 2: + InvDefinition.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var36 = WorldMapSection2.loginBoxCenter - 80; + var35 = 321; + if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Client.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + Client.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + Client.setLoginResponseString("", "Connecting to server...", ""); + Interpreter.method1579(false); + class16.updateGameState(20); + return; + } + + var36 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class282.field3639 = 0; + HorizontalAlignment.otp = ""; + Login.field820 = true; + } + + var36 = WorldMapSection2.loginBoxCenter + -117; + var35 = 277; + Login.field829 = var32 >= var36 && var32 < var36 + ClanSettings.field1386 && var43 >= var35 && var43 < var35 + World.field704; + if (var3 == 1 && Login.field829) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && Decimator.clientPreferences.rememberedUsername != null) { + Decimator.clientPreferences.rememberedUsername = null; + MilliClock.savePreferences(); + } + } + + var36 = WorldMapSection2.loginBoxCenter + 24; + var35 = 277; + Login.field819 = var32 >= var36 && var32 < var36 + ClanSettings.field1386 && var43 >= var35 && var43 < var35 + World.field704; + if (var3 == 1 && Login.field819) { + Decimator.clientPreferences.hideUsername = !Decimator.clientPreferences.hideUsername; + if (!Decimator.clientPreferences.hideUsername) { + Login.Login_username = ""; + Decimator.clientPreferences.rememberedUsername = null; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } + + MilliClock.savePreferences(); + } + + label1268: + while (true) { + Transferable var25; + int var39; + do { + while (true) { + char var38; + label1182: + do { + while (true) { + while (IgnoreList.isKeyDown()) { + if (class120.field1417 != 13) { + if (Login.currentLoginField != 0) { + continue label1182; + } + + WorldMapRectangle.method3643(class126.field1449); + if (class120.field1417 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class120.field1417 == 84 || class120.field1417 == 80) { + Login.currentLoginField = 1; + } + + var38 = class126.field1449; + var37 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var38) != -1; + if (var37 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class126.field1449; + } + } else { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class282.field3639 = 0; + HorizontalAlignment.otp = ""; + Login.field820 = true; + } + } + + return; + } + } while(Login.currentLoginField != 1); + + if (class120.field1417 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (class120.field1417 == 84 || class120.field1417 == 80) { + Login.currentLoginField = 0; + if (class120.field1417 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Client.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + Client.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + Client.setLoginResponseString("", "Connecting to server...", ""); + Interpreter.method1579(false); + class16.updateGameState(20); + return; + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class120.field1417 == 67) { + Clipboard var24 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var25 = var24.getContents(Script.client); + var39 = 20 - Login.Login_password.length(); + break; + } + + var38 = class126.field1449; + if (var38 >= ' ' && var38 < 127 || var38 > 127 && var38 < 160 || var38 > 160 && var38 <= 255) { + var37 = true; + } else { + label1410: { + if (var38 != 0) { + char[] var27 = class303.cp1252AsciiExtension; + + for (int var28 = 0; var28 < var27.length; ++var28) { + char var13 = var27[var28]; + if (var13 == var38) { + var37 = true; + break label1410; + } + } + } + + var37 = false; + } + } + + if (var37) { + char var44 = class126.field1449; + boolean var11 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var44) != -1; + if (var11 && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + class126.field1449; + } + } + } + } while(var39 <= 0); + + try { + String var12 = (String)var25.getTransferData(DataFlavor.stringFlavor); + int var41 = Math.min(var39, var12.length()); + int var14 = 0; + + while (true) { + if (var14 >= var41) { + Login.Login_password = Login.Login_password + var12.substring(0, var41); + continue label1268; + } + + char var16 = var12.charAt(var14); + boolean var15; + if (var16 >= ' ' && var16 < 127 || var16 > 127 && var16 < 160 || var16 > 160 && var16 <= 255) { + var15 = true; + } else { + label1411: { + if (var16 != 0) { + char[] var17 = class303.cp1252AsciiExtension; + + for (int var18 = 0; var18 < var17.length; ++var18) { + char var19 = var17[var18]; + if (var16 == var19) { + var15 = true; + break label1411; + } + } + } + + var15 = false; + } + } + + if (!var15) { + break; + } + + char var42 = var12.charAt(var14); + boolean var26 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var42) != -1; + if (!var26) { + break; + } + + ++var14; + } + + Login.loginIndex = 3; + return; + } catch (UnsupportedFlavorException var30) { + } catch (IOException var31) { + } + } + } else if (Login.loginIndex == 3) { + var33 = Login.loginBoxX + 180; + var7 = 276; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + class107.Login_promptCredentials(false); + } + + var33 = Login.loginBoxX + 180; + var7 = 326; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + Client.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Login.loginIndex = 5; + return; + } + } else { + int var9; + if (Login.loginIndex == 4) { + var33 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + HorizontalAlignment.otp.trim(); + if (HorizontalAlignment.otp.length() != 6) { + Client.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class282.field3639 = Integer.parseInt(HorizontalAlignment.otp); + HorizontalAlignment.otp = ""; + Interpreter.method1579(true); + Client.setLoginResponseString("", "Connecting to server...", ""); + class16.updateGameState(20); + return; + } + + if (var3 == 1 && var32 >= Login.loginBoxX + 180 - 9 && var32 <= Login.loginBoxX + 180 + 130 && var43 >= 263 && var43 <= 296) { + Login.field820 = !Login.field820; + } + + if (var3 == 1 && var32 >= Login.loginBoxX + 180 - 34 && var32 <= Login.loginBoxX + 34 + 180 && var43 >= 351 && var43 <= 363) { + InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + } + + var33 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class282.field3639 = 0; + HorizontalAlignment.otp = ""; + } + + while (IgnoreList.isKeyDown()) { + boolean var8 = false; + + for (var9 = 0; var9 < "1234567890".length(); ++var9) { + if (class126.field1449 == "1234567890".charAt(var9)) { + var8 = true; + break; + } + } + + if (class120.field1417 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class282.field3639 = 0; + HorizontalAlignment.otp = ""; + } else { + if (class120.field1417 == 85 && HorizontalAlignment.otp.length() > 0) { + HorizontalAlignment.otp = HorizontalAlignment.otp.substring(0, HorizontalAlignment.otp.length() - 1); + } + + if (class120.field1417 == 84) { + HorizontalAlignment.otp.trim(); + if (HorizontalAlignment.otp.length() != 6) { + Client.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class282.field3639 = Integer.parseInt(HorizontalAlignment.otp); + HorizontalAlignment.otp = ""; + Interpreter.method1579(true); + Client.setLoginResponseString("", "Connecting to server...", ""); + class16.updateGameState(20); + return; + } + + if (var8 && HorizontalAlignment.otp.length() < 6) { + HorizontalAlignment.otp = HorizontalAlignment.otp + class126.field1449; + } + } + } + } else if (Login.loginIndex == 5) { + var33 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + ModeWhere.method5238(); + return; + } + + var33 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + class107.Login_promptCredentials(true); + } + + var35 = 361; + if (class307.field3766 != null) { + var9 = class307.field3766.highX / 2; + if (var3 == 1 && var32 >= class307.field3766.lowX - var9 && var32 <= var9 + class307.field3766.lowX && var43 >= var35 - 15 && var43 < var35) { + InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (IgnoreList.isKeyDown()) { + var37 = false; + + for (int var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { + if (class126.field1449 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { + var37 = true; + break; + } + } + + if (class120.field1417 == 13) { + class107.Login_promptCredentials(true); + } else { + if (class120.field1417 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class120.field1417 == 84) { + ModeWhere.method5238(); + return; + } + + if (var37 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class126.field1449; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + var33 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=dob/set_dob.ws", true, false); + Client.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var33 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + class107.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 8) { + var33 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + InvDefinition.openURL("https://www.jagex.com/terms/privacy", true, false); + Client.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var33 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + class107.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 12) { + String var29 = ""; + switch(Login.field804) { + case 0: + var29 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var29 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + class107.Login_promptCredentials(false); + } + + var36 = Login.loginBoxX + 180; + var35 = 276; + if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { + InvDefinition.openURL(var29, true, false); + Client.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var36 = Login.loginBoxX + 180; + var35 = 326; + if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { + class107.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var33 = Login.loginBoxX + 180; + var7 = 301; + if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { + class107.Login_promptCredentials(false); + } + } + } else { + while (true) { + do { + if (!IgnoreList.isKeyDown()) { + var34 = 321; + if (var3 == 1 && var43 >= var34 - 20 && var43 <= var34 + 20) { + class107.Login_promptCredentials(true); + } + + return; + } + } while(class120.field1417 != 84 && class120.field1417 != 13); + + class107.Login_promptCredentials(true); + } + } + } + } + } + + } + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljy;IS)Lof;", + garbageValue = "-10826" + ) + public static IndexedSprite method3046(AbstractArchive var0, int var1) { + byte[] var3 = var0.takeFileFlat(var1); + boolean var2; + if (var3 == null) { + var2 = false; + } else { + Occluder.SpriteBuffer_decode(var3); + var2 = true; + } + + if (!var2) { + return null; + } else { + IndexedSprite var4 = new IndexedSprite(); + var4.width = class398.SpriteBuffer_spriteWidth; + var4.height = class398.SpriteBuffer_spriteHeight; + var4.xOffset = class398.SpriteBuffer_xOffsets[0]; + var4.yOffset = class398.SpriteBuffer_yOffsets[0]; + var4.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class374.SpriteBuffer_spriteHeights[0]; + var4.palette = class118.SpriteBuffer_spritePalette; + var4.pixels = class398.SpriteBuffer_pixels[0]; + class398.SpriteBuffer_xOffsets = null; + class398.SpriteBuffer_yOffsets = null; + ClanChannelMember.SpriteBuffer_spriteWidths = null; + class374.SpriteBuffer_spriteHeights = null; + class118.SpriteBuffer_spritePalette = null; + class398.SpriteBuffer_pixels = null; + return var4; + } + } + + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(Lbx;B)V", + garbageValue = "4" + ) + static final void method3013(Actor var0) { + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field1078 = 0; + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var1 = World.SequenceDefinition_get(var0.sequence); + if (var0.field1066 > 0 && var1.field1867 == 0) { + ++var0.field1078; + return; + } + + if (var0.field1066 <= 0 && var1.field1859 == 0) { + ++var0.field1078; + return; + } + } + + int var10 = var0.x; + int var2 = var0.y; + int var3 = var0.field1023 * 64 + var0.pathX[var0.pathLength - 1] * 128; + int var4 = var0.field1023 * 64 + var0.pathY[var0.pathLength - 1] * 128; + if (var10 < var3) { + if (var2 < var4) { + var0.orientation = 1280; + } else if (var2 > var4) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var10 > var3) { + if (var2 < var4) { + var0.orientation = 768; + } else if (var2 > var4) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var2 < var4) { + var0.orientation = 1024; + } else if (var2 > var4) { + var0.orientation = 0; + } + + byte var5 = var0.pathTraversed[var0.pathLength - 1]; + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { + int var6 = var0.orientation - var0.rotation & 2047; + if (var6 > 1024) { + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; + if (var6 >= -256 && var6 <= 256) { + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; + int var8 = 4; + boolean var9 = true; + if (var0 instanceof NPC) { + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1074 != 0) { + var8 = 2; + } + + if (var0.pathLength > 2) { + var8 = 6; + } + + if (var0.pathLength > 3) { + var8 = 8; + } + + if (var0.field1078 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field1078; + } + } else { + if (var0.pathLength > 1) { + var8 = 6; + } + + if (var0.pathLength > 2) { + var8 = 8; + } + + if (var0.field1078 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field1078; + } + } + + if (var5 == 2) { + var8 <<= 1; + } + + if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } + + if (var3 != var10 || var4 != var2) { + if (var10 < var3) { + var0.x += var8; + if (var0.x > var3) { + var0.x = var3; + } + } else if (var10 > var3) { + var0.x -= var8; + if (var0.x < var3) { + var0.x = var3; + } + } + + if (var2 < var4) { + var0.y += var8; + if (var0.y > var4) { + var0.y = var4; + } + } else if (var2 > var4) { + var0.y -= var8; + if (var0.y < var4) { + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { + --var0.pathLength; + if (var0.field1066 > 0) { + --var0.field1066; + } + } + + } else { + var0.x = var3; + var0.y = var4; + --var0.pathLength; + if (var0.field1066 > 0) { + --var0.field1066; + } + + } + } + } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index e0208e62d7..777c4ff431 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mh") +@ObfuscatedName("mu") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("obj") public final Object obj; public ObjectNode(Object var1) { - this.obj = var1; // L: 7 - } // L: 8 + this.obj = var1; + } } diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 808cde05e5..e2d2599030 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -3,272 +3,177 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bf") +@ObfuscatedName("ad") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = 501440191 + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "Lom;" ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("e") + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 179593907 + intValue = 91657877 + ) + int field727; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1049583949 ) @Export("plane") int plane; - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 724214627 + intValue = 1525995089 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 775363577 + intValue = 483612819 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1416185027 + intValue = 1198542603 ) - int field937; + int field722; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1542168695 + ) + int field723; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -2081431069 + ) + int field718; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 50432371 - ) - int field944; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -663897917 - ) - int field939; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lez;" - ) - @Export("obj") - ObjectComposition obj; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -709047569 + intValue = 7596549 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lbv;" + descriptor = "Lal;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1448686013 + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lem;" ) - int field941; - @ObfuscatedName("b") + @Export("obj") + ObjectComposition obj; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1441209589 + intValue = -452369011 ) - int field943; - @ObfuscatedName("i") + int field728; + @ObfuscatedName("h") @Export("soundEffectIds") int[] soundEffectIds; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1984833823 + intValue = -904318183 ) - int field945; - @ObfuscatedName("g") + int field725; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lbv;" + descriptor = "Lal;" ) @Export("stream2") RawPcmStream stream2; static { - objectSounds = new NodeDeque(); // L: 11 + objectSounds = new NodeDeque(); } ObjectSound() { - } // L: 27 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-351961075" ) @Export("set") void set() { - int var1 = this.soundEffectId; // L: 36 - ObjectComposition var2 = this.obj.transform(); // L: 37 - if (var2 != null) { // L: 38 - this.soundEffectId = var2.ambientSoundId; // L: 39 - this.field939 = var2.field1801 * 128; // L: 40 - this.field941 = var2.int5; // L: 41 - this.field943 = var2.int6; // L: 42 - this.soundEffectIds = var2.soundEffectIds; // L: 43 + int var1 = this.soundEffectId; + ObjectComposition var2 = this.obj.transform(); + if (var2 != null) { + this.soundEffectId = var2.ambientSoundId; + this.field718 = var2.field1779 * 128; + this.field727 = var2.int5; + this.field728 = var2.int6; + this.soundEffectIds = var2.soundEffectIds; } else { - this.soundEffectId = -1; // L: 46 - this.field939 = 0; // L: 47 - this.field941 = 0; // L: 48 - this.field943 = 0; // L: 49 - this.soundEffectIds = null; // L: 50 + this.soundEffectId = -1; + this.field718 = 0; + this.field727 = 0; + this.field728 = 0; + this.soundEffectIds = null; } - if (var1 != this.soundEffectId && this.stream1 != null) { // L: 52 - UserComparator7.pcmStreamMixer.removeSubStream(this.stream1); // L: 53 - this.stream1 = null; // L: 54 + if (var1 != this.soundEffectId && this.stream1 != null) { + TileItem.pcmStreamMixer.removeSubStream(this.stream1); + this.stream1 = null; } - } // L: 56 + } - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "706769109" + descriptor = "(Lnv;Lmc;I)Lmc;", + garbageValue = "1040141632" ) - static int method1889(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 844 - Widget var4; - if (var0 >= 2000) { // L: 846 - var0 -= 1000; // L: 847 - var4 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 848 - var3 = false; // L: 849 - } else { - var4 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 851 + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); + int var3; + if (var1 == null) { + var3 = SoundSystem.method530(var2); + var1 = new IterableNodeHashTable(var3); } - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 852 - var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] - 1; // L: 853 - if (var11 >= 0 && var11 <= 9) { // L: 854 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 858 - return 1; // L: 859 + for (var3 = 0; var3 < var2; ++var3) { + boolean var4 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); } else { - --UserComparator9.Interpreter_stringStackSize; // L: 855 - return 1; // L: 856 + var6 = new IntegerNode(var0.readInt()); } + + var1.put((Node)var6, (long)var5); + } + + return var1; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)Lio;", + garbageValue = "840518253" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = UrlRequester.getWidget(var0); + if (var1 == -1) { + return var2; } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 861 - ChatChannel.Interpreter_intStackSize -= 2; // L: 862 - var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 863 - var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 864 - var4.parent = class17.getWidgetChild(var11, var6); // L: 865 - return 1; // L: 866 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 868 - var4.isScrollBar = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 869 - return 1; // L: 870 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 872 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 873 - return 1; // L: 874 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 876 - var4.dragThreshold = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 877 - return 1; // L: 878 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 880 - var4.dataText = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 881 - return 1; // L: 882 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 884 - var4.spellActionName = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 885 - return 1; // L: 886 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 888 - var4.actions = null; // L: 889 - return 1; // L: 890 - } else if (var0 == 1308) { // L: 892 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 893 - return 1; // L: 894 - } else if (var0 == 1309) { // L: 896 - --ChatChannel.Interpreter_intStackSize; // L: 897 - return 1; // L: 898 - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 900 - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 930 - ChatChannel.Interpreter_intStackSize -= 2; // L: 931 - var5 = 10; // L: 932 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]}; // L: 933 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]}; // L: 934 - UserComparator8.Widget_setKey(var4, var5, var8, var9); // L: 935 - return 1; // L: 936 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 938 - ChatChannel.Interpreter_intStackSize -= 3; // L: 939 - var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] - 1; // L: 940 - var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 941 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 942 - if (var11 >= 0 && var11 <= 9) { // L: 943 - FileSystem.Widget_setKeyRate(var4, var11, var6, var7); // L: 946 - return 1; // L: 947 - } else { - throw new RuntimeException(); // L: 944 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 949 - var5 = 10; // L: 950 - var6 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 951 - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 952 - FileSystem.Widget_setKeyRate(var4, var5, var6, var7); // L: 953 - return 1; // L: 954 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 956 - --ChatChannel.Interpreter_intStackSize; // L: 957 - var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] - 1; // L: 958 - if (var11 >= 0 && var11 <= 9) { // L: 959 - class25.Widget_setKeyIgnoreHeld(var4, var11); // L: 962 - return 1; // L: 963 - } else { - throw new RuntimeException(); // L: 960 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 965 - var5 = 10; // L: 966 - class25.Widget_setKeyIgnoreHeld(var4, var5); // L: 967 - return 1; // L: 968 - } else { - return 2; // L: 970 - } - } else { - byte[] var10 = null; // L: 901 - var8 = null; // L: 902 - if (var3) { // L: 903 - ChatChannel.Interpreter_intStackSize -= 10; // L: 904 - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + ChatChannel.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 906 907 - } - - if (var7 > 0) { // L: 909 - var10 = new byte[var7 / 2]; // L: 910 - var8 = new byte[var7 / 2]; // L: 911 - - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 912 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + ChatChannel.Interpreter_intStackSize]; // L: 913 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + ChatChannel.Interpreter_intStackSize + 1]; // L: 914 - } - } - } else { - ChatChannel.Interpreter_intStackSize -= 2; // L: 919 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]}; // L: 920 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]}; // L: 921 - } - - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] - 1; // L: 923 - if (var7 >= 0 && var7 <= 9) { // L: 924 - UserComparator8.Widget_setKey(var4, var7, var10, var8); // L: 927 - return 1; // L: 928 - } else { - throw new RuntimeException(); // L: 925 - } - } - } + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index ded1fca2c5..88e9fdcb5f 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -4,127 +4,183 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("gv") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1188565001 + intValue = -1709670941 ) @Export("minTileX") int minTileX; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1313768427 + intValue = 1670329551 ) @Export("maxTileX") int maxTileX; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1783285633 + intValue = 1055641369 ) @Export("minTileY") int minTileY; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1287011473 + intValue = -611436287 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1737527969 + intValue = -1293981005 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -134760601 + intValue = -1427556997 ) @Export("minX") int minX; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1472974577 + intValue = 685232413 ) @Export("maxX") int maxX; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1609596079 + intValue = -625879659 ) @Export("minZ") int minZ; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -338099237 + intValue = -21601359 ) @Export("maxZ") int maxZ; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1143338287 + intValue = 35210795 ) @Export("minY") int minY; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1870122495 + intValue = -300719963 ) @Export("maxY") int maxY; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2114600339 + intValue = 857957481 ) - int field2378; - @ObfuscatedName("i") + int field2365; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -183900019 + intValue = 376208763 ) - int field2370; + int field2366; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -685155783 + intValue = -978419187 ) - int field2380; - @ObfuscatedName("g") + int field2367; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 204431275 + intValue = 379104137 ) - int field2383; - @ObfuscatedName("t") + int field2368; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -78782023 + intValue = -1190788297 ) - int field2382; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1929660861 - ) - int field2385; + int field2370; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2103719141 + intValue = -1468268797 ) - int field2384; + int field2359; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1790151051 + ) + int field2371; Occluder() { - } // L: 23 + } - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "0" + descriptor = "([BB)V", + garbageValue = "24" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 57 + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class398.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class398.SpriteBuffer_xOffsets = new int[class398.SpriteBuffer_spriteCount]; + class398.SpriteBuffer_yOffsets = new int[class398.SpriteBuffer_spriteCount]; + ClanChannelMember.SpriteBuffer_spriteWidths = new int[class398.SpriteBuffer_spriteCount]; + class374.SpriteBuffer_spriteHeights = new int[class398.SpriteBuffer_spriteCount]; + class398.SpriteBuffer_pixels = new byte[class398.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class398.SpriteBuffer_spriteCount * 8; + class398.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class398.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { + class398.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { + class398.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { + ClanChannelMember.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { + class374.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class398.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class118.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class118.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class118.SpriteBuffer_spritePalette[var3] == 0) { + class118.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { + int var4 = ClanChannelMember.SpriteBuffer_spriteWidths[var3]; + int var5 = class374.SpriteBuffer_spriteHeights[var3]; + int var6 = var5 * var4; + byte[] var7 = new byte[var6]; + class398.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var4 * var10] = var1.readByte(); + } + } + } + } + } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index c4e1c1a232..bc1ed012e9 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,157 +4,180 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") +@ObfuscatedName("nu") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("e") - static final int[] field4155; - @ObfuscatedName("f") + @ObfuscatedName("t") + static final int[] field4177; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Log;" ) @Export("isaacCipher") IsaacCipher isaacCipher; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -901766623 + intValue = 492780455 ) @Export("bitIndex") int bitIndex; static { - field4155 = 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 + field4177 = 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}; } public PacketBuffer(int var1) { - super(var1); // L: 11 - } // L: 12 + super(var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "-287297214" + garbageValue = "-1436903008" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { - this.isaacCipher = new IsaacCipher(var1); // L: 15 - } // L: 16 + this.isaacCipher = new IsaacCipher(var1); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lod;B)V", - garbageValue = "-56" + descriptor = "(Log;I)V", + garbageValue = "-2033689742" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { - this.isaacCipher = var1; // L: 19 - } // L: 20 + this.isaacCipher = var1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "27" + descriptor = "(II)V", + garbageValue = "254067462" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { - super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 - } // L: 24 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1735363051" - ) - @Export("readByteIsaac") - public int readByteIsaac() { - return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 + super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-867479471" + descriptor = "(I)I", + garbageValue = "-1058912378" ) - public boolean method6569() { - int var1 = super.array[super.offset] - this.isaacCipher.method7168() & 255; // L: 31 - return var1 >= 128; // L: 32 + @Export("readByteIsaac") + public int readByteIsaac() { + return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "80" + ) + public boolean method6598() { + int var1 = super.array[super.offset] - this.isaacCipher.method7218() & 255; + return var1 >= 128; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "587340865" + ) + @Export("readSmartByteShortIsaac") + public int readSmartByteShortIsaac() { + int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; + return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "([BIIB)V", + garbageValue = "37" + ) + public void method6600(byte[] var1, int var2, int var3) { + for (int var4 = 0; var4 < var3; ++var4) { + var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); + } + + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "945855568" + ) + @Export("importIndex") + public void importIndex() { + this.bitIndex = super.offset * 8; } @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "7" - ) - @Export("readSmartByteShortIsaac") - public int readSmartByteShortIsaac() { - int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 37 - return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-799445636" - ) - public void method6561(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("r") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - @Export("importIndex") - public void importIndex() { - this.bitIndex = super.offset * 8; // L: 47 - } // L: 48 - - @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "-119" + garbageValue = "58" ) @Export("readBits") public int readBits(int var1) { - int var2 = this.bitIndex >> 3; // L: 51 - int var3 = 8 - (this.bitIndex & 7); // L: 52 - int var4 = 0; // L: 53 + int var2 = this.bitIndex >> 3; + int var3 = 8 - (this.bitIndex & 7); + int var4 = 0; - for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field4155[var3]) << var1 - var3; // L: 56 - var1 -= var3; // L: 57 + for (this.bitIndex += var1; var1 > var3; var3 = 8) { + var4 += (super.array[var2++] & field4177[var3]) << var1 - var3; + var1 -= var3; } - if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field4155[var3]; + if (var3 == var1) { + var4 += super.array[var2] & field4177[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4155[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4177[var1]; } - return var4; // L: 62 + return var4; } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1717321285" + garbageValue = "-1173082089" ) @Export("exportIndex") public void exportIndex() { - super.offset = (this.bitIndex + 7) / 8; // L: 66 - } // L: 67 + super.offset = (this.bitIndex + 7) / 8; + } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "252" + descriptor = "(II)I", + garbageValue = "204766178" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { - return var1 * 8 - this.bitIndex; // L: 70 + return var1 * 8 - this.bitIndex; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Lez;", + garbageValue = "-630373764" + ) + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); + return var1; + } } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index c9aa49d17d..6882ac95dd 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -1,4 +1,3 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -8,71 +7,69 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hg") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "[Lhg;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 194087835 + intValue = 245617369 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhx;" ) @Export("clientPacket") public ClientPacket clientPacket; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -970275451 + intValue = -1553896473 ) @Export("clientPacketLength") public int clientPacketLength; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnu;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 272345779 + intValue = 394733649 ) @Export("index") public int index; static { - PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; // L: 13 - PacketBufferNode_packetBufferNodeCount = 0; // L: 14 + PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; + PacketBufferNode_packetBufferNodeCount = 0; } PacketBufferNode() { - } // L: 19 + } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "249212949" + garbageValue = "-872816135" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 58 - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 59 + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; } - } // L: 60 + } - @ObfuscatedName("f") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1856428662" + descriptor = "([BIB)I", + garbageValue = "-82" ) - static void method4497(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 + public static int method4418(byte[] var0, int var1) { + return ClientPacket.method4408(var0, 0, var1); + } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index bf02ff7a2d..667d0cb409 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,240 +5,200 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("cj") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("ei") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llp;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lkk;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1878760487 + intValue = -592223771 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnv;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Log;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lnu;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 824884821 + intValue = 664186129 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("h") - boolean field1412; - @ObfuscatedName("d") + @ObfuscatedName("o") + boolean field1210; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1875627651 + intValue = 642893305 ) - int field1408; - @ObfuscatedName("z") + int field1209; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 120433437 + intValue = 1015319725 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - ServerPacket field1410; - @ObfuscatedName("i") + ServerPacket field1211; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - ServerPacket field1411; + ServerPacket field1213; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - ServerPacket field1399; + ServerPacket field1212; PacketWriter() { - this.packetBufferNodes = new IterableNodeDeque(); // L: 15 - this.bufferSize = 0; // L: 16 - this.buffer = new Buffer(5000); // L: 17 - this.packetBuffer = new PacketBuffer(40000); // L: 19 - this.serverPacket = null; // L: 20 - this.serverPacketLength = 0; // L: 21 - this.field1412 = true; // L: 22 - this.field1408 = 0; // L: 23 - this.pendingWrites = 0; // L: 24 - } // L: 29 + this.packetBufferNodes = new IterableNodeDeque(); + this.bufferSize = 0; + this.buffer = new Buffer(5000); + this.packetBuffer = new PacketBuffer(40000); + this.serverPacket = null; + this.serverPacketLength = 0; + this.field1210 = true; + this.field1209 = 0; + this.pendingWrites = 0; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2055980283" + garbageValue = "-626526349" ) @Export("clearBuffer") final void clearBuffer() { - this.packetBufferNodes.rsClear(); // L: 32 - this.bufferSize = 0; // L: 33 - } // L: 34 + this.packetBufferNodes.rsClear(); + this.bufferSize = 0; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1160814368" + descriptor = "(S)V", + garbageValue = "-26503" ) @Export("flush") final void flush() throws IOException { - if (this.socket != null && this.bufferSize > 0) { // L: 37 - this.buffer.offset = 0; // L: 38 + if (this.socket != null && this.bufferSize > 0) { + this.buffer.offset = 0; while (true) { - PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); // L: 40 - if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { // L: 41 42 - this.socket.write(this.buffer.array, 0, this.buffer.offset); // L: 49 - this.pendingWrites = 0; // L: 50 + PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); + if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { + this.socket.write(this.buffer.array, 0, this.buffer.offset); + this.pendingWrites = 0; break; } - this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); // L: 43 - this.bufferSize -= var1.index; // L: 44 - var1.remove(); // L: 45 - var1.packetBuffer.releaseArray(); // L: 46 - var1.release(); // L: 47 + this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); + this.bufferSize -= var1.index; + var1.remove(); + var1.packetBuffer.releaseArray(); + var1.release(); } } - } // L: 52 + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Lhg;I)V", - garbageValue = "-1221651734" + garbageValue = "1438482653" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { - this.packetBufferNodes.addFirst(var1); // L: 55 - var1.index = var1.packetBuffer.offset; // L: 56 - var1.packetBuffer.offset = 0; // L: 57 - this.bufferSize += var1.index; // L: 58 - } // L: 59 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Llk;S)V", - garbageValue = "3168" - ) - @Export("setSocket") - void setSocket(AbstractSocket var1) { - this.socket = var1; // L: 62 - } // L: 63 + this.packetBufferNodes.addFirst(var1); + var1.index = var1.packetBuffer.offset; + var1.packetBuffer.offset = 0; + this.bufferSize += var1.index; + } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Llp;I)V", + garbageValue = "-1647707364" + ) + @Export("setSocket") + void setSocket(AbstractSocket var1) { + this.socket = var1; + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2099753174" + garbageValue = "355652466" ) @Export("close") void close() { - if (this.socket != null) { // L: 66 - this.socket.close(); // L: 67 - this.socket = null; // L: 68 + if (this.socket != null) { + this.socket.close(); + this.socket = null; } - } // L: 70 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1099127678" + garbageValue = "-1757409709" ) @Export("removeSocket") void removeSocket() { - this.socket = null; // L: 73 - } // L: 74 + this.socket = null; + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Llk;", - garbageValue = "526936130" + descriptor = "(I)Llp;", + garbageValue = "-1467862512" ) @Export("getSocket") AbstractSocket getSocket() { - return this.socket; // L: 77 + return this.socket; } - @ObfuscatedName("m") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1259341442" + descriptor = "(II)I", + garbageValue = "-330695328" ) - static boolean method2496(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 689 + public static int method2117(int var0) { + return class345.field3945[var0 & 16383]; } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - garbageValue = "22" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 8954 - if (Client.menuOptionsCount < 500) { // L: 8955 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 8956 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8957 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8958 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8959 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8960 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8961 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8962 - ++Client.menuOptionsCount; // L: 8963 - } - - } - } // L: 8965 - - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-277336927" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class20.loadInterface(var0)) { // L: 10365 - MenuAction.updateInterface(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10366 - } - } // L: 10367 } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 22a3218857..8167bb48fd 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -4,113 +4,451 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("ez") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("ParamDefinition_archive") - public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("e") + static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("ParamDefinition_cached") - static EvictingDualNodeHashTable ParamDefinition_cached; + public static EvictingDualNodeHashTable ParamDefinition_cached; @ObfuscatedName("v") @Export("type") char type; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1782057793 + intValue = 1130811289 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("autoDisable") boolean autoDisable; static { - ParamDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 + ParamDefinition_cached = new EvictingDualNodeHashTable(64); } ParamComposition() { - this.autoDisable = true; // L: 16 - } // L: 18 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-117" - ) - @Export("postDecode") - void postDecode() { - } // L: 31 + this.autoDisable = true; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;B)V", - garbageValue = "-90" + descriptor = "(I)V", + garbageValue = "1647654534" + ) + @Export("postDecode") + void postDecode() { + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "-29" ) @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(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 37 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "-101" + descriptor = "(Lnv;II)V", + garbageValue = "117273519" ) @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 + if (var2 == 1) { + byte var4 = var1.readByte(); + int var5 = var4 & 255; + if (var5 == 0) { throw new IllegalArgumentException("" + Integer.toString(var5, 16)); } - if (var5 >= 128 && var5 < 160) { // L: 48 - char var6 = class302.cp1252AsciiExtension[var5 - 128]; // L: 49 - if (var6 == 0) { // L: 50 + if (var5 >= 128 && var5 < 160) { + char var6 = class303.cp1252AsciiExtension[var5 - 128]; + if (var6 == 0) { var6 = '?'; } - var5 = var6; // L: 51 + var5 = var6; } - char var3 = (char)var5; // L: 53 - this.type = var3; // L: 55 - } else if (var2 == 2) { // L: 57 + char var3 = (char)var5; + this.type = var3; + } else if (var2 == 2) { this.defaultInt = var1.readInt(); - } else if (var2 == 4) { // L: 58 + } else if (var2 == 4) { this.autoDisable = false; - } else if (var2 == 5) { // L: 59 + } else if (var2 == 5) { this.defaultStr = var1.readStringCp1252NullTerminated(); } - } // L: 61 + } - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1047624515" + garbageValue = "1900827115" ) @Export("isString") public boolean isString() { - return this.type == 's'; // L: 64 + return this.type == 's'; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1827241035" + ) + static final int method2925(int var0, int var1) { + int var2 = var0 + var1 * 57; + var2 ^= var2 << 13; + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; + } + + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "(Lfz;IIII)V", + garbageValue = "-16711936" + ) + static void method2926(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Decimator.clientPreferences.areaSoundEffectsVolume != 0) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + int var4 = var0.soundEffects[var1]; + if (var4 != 0) { + int var5 = var4 >> 8; + int var6 = var4 >> 4 & 7; + int var7 = var4 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var5; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var8 = (var2 - 64) / 128; + int var9 = (var3 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); + ++Client.soundEffectCount; + } + } + } + } + + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "(Lbb;III)V", + garbageValue = "2001750026" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = World.SequenceDefinition_get(var1).field1875; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1056 = 0; + } + + if (var3 == 2) { + var0.field1056 = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || World.SequenceDefinition_get(var1).field1863 >= World.SequenceDefinition_get(var0.sequence).field1863) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1056 = 0; + var0.field1066 = var0.pathLength; + } + + } + + @ObfuscatedName("hu") + @ObfuscatedSignature( + descriptor = "(ZLnu;B)V", + garbageValue = "-60" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field528 = 0; + Client.field500 = 0; + PacketBuffer var2 = Client.packetWriter.packetBuffer; + var2.importIndex(); + int var3 = var2.readBits(8); + int var4; + if (var3 < Client.npcCount) { + for (var4 = var3; var4 < Client.npcCount; ++var4) { + Client.field627[++Client.field528 - 1] = Client.npcIndices[var4]; + } + } + + if (var3 > Client.npcCount) { + throw new RuntimeException(""); + } else { + Client.npcCount = 0; + + int var5; + int var7; + int var8; + int var9; + int var10; + int var11; + for (var4 = 0; var4 < var3; ++var4) { + var5 = Client.npcIndices[var4]; + NPC var16 = Client.npcs[var5]; + var7 = var2.readBits(1); + if (var7 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; + } else { + var8 = var2.readBits(2); + if (var8 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; + Client.field474[++Client.field500 - 1] = var5; + } else if (var8 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; + var9 = var2.readBits(3); + var16.method1956(var9, (byte)1); + var10 = var2.readBits(1); + if (var10 == 1) { + Client.field474[++Client.field500 - 1] = var5; + } + } else if (var8 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; + var9 = var2.readBits(3); + var16.method1956(var9, (byte)2); + var10 = var2.readBits(3); + var16.method1956(var10, (byte)2); + var11 = var2.readBits(1); + if (var11 == 1) { + Client.field474[++Client.field500 - 1] = var5; + } + } else if (var8 == 3) { + Client.field627[++Client.field528 - 1] = var5; + } + } + } + + class100.method2220(var0, var1); + + int var14; + for (var14 = 0; var14 < Client.field500; ++var14) { + var3 = Client.field474[var14]; + NPC var15 = Client.npcs[var3]; + var5 = var1.readUnsignedByte(); + if ((var5 & 128) != 0) { + var15.field1062 = var1.method6690(); + var15.field1064 = var1.method6690(); + var15.field1063 = var1.method6689(); + var15.field1065 = var1.method6644(); + var15.field1073 = var1.method6785() + Client.cycle; + var15.field1067 = var1.readUnsignedShort() + Client.cycle; + var15.field1050 = var1.readUnsignedShort(); + var15.pathLength = 1; + var15.field1066 = 0; + var15.field1062 += var15.pathX[0]; + var15.field1064 += var15.pathY[0]; + var15.field1063 += var15.pathX[0]; + var15.field1065 += var15.pathY[0]; + } + + int var6; + if ((var5 & 32) != 0) { + var6 = var1.readUnsignedShort(); + var7 = var1.method6697(); + var8 = var15.x - (var6 - GrandExchangeOfferNameComparator.baseX - GrandExchangeOfferNameComparator.baseX) * 64; + var9 = var15.y - (var7 - NPC.baseY - NPC.baseY) * 64; + if (var8 != 0 || var9 != 0) { + var15.field1048 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; + } + } + + if ((var5 & 64) != 0) { + var15.definition = UserComparator6.getNpcDefinition(var1.readUnsignedShort()); + var15.field1023 = var15.definition.size; + var15.field1074 = var15.definition.rotation; + var15.walkSequence = var15.definition.walkSequence; + var15.walkBackSequence = var15.definition.walkBackSequence; + var15.walkLeftSequence = var15.definition.walkLeftSequence; + var15.walkRightSequence = var15.definition.walkRightSequence; + var15.idleSequence = var15.definition.idleSequence; + var15.turnLeftSequence = var15.definition.turnLeftSequence; + var15.turnRightSequence = var15.definition.turnRightSequence; + } + + if ((var5 & 16) != 0) { + var6 = var1.method6697(); + if (var6 == 65535) { + var6 = -1; + } + + var7 = var1.readUnsignedByte(); + if (var6 == var15.sequence && var6 != -1) { + var8 = World.SequenceDefinition_get(var6).field1875; + if (var8 == 1) { + var15.sequenceFrame = 0; + var15.sequenceFrameCycle = 0; + var15.sequenceDelay = var7; + var15.field1056 = 0; + } + + if (var8 == 2) { + var15.field1056 = 0; + } + } else if (var6 == -1 || var15.sequence == -1 || World.SequenceDefinition_get(var6).field1863 >= World.SequenceDefinition_get(var15.sequence).field1863) { + var15.sequence = var6; + var15.sequenceFrame = 0; + var15.sequenceFrameCycle = 0; + var15.sequenceDelay = var7; + var15.field1056 = 0; + var15.field1066 = var15.pathLength; + } + } + + if ((var5 & 1) != 0) { + var6 = var1.method6686(); + int var12; + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var9 = -1; + var10 = -1; + var11 = -1; + var8 = var1.readUShortSmart(); + if (var8 == 32767) { + var8 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + var9 = var1.readUShortSmart(); + var11 = var1.readUShortSmart(); + } else if (var8 != 32766) { + var10 = var1.readUShortSmart(); + } else { + var8 = -1; + } + + var12 = var1.readUShortSmart(); + var15.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); + } + } + + var7 = var1.method6873(); + if (var7 > 0) { + for (var8 = 0; var8 < var7; ++var8) { + var9 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + if (var10 != 32767) { + var11 = var1.readUShortSmart(); + var12 = var1.method6873(); + int var13 = var10 > 0 ? var1.readUnsignedByte() : var12; + var15.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); + } else { + var15.removeHealthBar(var9); + } + } + } + } + + if ((var5 & 4) != 0) { + var15.overheadText = var1.readStringCp1252NullTerminated(); + var15.overheadTextCyclesRemaining = 100; + } + + if ((var5 & 2) != 0) { + var15.spotAnimation = var1.method6785(); + var6 = var1.method6706(); + var15.field1061 = var6 >> 16; + var15.field1060 = (var6 & 65535) + Client.cycle; + var15.spotAnimationFrame = 0; + var15.spotAnimationFrameCycle = 0; + if (var15.field1060 > Client.cycle) { + var15.spotAnimationFrame = -1; + } + + if (var15.spotAnimation == 65535) { + var15.spotAnimation = -1; + } + } + + if ((var5 & 8) != 0) { + var15.targetIndex = var1.readUnsignedShort(); + if (var15.targetIndex == 65535) { + var15.targetIndex = -1; + } + } + } + + for (var14 = 0; var14 < Client.field528; ++var14) { + var3 = Client.field627[var14]; + if (Client.npcs[var3].npcCycle != Client.cycle) { + Client.npcs[var3].definition = null; + Client.npcs[var3] = null; + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var14 = 0; var14 < Client.npcCount; ++var14) { + if (Client.npcs[Client.npcIndices[var14]] == null) { + throw new RuntimeException(var14 + "," + Client.npcCount); + } + } + + } + } + } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-777740283" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } + + if (var1.length() > 9) { + return " " + ScriptFrame.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + ScriptFrame.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ScriptFrame.colorStartTag(16776960) + var1 + ""; + } + } + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1694153858" + ) + static final void method2911() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInFriendsChat(); + } + } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index c2f97110fb..092cba604b 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,268 +1,267 @@ import java.io.IOException; -import java.net.Socket; -import java.util.Arrays; -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("bq") +@ObfuscatedName("y") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("tz") - @ObfuscatedGetter( - intValue = -1656768019 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("o") - @Export("PcmPlayer_stereo") - public static boolean PcmPlayer_stereo; - @ObfuscatedName("r") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = -900105725 - ) - static int field416; - @ObfuscatedName("dj") + @ObfuscatedName("th") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lmr;" ) - @Export("archive7") - static Archive archive7; + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("n") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 601053317 + ) + static int field181; + @ObfuscatedName("ms") + @ObfuscatedGetter( + intValue = -1026690965 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("nk") + @ObfuscatedGetter( + intValue = -1867053569 + ) + static int field191; @ObfuscatedName("k") @Export("samples") protected int[] samples; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lbc;" + descriptor = "Laq;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1427209561 + intValue = -573586937 ) - int field400; - @ObfuscatedName("x") + int field194; + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -1728161507642357129L + longValue = -7895856253910445283L ) @Export("timeMs") long timeMs; - @ObfuscatedName("u") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -140802569 + intValue = -297032647 ) @Export("capacity") int capacity; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -857903809 - ) - int field403; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1599565829 - ) - int field396; - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = -6258201281571484971L - ) - long field405; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1984678795 + intValue = -1767470059 ) - int field412; - @ObfuscatedName("n") + int field180; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -658055953 + intValue = 1732931535 ) - int field407; - @ObfuscatedName("l") + int field188; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1674190229 + longValue = 8043569396608000723L ) - int field413; - @ObfuscatedName("w") + long field199; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 939543839577998155L + intValue = 2116258749 ) - long field409; - @ObfuscatedName("a") - boolean field415; - @ObfuscatedName("az") + int field190; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1615466093 + intValue = 1650298129 ) - int field411; - @ObfuscatedName("ap") + int field187; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1792598755 + ) + int field192; + @ObfuscatedName("y") + @ObfuscatedGetter( + longValue = 2388755460855453223L + ) + long field193; + @ObfuscatedName("g") + boolean field197; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = -1290496951 + ) + int field195; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Lbc;" + descriptor = "[Laq;" ) - PcmStream[] field408; - @ObfuscatedName("ag") + PcmStream[] field196; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "[Lbc;" + descriptor = "[Laq;" ) - PcmStream[] field406; + PcmStream[] field189; protected PcmPlayer() { - this.field400 = 32; // L: 22 - this.timeMs = ClientPacket.currentTimeMillis(); // L: 23 - this.field405 = 0L; // L: 27 - this.field412 = 0; // L: 28 - this.field407 = 0; // L: 29 - this.field413 = 0; // L: 30 - this.field409 = 0L; // L: 31 - this.field415 = true; // L: 32 - this.field411 = 0; // L: 38 - this.field408 = new PcmStream[8]; // L: 39 - this.field406 = new PcmStream[8]; // L: 40 - } // L: 42 + this.field194 = 32; + this.timeMs = UrlRequester.method2125(); + this.field199 = 0L; + this.field190 = 0; + this.field187 = 0; + this.field192 = 0; + this.field193 = 0L; + this.field197 = true; + this.field195 = 0; + this.field196 = new PcmStream[8]; + this.field189 = new PcmStream[8]; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "86" + descriptor = "(I)V", + garbageValue = "-1805977814" ) @Export("init") protected void init() throws Exception { - } // L: 277 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-412057865" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("open") protected void open(int var1) throws Exception { - } // L: 278 + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "19" + garbageValue = "0" ) @Export("position") protected int position() throws Exception { - return this.capacity; // L: 281 + return this.capacity; } - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("write") protected void write() throws Exception { - } // L: 284 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2004376502" - ) - @Export("close") - protected void close() { - } // L: 285 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1448704014" - ) - @Export("discard") - protected void discard() throws Exception { - } // L: 286 + } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lbc;B)V", - garbageValue = "82" + descriptor = "(I)V", + garbageValue = "168869451" + ) + @Export("close") + protected void close() { + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1574083924" + ) + @Export("discard") + protected void discard() throws Exception { + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Laq;B)V", + garbageValue = "91" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { - this.stream = var1; // L: 76 - } // L: 77 + this.stream = var1; + } - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2069251377" + garbageValue = "1727517788" ) @Export("run") public final synchronized void run() { - if (this.samples != null) { // L: 80 - long var1 = ClientPacket.currentTimeMillis(); // L: 81 + if (this.samples != null) { + long var1 = UrlRequester.method2125(); try { - if (0L != this.field405) { // L: 83 - if (var1 < this.field405) { // L: 84 + if (this.field199 != 0L) { + if (var1 < this.field199) { return; } - this.open(this.capacity); // L: 85 - this.field405 = 0L; // L: 86 - this.field415 = true; // L: 87 + this.open(this.capacity); + this.field199 = 0L; + this.field197 = true; } - int var3 = this.position(); // L: 89 - if (this.field413 - var3 > this.field412) { // L: 90 - this.field412 = this.field413 - var3; + int var3 = this.position(); + if (this.field192 - var3 > this.field190) { + this.field190 = this.field192 - var3; } - int var4 = this.field403 + this.field396; // L: 91 - if (var4 + 256 > 16384) { // L: 92 + int var4 = this.field180 + this.field188; + if (var4 + 256 > 16384) { var4 = 16128; } - if (var4 + 256 > this.capacity) { // L: 93 - this.capacity += 1024; // L: 94 - if (this.capacity > 16384) { // L: 95 + if (var4 + 256 > this.capacity) { + this.capacity += 1024; + if (this.capacity > 16384) { this.capacity = 16384; } - this.close(); // L: 96 - this.open(this.capacity); // L: 97 - var3 = 0; // L: 98 - this.field415 = true; // L: 99 - if (var4 + 256 > this.capacity) { // L: 100 - var4 = this.capacity - 256; // L: 101 - this.field396 = var4 - this.field403; // L: 102 + this.close(); + this.open(this.capacity); + var3 = 0; + this.field197 = true; + if (var4 + 256 > this.capacity) { + var4 = this.capacity - 256; + this.field188 = var4 - this.field180; } } - while (var3 < var4) { // L: 105 - this.fill(this.samples, 256); // L: 106 - this.write(); // L: 107 - var3 += 256; // L: 108 + while (var3 < var4) { + this.fill(this.samples, 256); + this.write(); + var3 += 256; } - if (var1 > this.field409) { // L: 110 - if (!this.field415) { // L: 111 - if (this.field412 == 0 && this.field407 == 0) { // L: 112 - this.close(); // L: 113 - this.field405 = var1 + 2000L; // L: 114 - return; // L: 115 + if (var1 > this.field193) { + if (!this.field197) { + if (this.field190 == 0 && this.field187 == 0) { + this.close(); + this.field199 = var1 + 2000L; + return; } - this.field396 = Math.min(this.field407, this.field412); // L: 117 - this.field407 = this.field412; // L: 118 + this.field188 = Math.min(this.field187, this.field190); + this.field187 = this.field190; } else { - this.field415 = false; // L: 120 + this.field197 = false; } - this.field412 = 0; // L: 121 - this.field409 = 2000L + var1; // L: 122 + this.field190 = 0; + this.field193 = 2000L + var1; } - this.field413 = var3; // L: 124 - } catch (Exception var7) { // L: 126 - this.close(); // L: 127 - this.field405 = 2000L + var1; // L: 128 + this.field192 = var3; + } catch (Exception var7) { + this.close(); + this.field199 = 2000L + var1; } try { @@ -270,1105 +269,399 @@ public class PcmPlayer { var1 = this.timeMs; } - while (var1 > this.timeMs + 5000L) { // L: 132 - this.skip(256); // L: 133 - this.timeMs += (long)(256000 / class341.field3921); // L: 134 + while (var1 > 5000L + this.timeMs) { + this.skip(256); + this.timeMs += (long)(256000 / GrandExchangeOfferAgeComparator.field3633); } - } catch (Exception var6) { // L: 137 - this.timeMs = var1; // L: 138 + } catch (Exception var6) { + this.timeMs = var1; } } - } // L: 140 + } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1732163057" + garbageValue = "-1587146219" ) - public final void method844() { - this.field415 = true; // L: 143 - } // L: 144 + public final void method479() { + this.field197 = true; + } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1915909212" + descriptor = "(B)V", + garbageValue = "15" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field415 = true; // L: 147 + this.field197 = true; try { - this.discard(); // L: 149 - } catch (Exception var2) { // L: 151 - this.close(); // L: 152 - this.field405 = ClientPacket.currentTimeMillis() + 2000L; // L: 153 + this.discard(); + } catch (Exception var2) { + this.close(); + this.field199 = UrlRequester.method2125() + 2000L; } - } // L: 155 + } - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2141825819" + garbageValue = "-440601518" ) @Export("shutdown") public final synchronized void shutdown() { - if (Login.soundSystem != null) { // L: 158 - boolean var1 = true; // L: 159 + if (BoundaryObject.soundSystem != null) { + boolean var1 = true; - for (int var2 = 0; var2 < 2; ++var2) { // L: 160 - if (this == Login.soundSystem.players[var2]) { // L: 161 - Login.soundSystem.players[var2] = null; + for (int var2 = 0; var2 < 2; ++var2) { + if (this == BoundaryObject.soundSystem.players[var2]) { + BoundaryObject.soundSystem.players[var2] = null; } - if (Login.soundSystem.players[var2] != null) { // L: 162 + if (BoundaryObject.soundSystem.players[var2] != null) { var1 = false; } } - if (var1) { // L: 164 - soundSystemExecutor.shutdownNow(); // L: 165 - soundSystemExecutor = null; // L: 166 - Login.soundSystem = null; // L: 167 + if (var1) { + ArchiveDisk.soundSystemExecutor.shutdownNow(); + ArchiveDisk.soundSystemExecutor = null; + BoundaryObject.soundSystem = null; } } - this.close(); // L: 170 - this.samples = null; // L: 171 - } // L: 172 + this.close(); + this.samples = null; + } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "120" + descriptor = "(II)V", + garbageValue = "-942351277" ) @Export("skip") final void skip(int var1) { - this.field411 -= var1; // L: 175 - if (this.field411 < 0) { - this.field411 = 0; // L: 176 + this.field195 -= var1; + if (this.field195 < 0) { + this.field195 = 0; } if (this.stream != null) { - this.stream.skip(var1); // L: 177 + this.stream.skip(var1); } - } // L: 178 + } - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; // L: 182 - if (PcmPlayer_stereo) { // L: 183 + int var3 = var2; + if (PcmPlayer_stereo) { var3 = var2 << 1; } - class307.clearIntArray(var1, 0, var3); // L: 184 - this.field411 -= var2; // L: 185 - if (this.stream != null && this.field411 <= 0) { // L: 186 - this.field411 += class341.field3921 >> 4; // L: 187 - NetFileRequest.PcmStream_disable(this.stream); // L: 188 - this.method843(this.stream, this.stream.vmethod1099()); // L: 189 - int var4 = 0; // L: 190 - int var5 = 255; // L: 191 + class308.clearIntArray(var1, 0, var3); + this.field195 -= var2; + if (this.stream != null && this.field195 <= 0) { + this.field195 += GrandExchangeOfferAgeComparator.field3633 >> 4; + Canvas.PcmStream_disable(this.stream); + this.method449(this.stream, this.stream.vmethod716()); + int var4 = 0; + int var5 = 255; int var6; PcmStream var10; - label109: - for (var6 = 7; var5 != 0; --var6) { // L: 192 + label110: + for (var6 = 7; var5 != 0; --var6) { int var7; int var8; - if (var6 < 0) { // L: 195 - var7 = var6 & 3; // L: 196 - var8 = -(var6 >> 2); // L: 197 + if (var6 < 0) { + var7 = var6 & 3; + var8 = -(var6 >> 2); } else { - var7 = var6; // L: 200 - var8 = 0; // L: 201 + var7 = var6; + var8 = 0; } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 203 205 - if ((var9 & 1) != 0) { // L: 208 - var5 &= ~(1 << var7); // L: 211 - var10 = null; // L: 212 - PcmStream var11 = this.field408[var7]; // L: 213 + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { + if ((var9 & 1) != 0) { + var5 &= ~(1 << var7); + var10 = null; + PcmStream var11 = this.field196[var7]; - label103: + label104: while (true) { while (true) { - if (var11 == null) { // L: 214 - break label103; + if (var11 == null) { + break label104; } - AbstractSound var12 = var11.sound; // L: 215 - if (var12 != null && var12.position > var8) { // L: 216 - var5 |= 1 << var7; // L: 217 - var10 = var11; // L: 218 - var11 = var11.after; // L: 219 + AbstractSound var12 = var11.sound; + if (var12 != null && var12.position > var8) { + var5 |= 1 << var7; + var10 = var11; + var11 = var11.after; } else { - var11.active = true; // L: 222 - int var13 = var11.vmethod4740(); // L: 223 - var4 += var13; // L: 224 - if (var12 != null) { // L: 225 + var11.active = true; + int var13 = var11.vmethod4662(); + var4 += var13; + if (var12 != null) { var12.position += var13; } - if (var4 >= this.field400) { // L: 226 - break label109; + if (var4 >= this.field194) { + break label110; } - PcmStream var14 = var11.firstSubStream(); // L: 227 - if (var14 != null) { // L: 228 - for (int var15 = var11.field473; var14 != null; var14 = var11.nextSubStream()) { // L: 229 230 232 - this.method843(var14, var15 * var14.vmethod1099() >> 8); // L: 231 + PcmStream var14 = var11.firstSubStream(); + if (var14 != null) { + for (int var15 = var11.field253; var14 != null; var14 = var11.nextSubStream()) { + this.method449(var14, var15 * var14.vmethod716() >> 8); } } - PcmStream var18 = var11.after; // L: 235 - var11.after = null; // L: 236 - if (var10 == null) { // L: 237 - this.field408[var7] = var18; + PcmStream var18 = var11.after; + var11.after = null; + if (var10 == null) { + this.field196[var7] = var18; } else { - var10.after = var18; // L: 238 + var10.after = var18; } - if (var18 == null) { // L: 239 - this.field406[var7] = var10; + if (var18 == null) { + this.field189[var7] = var10; } - var11 = var18; // L: 240 + var11 = var18; } } } } - var7 += 4; // L: 204 + var7 += 4; ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { // L: 244 - PcmStream var16 = this.field408[var6]; // L: 245 - PcmStream[] var17 = this.field408; // L: 246 - this.field406[var6] = null; // L: 248 + for (var6 = 0; var6 < 8; ++var6) { + PcmStream var16 = this.field196[var6]; + PcmStream[] var17 = this.field196; + this.field189[var6] = null; - for (var17[var6] = null; var16 != null; var16 = var10) { // L: 249 250 253 - var10 = var16.after; // L: 251 - var16.after = null; // L: 252 + for (var17[var6] = null; var16 != null; var16 = var10) { + var10 = var16.after; + var16.after = null; } } } - if (this.field411 < 0) { // L: 257 - this.field411 = 0; + if (this.field195 < 0) { + this.field195 = 0; } - if (this.stream != null) { // L: 258 + if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = ClientPacket.currentTimeMillis(); // L: 259 - } // L: 260 - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Lbc;II)V", - garbageValue = "176073519" - ) - final void method843(PcmStream var1, int var2) { - int var3 = var2 >> 5; // L: 269 - PcmStream var4 = this.field406[var3]; // L: 270 - if (var4 == null) { // L: 271 - this.field408[var3] = var1; - } else { - var4.after = var1; // L: 272 - } - - this.field406[var3] = var1; // L: 273 - var1.field473 = var2; // L: 274 - } // L: 275 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - public static void method856(int var0) { - class233.musicPlayerStatus = 1; // L: 60 - InvDefinition.musicTrackArchive = null; // L: 61 - class233.musicTrackGroupId = -1; // L: 62 - class233.musicTrackFileId = -1; // L: 63 - class233.musicTrackVolume = 0; // L: 64 - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = false; // L: 65 - FaceNormal.pcmSampleLength = var0; // L: 66 - } // L: 67 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1170967176" - ) - public static void method893() { - KitDefinition.KitDefinition_cached.clear(); // L: 130 - } // L: 131 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;III)Llk;", - garbageValue = "1530151189" - ) - public static AbstractSocket method897(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); // L: 10 + this.timeMs = UrlRequester.method2125(); } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1965845813" + descriptor = "(Laq;II)V", + garbageValue = "-1568864681" ) - static int method898(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { // L: 4365 - ChatChannel.Interpreter_intStackSize -= 5; // L: 4366 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4367 - return 1; // L: 4368 - } else if (var0 == 7204) { // L: 4370 - ChatChannel.Interpreter_intStackSize -= 6; // L: 4371 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4372 - return 1; // L: 4373 - } else if (var0 >= 7205 && var0 < 7209) { // L: 4375 - Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4376 - return 1; // L: 4377 - } else if (var0 == 7209) { // L: 4379 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4380 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4381 - return 1; // L: 4382 - } else if (var0 >= 7210 && var0 < 7214) { // L: 4384 - --ChatChannel.Interpreter_intStackSize; // L: 4385 - return 1; // L: 4386 - } else if (var0 == 7214) { // L: 4388 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4389 - return 1; // L: 4390 + final void method449(PcmStream var1, int var2) { + int var3 = var2 >> 5; + PcmStream var4 = this.field189[var3]; + if (var4 == null) { + this.field196[var3] = var1; } else { - return 2; // L: 4392 + var4.after = var1; + } + + this.field189[var3] = var1; + var1.field253 = var2; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Lew;", + garbageValue = "-890968255" + ) + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("fn") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-998429895" + descriptor = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "-1523482929" ) - static void method895() { - Client.mouseLastLastPressedTimeMillis = -1L; // L: 2921 - UrlRequester.mouseRecorder.index = 0; // L: 2922 - class397.hasFocus = true; // L: 2923 - Client.hadFocus = true; // L: 2924 - Client.field850 = -1L; // L: 2925 - Decimator.method1160(); // L: 2926 - Client.packetWriter.clearBuffer(); // L: 2927 - Client.packetWriter.packetBuffer.offset = 0; // L: 2928 - Client.packetWriter.serverPacket = null; // L: 2929 - Client.packetWriter.field1410 = null; // L: 2930 - Client.packetWriter.field1411 = null; // L: 2931 - Client.packetWriter.field1399 = null; // L: 2932 - Client.packetWriter.serverPacketLength = 0; // L: 2933 - Client.packetWriter.field1408 = 0; // L: 2934 - Client.rebootTimer = 0; // L: 2935 - Client.logoutTimer = 0; // L: 2936 - Client.hintArrowType = 0; // L: 2937 - class34.method407(); // L: 2938 - MouseHandler.MouseHandler_idleCycles = 0; // L: 2940 - class69.method1208(); // L: 2942 - Client.isItemSelected = 0; // L: 2943 - Client.isSpellSelected = false; // L: 2944 - Client.soundEffectCount = 0; // L: 2945 - Client.camAngleY = 0; // L: 2946 - Client.oculusOrbState = 0; // L: 2947 - LoginPacket.field2800 = null; // L: 2948 - Client.minimapState = 0; // L: 2949 - Client.field853 = -1; // L: 2950 - Client.destinationX = 0; // L: 2951 - Client.destinationY = 0; // L: 2952 - Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2953 - Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2954 - Client.npcCount = 0; // L: 2955 - SoundCache.method928(); // L: 2956 + static boolean method510(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); - int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 2957 - Client.players[var0] = null; - } + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } - for (var0 = 0; var0 < 32768; ++var0) { // L: 2958 - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; // L: 2959 - Client.projectiles.clear(); // L: 2960 - Client.graphicsObjects.clear(); // L: 2961 - - for (var0 = 0; var0 < 4; ++var0) { // L: 2962 - for (int var4 = 0; var4 < 104; ++var4) { // L: 2963 - for (int var2 = 0; var2 < 104; ++var2) { // L: 2964 - Client.groundItems[var0][var4][var2] = null; // L: 2965 + if (var8 == '+') { + continue; + } } - } - } - Client.pendingSpawns = new NodeDeque(); // L: 2969 - DevicePcmPlayerProvider.friendSystem.clear(); // L: 2970 - - for (var0 = 0; var0 < SoundSystem.VarpDefinition_fileCount; ++var0) { // L: 2971 - VarpDefinition var1 = class1.VarpDefinition_get(var0); // L: 2972 - if (var1 != null) { // L: 2973 - Varps.Varps_temp[var0] = 0; // L: 2974 - Varps.Varps_main[var0] = 0; // L: 2975 - } - } - - class20.varcs.clearTransient(); // L: 2978 - Client.followerIndex = -1; // L: 2979 - if (Client.rootInterface != -1) { // L: 2980 - class44.method540(Client.rootInterface); - } - - for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2981 - InvDefinition.closeInterface(var3, true); // L: 2982 - } - - Client.rootInterface = -1; // L: 2984 - Client.interfaceParents = new NodeHashTable(8); // L: 2985 - Client.meslayerContinueWidget = null; // L: 2986 - class34.method407(); // L: 2987 - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2988 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2989 - Client.playerMenuActions[var0] = null; // L: 2990 - Client.playerOptionsPriorities[var0] = false; // L: 2991 - } - - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2994 - Client.isLoading = true; // L: 2996 - - for (var0 = 0; var0 < 100; ++var0) { // L: 2997 - Client.field831[var0] = true; - } - - BufferedSink.method5992(); // L: 2998 - class289.friendsChat = null; // L: 2999 - WorldMapManager.guestClanSettings = null; // L: 3000 - Arrays.fill(Client.currentClanSettings, (Object)null); // L: 3001 - AttackOption.guestClanChannel = null; // L: 3002 - Arrays.fill(Client.currentClanChannels, (Object)null); // L: 3003 - - for (var0 = 0; var0 < 8; ++var0) { // L: 3004 - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - class267.grandExchangeEvents = null; // L: 3005 - } // L: 3006 - - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1475129816" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); // L: 3078 - MouseRecorder.method2202(); // L: 3080 - UserComparator7.method2539(); // L: 3081 - method893(); // L: 3082 - CollisionMap.method3245(); // L: 3083 - class143.method2811(); // L: 3084 - Projectile.method2075(); // L: 3085 - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 3087 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 3088 - MenuAction.method2028(); // L: 3090 - VarbitComposition.VarbitDefinition_cached.clear(); // L: 3092 - class69.method1224(); // L: 3094 - class27.field215.method6474(); // L: 3095 - class26.HitSplatDefinition_cachedSprites.method6474(); // L: 3096 - class171.method3613(); // L: 3097 - Decimator.method1168(); // L: 3098 - SoundSystem.method916(); // L: 3099 - Players.method2402(); // L: 3100 - WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 3102 - PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 3105 - Widget.Widget_cachedSprites.clear(); // L: 3108 - Widget.Widget_cachedModels.clear(); // L: 3109 - Widget.Widget_cachedFonts.clear(); // L: 3110 - Widget.Widget_cachedSpriteMasks.clear(); // L: 3111 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3113 - Script.Script_cached.clear(); // L: 3114 - ClanChannel.archive0.clearFiles(); // L: 3115 - KitDefinition.archive1.clearFiles(); // L: 3116 - class18.archive3.clearFiles(); // L: 3117 - class26.archive4.clearFiles(); // L: 3118 - class4.archive5.clearFiles(); // L: 3119 - DynamicObject.archive6.clearFiles(); // L: 3120 - archive7.clearFiles(); // L: 3121 - ModeWhere.archive8.clearFiles(); // L: 3122 - class16.archive9.clearFiles(); // L: 3123 - JagexCache.archive10.clearFiles(); // L: 3124 - class160.archive11.clearFiles(); // L: 3125 - Varcs.archive12.clearFiles(); // L: 3126 - DevicePcmPlayerProvider.scene.clear(); // L: 3128 - - for (int var0 = 0; var0 < 4; ++var0) { // L: 3129 - Client.collisionMaps[var0].clear(); - } - - System.gc(); // L: 3130 - method856(2); // L: 3131 - Client.currentTrackGroupId = -1; // L: 3132 - Client.field862 = false; // L: 3133 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 3135 - if (var1.stream1 != null) { // L: 3136 - UserComparator7.pcmStreamMixer.removeSubStream(var1.stream1); // L: 3137 - var1.stream1 = null; // L: 3138 - } - - if (var1.stream2 != null) { // L: 3140 - UserComparator7.pcmStreamMixer.removeSubStream(var1.stream2); // L: 3141 - var1.stream2 = null; // L: 3142 - } - } - - ObjectSound.objectSounds.clear(); // L: 3145 - Projectile.updateGameState(10); // L: 3147 - } // L: 3148 - - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "([Liv;IIIIIIIII)V", - garbageValue = "-1362986911" - ) - @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: 9390 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9391 - - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9392 - Widget var10 = var0[var9]; // L: 9393 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9394 9395 - int var11; - if (var8 == -1) { // L: 9397 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9398 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9399 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9400 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9401 - var11 = ++Client.rootWidgetCount - 1; // L: 9402 + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; } else { - var11 = var8; // L: 9404 + if (var8 < 'a' || var8 > 'z') { + return false; + } + + var10 = var8 - 'W'; } - var10.rootIndex = var11; // L: 9405 - var10.cycle = Client.cycle; // L: 9406 - if (!var10.isIf3 || !class35.isComponentHidden(var10)) { // L: 9407 - if (var10.contentType > 0) { // L: 9408 - class309.method5671(var10); - } - - int var12 = var10.x + var6; // L: 9409 - int var13 = var7 + var10.y; // L: 9410 - int var14 = var10.transparencyTop; // L: 9411 - int var15; - int var16; - if (var10 == Client.clickedWidget) { // L: 9412 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9413 - WorldMapCacheName.field2135 = var0; // L: 9414 - Clock.field1538 = var6; // L: 9415 - Canvas.field296 = var7; // L: 9416 - continue; // L: 9417 - } - - if (Client.isDraggingWidget && Client.field821) { // L: 9419 - var15 = MouseHandler.MouseHandler_x; // L: 9420 - var16 = MouseHandler.MouseHandler_y; // L: 9421 - var15 -= Client.widgetClickX; // L: 9422 - var16 -= Client.widgetClickY; // L: 9423 - if (var15 < Client.field801) { // L: 9424 - var15 = Client.field801; - } - - if (var15 + var10.width > Client.field801 + Client.clickedWidgetParent.width) { // L: 9425 - var15 = Client.field801 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field802) { // L: 9426 - var16 = Client.field802; - } - - if (var16 + var10.height > Client.field802 + Client.clickedWidgetParent.height) { // L: 9427 - var16 = Client.field802 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; // L: 9428 - var13 = var16; // L: 9429 - } - - if (!var10.isScrollBar) { // L: 9431 - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { // L: 9437 - var15 = var2; // L: 9438 - var16 = var3; // L: 9439 - var17 = var4; // L: 9440 - var18 = var5; // L: 9441 - } else if (var10.type == 9) { // L: 9443 - var19 = var12; // L: 9444 - var20 = var13; // L: 9445 - var21 = var12 + var10.width; // L: 9446 - var22 = var13 + var10.height; // L: 9447 - if (var21 < var12) { // L: 9448 - var19 = var21; // L: 9450 - var21 = var12; // L: 9451 - } - - if (var22 < var13) { // L: 9453 - var20 = var22; // L: 9455 - var22 = var13; // L: 9456 - } - - ++var21; // L: 9458 - ++var22; // L: 9459 - var15 = var19 > var2 ? var19 : var2; // L: 9460 - var16 = var20 > var3 ? var20 : var3; // L: 9461 - var17 = var21 < var4 ? var21 : var4; // L: 9462 - var18 = var22 < var5 ? var22 : var5; // L: 9463 - } else { - var19 = var12 + var10.width; // L: 9466 - var20 = var13 + var10.height; // L: 9467 - var15 = var12 > var2 ? var12 : var2; // L: 9468 - var16 = var13 > var3 ? var13 : var3; // L: 9469 - var17 = var19 < var4 ? var19 : var4; // L: 9470 - var18 = var20 < var5 ? var20 : var5; // L: 9471 - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9473 - if (var10.contentType != 0) { // L: 9474 - if (var10.contentType == 1336) { // L: 9475 - if (Client.displayFps) { // L: 9476 - var13 += 15; // L: 9477 - AbstractSocket.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9478 - var13 += 15; // L: 9479 - Runtime var42 = Runtime.getRuntime(); // L: 9480 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9481 - var21 = 16776960; // L: 9482 - if (var20 > 327680 && !Client.isLowDetail) { // L: 9483 - var21 = 16711680; - } - - AbstractSocket.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9484 - var13 += 15; // L: 9485 - } - continue; - } - - if (var10.contentType == 1337) { // L: 9489 - Client.viewportX = var12; // L: 9490 - Client.viewportY = var13; // L: 9491 - UserComparator9.drawEntities(var12, var13, var10.width, var10.height); // L: 9492 - Client.field831[var10.rootIndex] = true; // L: 9493 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9494 - continue; // L: 9495 - } - - if (var10.contentType == 1338) { // L: 9497 - FloorOverlayDefinition.drawMinimap(var10, var12, var13, var11); // L: 9498 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9499 - continue; // L: 9500 - } - - if (var10.contentType == 1339) { // L: 9502 - IsaacCipher.drawCompass(var10, var12, var13, var11); // L: 9503 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9504 - continue; // L: 9505 - } - - if (var10.contentType == 1400) { // L: 9507 - class80.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9508 - } - - if (var10.contentType == 1401) { // L: 9510 - class80.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9511 - } - - if (var10.contentType == 1402) { // L: 9513 - PendingSpawn.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9514 - } - } - - if (var10.type == 0) { // L: 9517 - if (!var10.isIf3 && class35.isComponentHidden(var10) && var10 != MusicPatchNode.mousedOverWidgetIf1) { // L: 9518 - continue; - } - - if (!var10.isIf3) { // L: 9519 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9520 - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { // L: 9521 - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9523 - if (var10.children != null) { // L: 9524 - 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: 9525 - if (var30 != null) { // L: 9526 - SoundSystem.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9527 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9529 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9530 - } - - if (Client.isResizable || Client.field833[var11] || Client.gameDrawingMode > 1) { // L: 9532 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9533 9534 - BufferedSource.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { // L: 9536 - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { // L: 9539 - var19 = 0; // L: 9540 - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9541 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9542 - var22 = var12 + var21 * (var10.paddingX + 32); // L: 9543 - var23 = var20 * (var10.paddingY + 32) + var13; // L: 9544 - if (var19 < 20) { // L: 9545 - var22 += var10.inventoryXOffsets[var19]; // L: 9546 - var23 += var10.inventoryYOffsets[var19]; // L: 9547 - } - - if (var10.itemIds[var19] <= 0) { // L: 9549 - if (var10.inventorySprites != null && var19 < 20) { // L: 9594 - SpritePixels var46 = var10.getInventorySprite(var19); // L: 9595 - if (var46 != null) { // L: 9596 - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2958) { // L: 9597 - Script.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; // L: 9550 - boolean var38 = false; // L: 9551 - var26 = var10.itemIds[var19] - 1; // L: 9552 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == VerticalAlignment.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9553 - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == Timer.selectedItemSlot && var10.id == class246.selectedItemWidget) { // L: 9555 - var35 = SpotAnimationDefinition.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = SpotAnimationDefinition.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9556 - } - - if (var35 != null) { // L: 9557 - if (var10 == VerticalAlignment.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9558 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9559 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9560 - if (var24 < 5 && var24 > -5) { // L: 9561 - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { // L: 9562 - var25 = 0; - } - - if (Client.itemDragDuration < 5) { // L: 9563 - var24 = 0; // L: 9564 - var25 = 0; // L: 9565 - } - - var35.drawTransAt(var22 + var24, var23 + var25, 128); // L: 9567 - if (var1 != -1) { // L: 9568 - Widget var28 = var0[var1 & 65535]; // L: 9569 - int var29; - if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9570 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field683 / 3; // L: 9571 - if (var29 > Client.field683 * 10) { // L: 9572 - var29 = Client.field683 * 10; - } - - if (var29 > var28.scrollY) { // L: 9573 - var29 = var28.scrollY; - } - - var28.scrollY -= var29; // L: 9574 - Client.draggedWidgetY += var29; // L: 9575 - Script.invalidateWidget(var28); // L: 9576 - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9578 - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field683 / 3; // L: 9579 - if (var29 > Client.field683 * 10) { // L: 9580 - var29 = Client.field683 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9581 - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; // L: 9582 - Client.draggedWidgetY -= var29; // L: 9583 - Script.invalidateWidget(var28); // L: 9584 - } - } - } else if (var10 == Login.field1034 && var19 == Client.field729) { // L: 9588 - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); // L: 9589 - } - } else { - Script.invalidateWidget(var10); // L: 9591 - } - } - } - - ++var19; // L: 9599 - } - } - } else if (var10.type == 3) { // L: 9604 - if (Friend.runCs1(var10)) { // L: 9606 - var19 = var10.color2; // L: 9607 - if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9608 - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; // L: 9611 - if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9612 - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { // L: 9614 - switch(var10.fillMode.field4242) { // L: 9615 - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9624 - break; // L: 9625 - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9621 - break; // L: 9622 - default: - if (var14 == 0) { // L: 9617 - 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: 9618 - } - } - } else if (var14 == 0) { // L: 9629 - 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: 9630 - } - } else { - Font var39; - if (var10.type == 4) { // L: 9634 - var39 = var10.getFont(); // L: 9635 - if (var39 == null) { // L: 9636 - if (Widget.field2958) { // L: 9637 - Script.invalidateWidget(var10); - } - } else { - String var44 = var10.text; // L: 9641 - if (Friend.runCs1(var10)) { // L: 9642 - var20 = var10.color2; // L: 9643 - if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9644 - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { // L: 9645 - var44 = var10.text2; - } - } else { - var20 = var10.color; // L: 9648 - if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9649 - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { // L: 9651 - ItemComposition var45 = class250.ItemDefinition_get(var10.itemId); // L: 9652 - var44 = var45.name; // L: 9653 - if (var44 == null) { // L: 9654 - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9655 - var44 = SecureRandomFuture.colorStartTag(16748608) + var44 + "" + " " + 'x' + MusicPatchNode.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { // L: 9657 - var44 = "Please wait..."; // L: 9658 - var20 = var10.color; // L: 9659 - } - - if (!var10.isIf3) { // L: 9661 - var44 = ItemContainer.method2184(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9662 - } - } else if (var10.type == 5) { // L: 9665 - SpritePixels var40; - if (!var10.isIf3) { // L: 9666 - var40 = var10.getSprite(Friend.runCs1(var10)); // L: 9667 - if (var40 != null) { // L: 9668 - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2958) { // L: 9669 - Script.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { // L: 9673 - var40 = SpotAnimationDefinition.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); // L: 9674 - } - - if (var40 == null) { // L: 9675 - if (Widget.field2958) { // L: 9699 - Script.invalidateWidget(var10); - } - } else { - var20 = var40.width; // L: 9676 - var21 = var40.height; // L: 9677 - if (!var10.spriteTiling) { // L: 9678 - var22 = var10.width * 4096 / var20; // L: 9692 - if (var10.spriteAngle != 0) { // L: 9693 - var40.method7097(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 9694 - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 9695 - var40.drawTransBgAt(var12, var13); // L: 9696 - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9679 - var22 = (var20 - 1 + var10.width) / var20; // L: 9680 - var23 = (var21 - 1 + var10.height) / var21; // L: 9681 - - for (var24 = 0; var24 < var22; ++var24) { // L: 9682 - for (var25 = 0; var25 < var23; ++var25) { // L: 9683 - if (var10.spriteAngle != 0) { // L: 9684 - var40.method7097(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 9685 - var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); // L: 9686 - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9689 - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { // L: 9703 - boolean var36 = Friend.runCs1(var10); // L: 9704 - if (var36) { // L: 9706 - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; // L: 9707 - } - - Model var41 = null; // L: 9708 - var22 = 0; // L: 9709 - if (var10.itemId != -1) { // L: 9710 - var33 = class250.ItemDefinition_get(var10.itemId); // L: 9711 - if (var33 != null) { // L: 9712 - var33 = var33.getCountObj(var10.itemQuantity); // L: 9713 - var41 = var33.getModel(1); // L: 9714 - if (var41 != null) { // L: 9715 - var41.calculateBoundsCylinder(); // L: 9716 - var22 = var41.height / 2; // L: 9717 - } else { - Script.invalidateWidget(var10); // L: 9719 - } - } - } else if (var10.modelType == 5) { // L: 9722 - if (var10.modelId == 0) { // L: 9723 - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class262.localPlayer.getModel(); // L: 9724 - } - } else if (var20 == -1) { // L: 9726 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, class262.localPlayer.appearance); // L: 9727 - if (var41 == null && Widget.field2958) { // L: 9728 - Script.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = WorldMapScaleHandler.SequenceDefinition_get(var20); // L: 9731 - var41 = var10.getModel(var47, var10.modelFrame, var36, class262.localPlayer.appearance); // L: 9732 - if (var41 == null && Widget.field2958) { // L: 9733 - Script.invalidateWidget(var10); - } - } - - Rasterizer3D.method3950(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9735 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9736 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9737 - if (var41 != null) { // L: 9738 - if (!var10.isIf3) { // L: 9739 - var41.method4347(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); // L: 9741 - if (var10.modelOrthog) { // L: 9742 - var41.method4309(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method4347(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9743 - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); // L: 9746 - } else { - if (var10.type == 7) { // L: 9749 - var39 = var10.getFont(); // L: 9750 - if (var39 == null) { // L: 9751 - if (Widget.field2958) { // L: 9752 - Script.invalidateWidget(var10); - } - continue; - } - - var20 = 0; // L: 9755 - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9756 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9757 - if (var10.itemIds[var20] > 0) { // L: 9758 - var33 = class250.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9759 - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9761 - var34 = SecureRandomFuture.colorStartTag(16748608) + var33.name + ""; - } else { - var34 = SecureRandomFuture.colorStartTag(16748608) + var33.name + "" + " " + 'x' + MusicPatchNode.formatItemStacks(var10.itemQuantities[var20]); // L: 9762 - } - - var25 = var12 + var22 * (var10.paddingX + 115); // L: 9763 - var26 = (var10.paddingY + 12) * var21 + var13; // L: 9764 - if (var10.textXAlignment == 0) { // L: 9765 - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 9766 - 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: 9767 - } - } - - ++var20; // L: 9769 - } - } - } - - if (var10.type == 8 && var10 == class5.field42 && Client.field773 == Client.field693) { // L: 9773 9774 - var19 = 0; // L: 9775 - var20 = 0; // L: 9776 - Font var31 = AbstractSocket.fontPlain12; // L: 9777 - String var32 = var10.text; // L: 9778 - - String var43; - for (var32 = ItemContainer.method2184(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9780 9781 9793 - var24 = var32.indexOf("
"); // L: 9782 - if (var24 != -1) { // L: 9783 - var43 = var32.substring(0, var24); // L: 9784 - var32 = var32.substring(var24 + 4); // L: 9785 - } else { - var43 = var32; // L: 9788 - var32 = ""; // L: 9789 - } - - var25 = var31.stringWidth(var43); // L: 9791 - if (var25 > var19) { // L: 9792 - var19 = var25; - } - } - - var19 += 6; // L: 9795 - var20 += 7; // L: 9796 - var24 = var12 + var10.width - 5 - var19; // L: 9797 - var25 = var13 + var10.height + 5; // L: 9798 - if (var24 < var12 + 5) { // L: 9799 - var24 = var12 + 5; - } - - if (var19 + var24 > var4) { // L: 9800 - var24 = var4 - var19; - } - - if (var25 + var20 > var5) { // L: 9801 - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9802 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9803 - var32 = var10.text; // L: 9804 - var26 = var25 + var31.ascent + 2; // L: 9805 - - for (var32 = ItemContainer.method2184(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9806 9807 9818 - int var27 = var32.indexOf("
"); // L: 9808 - if (var27 != -1) { // L: 9809 - var43 = var32.substring(0, var27); // L: 9810 - var32 = var32.substring(var27 + 4); // L: 9811 - } else { - var43 = var32; // L: 9814 - var32 = ""; // L: 9815 - } - - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9817 - } - } - - if (var10.type == 9) { // L: 9822 - if (var10.field2994) { // L: 9827 - var19 = var12; // L: 9828 - var20 = var13 + var10.height; // L: 9829 - var21 = var12 + var10.width; // L: 9830 - var22 = var13; // L: 9831 - } else { - var19 = var12; // L: 9834 - var20 = var13; // L: 9835 - var21 = var12 + var10.width; // L: 9836 - var22 = var13 + var10.height; // L: 9837 - } - - if (var10.lineWid == 1) { // L: 9839 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9840 - } else { - PlayerComposition.method4850(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9843 - } - } - } - } - } - } - } - } + if (var10 >= var1) { + return false; } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + return false; + } + + var5 = var9; + var4 = true; + } + + return var4; + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Lbp;", + garbageValue = "1179967993" + ) + static ClientPreferences method497() { + AccessFile var0 = null; + ClientPreferences var1 = new ClientPreferences(); + + try { + var0 = NPC.getPreferencesFile("", MouseRecorder.field975.name, false); + byte[] var2 = new byte[(int)var0.length()]; + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { + var4 = var0.read(var2, var3, var2.length - var3); + if (var4 == -1) { + throw new IOException(); + } + } + + var1 = new ClientPreferences(new Buffer(var2)); + } catch (Exception var6) { + } + + try { + if (var0 != null) { + var0.close(); + } + } catch (Exception var5) { + } + + return var1; + } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "1205757782" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuShiftClick[Client.menuOptionsCount] = var6; + ++Client.menuOptionsCount; + } + + } + } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1403206758" + ) + static final void method506() { + PacketBufferNode var0 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { + if (var1.type == 0 || var1.type == 3) { + class161.closeInterface(var1, true); } } - } // L: 9848 + if (Client.meslayerContinueWidget != null) { + AttackOption.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + } + + @ObfuscatedName("ls") + @ObfuscatedSignature( + descriptor = "(Lio;I)Ljava/lang/String;", + garbageValue = "-2063390888" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } + } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 2ad99c1cbf..e4f48cb816 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,69 +3,69 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("aq") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("t") + @ObfuscatedName("w") + @Export("active") + volatile boolean active; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lbc;" + descriptor = "Laq;" ) @Export("after") PcmStream after; - @ObfuscatedName("x") - int field473; - @ObfuscatedName("u") + @ObfuscatedName("e") + int field253; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lbj;" + descriptor = "Laj;" ) @Export("sound") AbstractSound sound; - @ObfuscatedName("q") - @Export("active") - volatile boolean active; protected PcmStream() { - this.active = true; // L: 11 - } // L: 13 + this.active = true; + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("r") - protected abstract int vmethod4740(); + @ObfuscatedName("f") + protected abstract int vmethod4662(); - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ay") - int vmethod1099() { - return 255; // L: 16 + @ObfuscatedName("ak") + int vmethod716() { + return 255; } - @ObfuscatedName("eu") + @ObfuscatedName("fz") @Export("update") final void update(int[] var1, int var2, int var3) { - if (this.active) { // L: 24 + if (this.active) { this.fill(var1, var2, var3); } else { - this.skip(var3); // L: 25 + this.skip(var3); } - } // L: 26 + } } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 0df163c92a..e8d595d834 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,201 +3,201 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("m") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) - NodeDeque field374; + NodeDeque field156; @ObfuscatedName("v") - int field373; - @ObfuscatedName("y") - int field371; + int field155; + @ObfuscatedName("j") + int field157; public PcmStreamMixer() { - this.subStreams = new NodeDeque(); // L: 9 - this.field374 = new NodeDeque(); // L: 10 - this.field373 = 0; // L: 11 - this.field371 = -1; // L: 12 + this.subStreams = new NodeDeque(); + this.field156 = new NodeDeque(); + this.field155 = 0; + this.field157 = -1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lbc;)V" + descriptor = "(Laq;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { - this.subStreams.addLast(var1); // L: 15 - } // L: 16 + this.subStreams.addLast(var1); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lbc;)V" + descriptor = "(Laq;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { - var1.remove(); // L: 19 - } // L: 20 + var1.remove(); + } @ObfuscatedName("v") - void method778() { - if (this.field373 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field374.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field374.previous()) { // L: 24 - var1.field519 -= this.field373; // L: 25 + void method374() { + if (this.field155 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field156.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field156.previous()) { + var1.field298 -= this.field155; } - this.field371 -= this.field373; // L: 27 - this.field373 = 0; // L: 28 + this.field157 -= this.field155; + this.field155 = 0; } - } // L: 30 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lmf;Lbw;)V" - ) - void method755(Node var1, PcmStreamMixerListener var2) { - while (this.field374.sentinel != var1 && ((PcmStreamMixerListener)var1).field519 <= var2.field519) { // L: 33 - var1 = var1.previous; - } - - NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field371 = ((PcmStreamMixerListener)this.field374.sentinel.previous).field519; // L: 35 - } // L: 36 + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lbw;)V" + descriptor = "(Lml;Lav;)V" ) - void method756(PcmStreamMixerListener var1) { - var1.remove(); // L: 39 - var1.remove2(); // L: 40 - Node var2 = this.field374.sentinel.previous; // L: 41 - if (var2 == this.field374.sentinel) { - this.field371 = -1; // L: 42 - } else { - this.field371 = ((PcmStreamMixerListener)var2).field519; // L: 43 + void method373(Node var1, PcmStreamMixerListener var2) { + while (this.field156.sentinel != var1 && ((PcmStreamMixerListener)var1).field298 <= var2.field298) { + var1 = var1.previous; } - } // L: 44 + NodeDeque.NodeDeque_addBefore(var2, var1); + this.field157 = ((PcmStreamMixerListener)this.field156.sentinel.previous).field298; + } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "(Lav;)V" + ) + void method376(PcmStreamMixerListener var1) { + var1.remove(); + var1.remove2(); + Node var2 = this.field156.sentinel.previous; + if (var2 == this.field156.sentinel) { + this.field157 = -1; + } else { + this.field157 = ((PcmStreamMixerListener)var2).field298; + } + + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "()Laq;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return (PcmStream)this.subStreams.last(); // L: 47 + return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return (PcmStream)this.subStreams.previous(); // L: 51 + return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("r") - protected int vmethod4740() { - return 0; // L: 55 + @ObfuscatedName("f") + protected int vmethod4662() { + return 0; } - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field371 < 0) { // L: 60 - this.updateSubStreams(var1, var2, var3); // L: 61 - return; // L: 62 + if (this.field157 < 0) { + this.updateSubStreams(var1, var2, var3); + return; } - if (var3 + this.field373 < this.field371) { // L: 64 - this.field373 += var3; // L: 65 - this.updateSubStreams(var1, var2, var3); // L: 66 - return; // L: 67 + if (var3 + this.field155 < this.field157) { + this.field155 += var3; + this.updateSubStreams(var1, var2, var3); + return; } - int var4 = this.field371 - this.field373; // L: 69 - this.updateSubStreams(var1, var2, var4); // L: 70 - var2 += var4; // L: 71 - var3 -= var4; // L: 72 - this.field373 += var4; // L: 73 - this.method778(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field374.last(); // L: 75 - synchronized(var5) { // L: 76 - int var7 = var5.update(); // L: 77 - if (var7 < 0) { // L: 78 - var5.field519 = 0; // L: 79 - this.method756(var5); // L: 80 + int var4 = this.field157 - this.field155; + this.updateSubStreams(var1, var2, var4); + var2 += var4; + var3 -= var4; + this.field155 += var4; + this.method374(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field156.last(); + synchronized(var5) { + int var7 = var5.update(); + if (var7 < 0) { + var5.field298 = 0; + this.method376(var5); } else { - var5.field519 = var7; // L: 83 - this.method755(var5.previous, var5); // L: 84 + var5.field298 = var7; + this.method373(var5.previous, var5); } } - } while(var3 != 0); // L: 87 + } while(var3 != 0); } - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { - for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 - var4.update(var1, var2, var3); // L: 93 + for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { + var4.update(var1, var2, var3); } - } // L: 95 + } - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field371 < 0) { // L: 99 - this.skipSubStreams(var1); // L: 100 - return; // L: 101 + if (this.field157 < 0) { + this.skipSubStreams(var1); + return; } - if (this.field373 + var1 < this.field371) { // L: 103 - this.field373 += var1; // L: 104 - this.skipSubStreams(var1); // L: 105 - return; // L: 106 + if (this.field155 + var1 < this.field157) { + this.field155 += var1; + this.skipSubStreams(var1); + return; } - int var2 = this.field371 - this.field373; // L: 108 - this.skipSubStreams(var2); // L: 109 - var1 -= var2; // L: 110 - this.field373 += var2; // L: 111 - this.method778(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field374.last(); // L: 113 - synchronized(var3) { // L: 114 - int var5 = var3.update(); // L: 115 - if (var5 < 0) { // L: 116 - var3.field519 = 0; // L: 117 - this.method756(var3); // L: 118 + int var2 = this.field157 - this.field155; + this.skipSubStreams(var2); + var1 -= var2; + this.field155 += var2; + this.method374(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field156.last(); + synchronized(var3) { + int var5 = var3.update(); + if (var5 < 0) { + var3.field298 = 0; + this.method376(var3); } else { - var3.field519 = var5; // L: 121 - this.method755(var3.previous, var3); // L: 122 + var3.field298 = var5; + this.method373(var3.previous, var3); } } - } while(var1 != 0); // L: 125 + } while(var1 != 0); } - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("skipSubStreams") void skipSubStreams(int var1) { - for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 - var2.skip(var1); // L: 131 + for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { + var2.skip(var1); } - } // L: 133 + } } diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index 2178a1d330..f45415e2e6 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("bw") +@ObfuscatedName("av") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("f") - int field519; + @ObfuscatedName("s") + int field298; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("remove2") abstract void remove2(); - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lav;)I" + descriptor = "(Lm;)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 90ce3b7910..cac6b2839f 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,130 +1,261 @@ +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("cr") +@ObfuscatedName("bs") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lck;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("lj") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 957608349 - ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 857968295 + intValue = 1928345957 ) @Export("plane") int plane; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -460142403 + intValue = 1684112959 ) @Export("type") int type; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1653690201 + intValue = 981259417 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 821820447 + intValue = 1975705293 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -299162955 + intValue = 497729085 ) @Export("objectId") int objectId; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1733340657 + intValue = -423905645 ) - int field1209; - @ObfuscatedName("m") + int field1012; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -857810119 + intValue = 1021389473 ) - int field1210; - @ObfuscatedName("r") + int field1009; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1775664849 + intValue = -1539938369 ) @Export("id") int id; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1304592611 + intValue = -1875091383 ) @Export("orientation") int orientation; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1665765945 + intValue = -121105651 ) - int field1213; - @ObfuscatedName("z") + int field1016; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -259916535 + intValue = -188021995 ) @Export("delay") int delay; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2001874623 + intValue = -338685381 ) @Export("hitpoints") int hitpoints; PendingSpawn() { - this.delay = 0; // L: 16 - this.hitpoints = -1; // L: 17 - } // L: 19 + this.delay = 0; + this.hitpoints = -1; + } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILla;Ljf;I)V", - garbageValue = "1024177105" + descriptor = "(II)Lea;", + garbageValue = "-1376516853" ) - static void method2261(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 ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { // L: 43 - var3 = var5.data; // L: 44 - break; // L: 45 + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "1585811889" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class41.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); + + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); + } else { + try { + int var4 = var1.operations[var3]; + Field var5; + int var6; + if (var4 == 0) { + var5 = var1.fields[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.fields[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.fields[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + + Method var25; + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + } else { + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; + + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { + var0.writeByte(0); + } else if (var11 instanceof Number) { + var0.writeByte(1); + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } } } - } - 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 + var0.writeCrc(var2); + var1.remove(); } - } // L: 51 55 + } - @ObfuscatedName("jk") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "450155015" + descriptor = "(IIIIIIB)V", + garbageValue = "115" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 10361 + static final void method1868(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { + var10 = var9; + } + + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; + } else { + var12 = -var12; + } + + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var13 + var6; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var15 + var7 + var1; + Rasterizer3D.method3900(var17, var18, var19); + Rasterizer3D.method3903(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method3900(var17, var19, var20); + Rasterizer3D.method3903(var21, var23, var24, var17, var19, var20, var4); + } } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index a2b40d8b1b..60c8b57bcd 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -1,220 +1,194 @@ -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("ms") +@ObfuscatedName("mz") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = -1360196685 - ) - int field3955; - @ObfuscatedName("ag") - boolean field3944; + @ObfuscatedName("gq") + @Export("regionMapArchives") + static byte[][] regionMapArchives; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -478220417 + intValue = 39428313 ) - int field3957; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 2073563121 - ) - int field3971; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = -1289812549 - ) - int field3959; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = 506643985 - ) - int field3966; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = 1565324279 - ) - int field3961; - @ObfuscatedName("al") - boolean field3962; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = -1486256621 - ) - int field3963; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = -581400105 - ) - int field3964; + int field3985; + @ObfuscatedName("ax") + boolean field3979; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -2081035797 + intValue = 1924640865 ) - int field3965; - @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = 1584067855 - ) - int field3973; - @ObfuscatedName("am") - String field3958; - @ObfuscatedName("aa") - String field3977; - @ObfuscatedName("ai") - String field3969; + int field3996; @ObfuscatedName("av") - String field3970; - @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 2036376595 + intValue = 600526161 ) - int field3946; + int field3988; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -1782962691 + ) + int field3989; + @ObfuscatedName("ao") + @ObfuscatedGetter( + intValue = -250064103 + ) + int field3990; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = 602190231 + ) + int field3991; + @ObfuscatedName("ak") + boolean field3992; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = -1805222575 + ) + int field4009; + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = -166600075 + ) + int field3995; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 141038615 + intValue = -1055220501 ) - int field3947; - @ObfuscatedName("af") + int field4005; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1617164359 + intValue = -1915691553 ) - int field3972; - @ObfuscatedName("bq") + int field3997; + @ObfuscatedName("ap") + String field3977; + @ObfuscatedName("ah") + String field3986; + @ObfuscatedName("ag") + String field3999; + @ObfuscatedName("ai") + String field4000; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1247214845 + intValue = -25755207 ) - int field3974; - @ObfuscatedName("bx") - String field3975; - @ObfuscatedName("bi") - String field3949; - @ObfuscatedName("bz") - int[] field3956; - @ObfuscatedName("bb") + int field4001; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1203517763 + intValue = -1992767683 ) - int field3978; + int field4002; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 1666259367 + ) + int field4003; + @ObfuscatedName("bt") + @ObfuscatedGetter( + intValue = 200338609 + ) + int field4004; + @ObfuscatedName("bk") + String field3987; + @ObfuscatedName("br") + String field4007; + @ObfuscatedName("by") + int[] field3998; @ObfuscatedName("bv") - String field3967; + @ObfuscatedGetter( + intValue = -1122886171 + ) + int field4008; + @ObfuscatedName("bf") + String field3993; 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.field3956 = new int[3]; // L: 62 - this.field3955 = var1; // L: 67 - this.field3944 = var2; // L: 68 - this.field3957 = var3; // L: 69 - this.field3971 = var4; // L: 70 - this.field3959 = var5; // L: 71 - this.field3966 = var6; // L: 72 - this.field3961 = var7; // L: 73 - this.field3962 = var8; // L: 74 - this.field3963 = var9; // L: 75 - this.field3964 = var10; // L: 76 - this.field3965 = var11; // L: 77 - this.field3973 = var12; // L: 78 - this.field3958 = var13; // L: 79 - this.field3977 = var14; // L: 80 - this.field3969 = var15; // L: 81 - this.field3970 = var16; // L: 82 - this.field3946 = var17; // L: 83 - this.field3947 = var18; // L: 84 - this.field3972 = var19; // L: 85 - this.field3974 = var20; // L: 86 - this.field3975 = var21; // L: 87 - this.field3949 = var22; // L: 88 - this.field3956 = var23; // L: 89 - this.field3978 = var24; // L: 90 - this.field3967 = var25; // L: 91 - } // L: 92 + this.field3998 = new int[3]; + this.field3985 = var1; + this.field3979 = var2; + this.field3996 = var3; + this.field3988 = var4; + this.field3989 = var5; + this.field3990 = var6; + this.field3991 = var7; + this.field3992 = var8; + this.field4009 = var9; + this.field3995 = var10; + this.field4005 = var11; + this.field3997 = var12; + this.field3977 = var13; + this.field3986 = var14; + this.field3999 = var15; + this.field4000 = var16; + this.field4001 = var17; + this.field4002 = var18; + this.field4003 = var19; + this.field4004 = var20; + this.field3987 = var21; + this.field4007 = var22; + this.field3998 = var23; + this.field4008 = var24; + this.field3993 = var25; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "406658197" + descriptor = "(Lnv;I)V", + garbageValue = "239897067" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(8); // L: 95 - var1.writeByte(this.field3955); // L: 96 - var1.writeByte(this.field3944 ? 1 : 0); // L: 97 - var1.writeShort(this.field3957); // L: 98 - var1.writeByte(this.field3971); // L: 99 - var1.writeByte(this.field3959); // L: 100 - var1.writeByte(this.field3966); // L: 101 - var1.writeByte(this.field3961); // L: 102 - var1.writeByte(this.field3962 ? 1 : 0); // L: 103 - var1.writeShort(this.field3963); // L: 104 - var1.writeByte(this.field3964); // L: 105 - var1.writeMedium(this.field3965); // L: 106 - var1.writeShort(this.field3973); // L: 107 - var1.writeStringCp1252NullCircumfixed(this.field3958); // L: 108 - var1.writeStringCp1252NullCircumfixed(this.field3977); // L: 109 - var1.writeStringCp1252NullCircumfixed(this.field3969); // L: 110 - var1.writeStringCp1252NullCircumfixed(this.field3970); // L: 111 - var1.writeByte(this.field3947); // L: 112 - var1.writeShort(this.field3946); // L: 113 - var1.writeStringCp1252NullCircumfixed(this.field3975); // L: 114 - var1.writeStringCp1252NullCircumfixed(this.field3949); // L: 115 - var1.writeByte(this.field3972); // L: 116 - var1.writeByte(this.field3974); // L: 117 + var1.writeByte(8); + var1.writeByte(this.field3985); + var1.writeByte(this.field3979 ? 1 : 0); + var1.writeShort(this.field3996); + var1.writeByte(this.field3988); + var1.writeByte(this.field3989); + var1.writeByte(this.field3990); + var1.writeByte(this.field3991); + var1.writeByte(this.field3992 ? 1 : 0); + var1.writeShort(this.field4009); + var1.writeByte(this.field3995); + var1.writeMedium(this.field4005); + var1.writeShort(this.field3997); + var1.writeStringCp1252NullCircumfixed(this.field3977); + var1.writeStringCp1252NullCircumfixed(this.field3986); + var1.writeStringCp1252NullCircumfixed(this.field3999); + var1.writeStringCp1252NullCircumfixed(this.field4000); + var1.writeByte(this.field4002); + var1.writeShort(this.field4001); + var1.writeStringCp1252NullCircumfixed(this.field3987); + var1.writeStringCp1252NullCircumfixed(this.field4007); + var1.writeByte(this.field4003); + var1.writeByte(this.field4004); - for (int var2 = 0; var2 < this.field3956.length; ++var2) { // L: 118 - var1.writeInt(this.field3956[var2]); + for (int var2 = 0; var2 < this.field3998.length; ++var2) { + var1.writeInt(this.field3998[var2]); } - var1.writeInt(this.field3978); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field3967); // L: 120 - } // L: 121 + var1.writeInt(this.field4008); + var1.writeStringCp1252NullCircumfixed(this.field3993); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "97981657" + descriptor = "(B)I", + garbageValue = "46" ) @Export("size") public int size() { - byte var1 = 39; // L: 124 - int var2 = var1 + class32.method387(this.field3958); // L: 125 - var2 += class32.method387(this.field3977); // L: 126 - var2 += class32.method387(this.field3969); // L: 127 - var2 += class32.method387(this.field3970); // L: 128 - var2 += class32.method387(this.field3975); // L: 129 - var2 += class32.method387(this.field3949); // L: 130 - var2 += class32.method387(this.field3967); // L: 131 - return var2; // L: 132 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "104" - ) - public static byte[] method6115() { - byte[] var0 = new byte[24]; // L: 211 - - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 213 - JagexCache.JagexCache_randomDat.readFully(var0); // L: 214 - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 215 216 217 - } - - if (var1 >= 24) { // L: 219 - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { // L: 222 - var0[var2] = -1; - } - } - - return var0; // L: 224 + byte var1 = 39; + int var2 = var1 + GrandExchangeOfferAgeComparator.method5131(this.field3977); + var2 += GrandExchangeOfferAgeComparator.method5131(this.field3986); + var2 += GrandExchangeOfferAgeComparator.method5131(this.field3999); + var2 += GrandExchangeOfferAgeComparator.method5131(this.field4000); + var2 += GrandExchangeOfferAgeComparator.method5131(this.field3987); + var2 += GrandExchangeOfferAgeComparator.method5131(this.field4007); + var2 += GrandExchangeOfferAgeComparator.method5131(this.field3993); + return var2; } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index ce196bf3ce..97da9b15a9 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("mz") +@ObfuscatedName("mb") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lms;", - garbageValue = "-1968333950" + descriptor = "(B)Lmz;", + garbageValue = "41" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 3abc9a6ae4..be2b30fecc 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -3,18 +3,17 @@ 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("cj") +@ObfuscatedName("bb") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Loh;" ) @Export("username") Username username; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lih;" ) @@ -22,344 +21,384 @@ public final class Player extends Actor { PlayerComposition appearance; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1635688549 + intValue = -1136667611 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 586041939 + intValue = -513201511 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("actions") String[] actions; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -599736859 + intValue = 282946051 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 508020287 + intValue = 22908287 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1640401775 + intValue = 260638265 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -653734129 + intValue = 935016543 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 730739877 + intValue = -1313763475 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -183413097 + intValue = -1672706655 ) - int field1185; - @ObfuscatedName("i") + int field982; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1745122201 + intValue = -777846559 ) @Export("tileHeight2") int tileHeight2; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -385569285 + intValue = 1130340063 ) - int field1197; - @ObfuscatedName("g") + int field989; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgl;" ) @Export("model0") Model model0; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2027010021 + intValue = 1604216139 ) @Export("minX") int minX; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1785758561 + intValue = 101251931 ) @Export("minY") int minY; - @ObfuscatedName("u") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 335782101 + intValue = -661964639 ) @Export("maxX") int maxX; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -888481785 + intValue = -646684587 ) @Export("maxY") int maxY; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 365768385 + intValue = -1548026079 ) @Export("team") int team; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("isHidden") boolean isHidden; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1650147117 + intValue = -1947758471 ) @Export("plane") int plane; - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1840333455 + intValue = -1723203755 ) @Export("index") int index; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ak") - boolean field1201; - @ObfuscatedName("ad") + @ObfuscatedName("am") + boolean field1003; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 5106261 + intValue = 1669913231 ) @Export("tileX") int tileX; - @ObfuscatedName("at") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -769670651 + intValue = 796156567 ) @Export("tileY") int tileY; Player() { - this.headIconPk = -1; // L: 19 - this.headIconPrayer = -1; // L: 20 - this.actions = new String[3]; // L: 22 + this.headIconPk = -1; + this.headIconPrayer = -1; + this.actions = new String[3]; - for (int var1 = 0; var1 < 3; ++var1) { // L: 25 + for (int var1 = 0; var1 < 3; ++var1) { this.actions[var1] = ""; } - this.combatLevel = 0; // L: 28 - this.skillLevel = 0; // L: 29 - this.animationCycleStart = 0; // L: 31 - this.animationCycleEnd = 0; // L: 32 - this.isUnanimated = false; // L: 41 - this.team = 0; // L: 42 - this.isHidden = false; // L: 43 - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 46 - this.isInFriendsChat = TriBool.TriBool_unknown; // L: 47 - this.isInClanChat = TriBool.TriBool_unknown; // L: 48 - this.field1201 = false; // L: 49 - } // L: 53 + this.combatLevel = 0; + this.skillLevel = 0; + this.animationCycleStart = 0; + this.animationCycleEnd = 0; + this.isUnanimated = false; + this.team = 0; + this.isHidden = false; + this.isFriendTriBool = TriBool.TriBool_unknown; + this.isInFriendsChat = TriBool.TriBool_unknown; + this.isInClanChat = TriBool.TriBool_unknown; + this.field1003 = false; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1534249292" + descriptor = "(Lnv;B)V", + garbageValue = "118" ) @Export("read") final void read(Buffer var1) { - var1.offset = 0; // L: 56 - int var2 = var1.readUnsignedByte(); // L: 57 - this.headIconPk = var1.readByte(); // L: 58 - this.headIconPrayer = var1.readByte(); // L: 59 - int var3 = -1; // L: 60 - this.team = 0; // L: 61 - int[] var4 = new int[12]; // L: 62 + var1.offset = 0; + int var2 = var1.readUnsignedByte(); + this.headIconPk = var1.readByte(); + this.headIconPrayer = var1.readByte(); + int var3 = -1; + this.team = 0; + int[] var4 = new int[12]; int var6; int var7; int var8; - for (int var5 = 0; var5 < 12; ++var5) { // L: 63 - var6 = var1.readUnsignedByte(); // L: 64 - if (var6 == 0) { // L: 65 - var4[var5] = 0; // L: 66 + for (int var5 = 0; var5 < 12; ++var5) { + var6 = var1.readUnsignedByte(); + if (var6 == 0) { + var4[var5] = 0; } else { - var7 = var1.readUnsignedByte(); // L: 69 - var4[var5] = var7 + (var6 << 8); // L: 70 - if (var5 == 0 && var4[0] == 65535) { // L: 71 - var3 = var1.readUnsignedShort(); // L: 72 + var7 = var1.readUnsignedByte(); + var4[var5] = var7 + (var6 << 8); + if (var5 == 0 && var4[0] == 65535) { + var3 = var1.readUnsignedShort(); break; } - if (var4[var5] >= 512) { // L: 75 - var8 = class250.ItemDefinition_get(var4[var5] - 512).team; // L: 76 - if (var8 != 0) { // L: 77 + if (var4[var5] >= 512) { + var8 = KeyHandler.ItemDefinition_get(var4[var5] - 512).team; + if (var8 != 0) { this.team = var8; } } } } - int[] var11 = new int[5]; // L: 80 + int[] var24 = new int[5]; - for (var6 = 0; var6 < 5; ++var6) { // L: 81 - var7 = var1.readUnsignedByte(); // L: 82 - if (var7 < 0 || var7 >= class69.field568[var6].length) { // L: 83 + for (var6 = 0; var6 < 5; ++var6) { + var7 = var1.readUnsignedByte(); + if (var7 < 0 || var7 >= Varps.field2914[var6].length) { var7 = 0; } - var11[var6] = var7; // L: 84 + var24[var6] = var7; } - super.idleSequence = var1.readUnsignedShort(); // L: 86 - if (super.idleSequence == 65535) { // L: 87 + super.idleSequence = var1.readUnsignedShort(); + if (super.idleSequence == 65535) { super.idleSequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); // L: 88 - if (super.turnLeftSequence == 65535) { // L: 89 + super.turnLeftSequence = var1.readUnsignedShort(); + if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } - super.turnRightSequence = super.turnLeftSequence; // L: 90 - super.walkSequence = var1.readUnsignedShort(); // L: 91 - if (super.walkSequence == 65535) { // L: 92 + super.turnRightSequence = super.turnLeftSequence; + super.walkSequence = var1.readUnsignedShort(); + if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkBackSequence = var1.readUnsignedShort(); // L: 93 - if (super.walkBackSequence == 65535) { // L: 94 + super.walkBackSequence = var1.readUnsignedShort(); + if (super.walkBackSequence == 65535) { super.walkBackSequence = -1; } - super.walkLeftSequence = var1.readUnsignedShort(); // L: 95 - if (super.walkLeftSequence == 65535) { // L: 96 + super.walkLeftSequence = var1.readUnsignedShort(); + if (super.walkLeftSequence == 65535) { super.walkLeftSequence = -1; } - super.walkRightSequence = var1.readUnsignedShort(); // L: 97 - if (super.walkRightSequence == 65535) { // L: 98 + super.walkRightSequence = var1.readUnsignedShort(); + if (super.walkRightSequence == 65535) { super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); // L: 99 - if (super.runSequence == 65535) { // L: 100 + super.runSequence = var1.readUnsignedShort(); + if (super.runSequence == 65535) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), LoginScreenAnimation.loginType); // L: 101 - this.clearIsFriend(); // L: 102 - this.clearIsInFriendsChat(); // L: 103 - this.method2213(); // L: 104 - if (this == class262.localPlayer) { // L: 105 - Login.localPlayerName = this.username.getName(); + this.username = new Username(var1.readStringCp1252NullTerminated(), GraphicsObject.loginType); + this.clearIsFriend(); + this.clearIsInFriendsChat(); + this.method1825(); + if (this == MouseHandler.localPlayer) { + RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); // L: 106 - this.skillLevel = var1.readUnsignedShort(); // L: 107 - this.isHidden = var1.readUnsignedByte() == 1; // L: 108 - if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { // L: 109 + this.combatLevel = var1.readUnsignedByte(); + this.skillLevel = var1.readUnsignedShort(); + this.isHidden = var1.readUnsignedByte() == 1; + if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { this.isHidden = false; } - class136[] var12 = null; // L: 110 - boolean var13 = false; // L: 111 - if (var1.offset < var1.array.length) { // L: 112 - var8 = var1.readUnsignedShort(); // L: 113 - var13 = (var8 >> 15 & 1) == 1; // L: 114 - if (var8 > 0 && var8 != 32768) { // L: 115 - var12 = new class136[12]; // L: 116 + class137[] var25 = null; + boolean var26 = false; + if (var1.offset < var1.array.length) { + var8 = var1.readUnsignedShort(); + var26 = (var8 >> 15 & 1) == 1; + if (var8 > 0 && var8 != 32768) { + var25 = new class137[12]; - for (int var9 = 0; var9 < 12; ++var9) { // L: 117 - int var10 = var8 >> 12 - var9 & 1; // L: 118 - if (var10 == 1) { // L: 119 - var12[var9] = MenuAction.method2027(var4[var9] - 512, var1); // L: 120 + for (int var9 = 0; var9 < 12; ++var9) { + int var10 = var8 >> 12 - var9 & 1; + if (var10 == 1) { + int var14 = var4[var9] - 512; + int var15 = var1.readUnsignedByte(); + boolean var16 = (var15 & 1) != 0; + boolean var17 = (var15 & 2) != 0; + class137 var18 = new class137(var14); + int var19; + int[] var20; + boolean var21; + int var22; + short var23; + if (var16) { + var19 = var1.readUnsignedByte(); + var20 = new int[]{var19 & 15, var19 >> 4 & 15}; + var21 = var18.field1515 != null && var20.length == var18.field1515.length; + + for (var22 = 0; var22 < 2; ++var22) { + if (var20[var22] != 15) { + var23 = (short)var1.readUnsignedShort(); + if (var21) { + var18.field1515[var20[var22]] = var23; + } + } + } + } + + if (var17) { + var19 = var1.readUnsignedByte(); + var20 = new int[]{var19 & 15, var19 >> 4 & 15}; + var21 = var18.field1518 != null && var20.length == var18.field1518.length; + + for (var22 = 0; var22 < 2; ++var22) { + if (var20[var22] != 15) { + var23 = (short)var1.readUnsignedShort(); + if (var21) { + var18.field1518[var20[var22]] = var23; + } + } + } + } + + var25[var9] = var18; } } } } - if (this.appearance == null) { // L: 125 + if (this.appearance == null) { this.appearance = new PlayerComposition(); } - this.appearance.method4837(var4, var12, var13, var11, var2 == 1, var3); // L: 126 - } // L: 127 + this.appearance.method4718(var4, var25, var26, var24, var2 == 1, var3); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lgd;", - garbageValue = "326918784" + descriptor = "(I)Lgl;", + garbageValue = "1291603774" ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { // L: 182 + if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapScaleHandler.SequenceDefinition_get(super.sequence) : null; // L: 183 - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapScaleHandler.SequenceDefinition_get(super.movementSequence); // L: 184 - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 185 - if (var3 == null) { // L: 186 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? World.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : World.SequenceDefinition_get(super.movementSequence); + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (var3 == null) { return null; } else { - var3.calculateBoundsCylinder(); // L: 187 - super.defaultHeight = var3.height; // L: 188 + var3.calculateBoundsCylinder(); + super.defaultHeight = var3.height; Model var4; Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 189 - var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 190 - if (var4 != null) { // L: 191 - var4.offsetBy(0, -super.field1263, 0); // L: 192 - var5 = new Model[]{var3, var4}; // L: 193 - var3 = new Model(var5, 2); // L: 194 + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + var4 = PcmPlayer.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + if (var4 != null) { + var4.offsetBy(0, -super.field1061, 0); + var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); } } - if (!this.isUnanimated && this.model0 != null) { // L: 197 - if (Client.cycle >= this.animationCycleEnd) { // L: 198 + if (!this.isUnanimated && this.model0 != null) { + if (Client.cycle >= this.animationCycleEnd) { this.model0 = null; } - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 199 - var4 = this.model0; // L: 200 - var4.offsetBy(this.field1185 - super.x, this.tileHeight2 - this.tileHeight, this.field1197 - super.y); // L: 201 - if (super.orientation == 512) { // L: 202 - var4.rotateY90Ccw(); // L: 203 - var4.rotateY90Ccw(); // L: 204 - var4.rotateY90Ccw(); // L: 205 - } else if (super.orientation == 1024) { // L: 207 - var4.rotateY90Ccw(); // L: 208 - var4.rotateY90Ccw(); // L: 209 - } else if (super.orientation == 1536) { // L: 211 + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { + var4 = this.model0; + var4.offsetBy(this.field982 - super.x, this.tileHeight2 - this.tileHeight, this.field989 - super.y); + if (super.orientation == 512) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { var4.rotateY90Ccw(); } @@ -367,21 +406,21 @@ public final class Player extends Actor { var3 = new Model(var5, 2); if (super.orientation == 512) { var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { // L: 215 - var4.rotateY90Ccw(); // L: 216 + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { // L: 219 - var4.rotateY90Ccw(); // L: 220 var4.rotateY90Ccw(); var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.field1185, this.tileHeight - this.tileHeight2, super.y - this.field1197); // L: 224 + var4.offsetBy(super.x - this.field982, this.tileHeight - this.tileHeight2, super.y - this.field989); } } var3.isSingleTile = true; - return var3; // L: 228 + return var3; } } } @@ -389,395 +428,149 @@ public final class Player extends Actor { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1441448466" + garbageValue = "1966505747" ) @Export("isFriend") boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 130 - this.checkIsFriend(); // L: 131 + if (this.isFriendTriBool == TriBool.TriBool_unknown) { + this.checkIsFriend(); } - return this.isFriendTriBool == TriBool.TriBool_true; // L: 133 + return this.isFriendTriBool == TriBool.TriBool_true; } @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-183277896" + garbageValue = "1425318771" ) @Export("clearIsFriend") void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 137 - } // L: 138 + this.isFriendTriBool = TriBool.TriBool_unknown; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "866218939" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = Canvas.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1844116107" + ) + @Export("isFriendsChatMember") + boolean isFriendsChatMember() { + if (this.isInFriendsChat == TriBool.TriBool_unknown) { + this.updateIsInFriendsChat(); + } + + return this.isInFriendsChat == TriBool.TriBool_true; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-478383809" + ) + @Export("clearIsInFriendsChat") + void clearIsInFriendsChat() { + this.isInFriendsChat = TriBool.TriBool_unknown; + } @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1895738612" + garbageValue = "-1457645317" ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = DevicePcmPlayerProvider.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 141 - } // L: 142 + @Export("updateIsInFriendsChat") + void updateIsInFriendsChat() { + this.isInFriendsChat = MouseRecorder.friendsChat != null && MouseRecorder.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "4663" + descriptor = "(I)V", + garbageValue = "1798457932" ) - @Export("isFriendsChatMember") - boolean isFriendsChatMember() { - if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 145 - this.updateIsInFriendsChat(); // L: 146 - } - - return this.isInFriendsChat == TriBool.TriBool_true; // L: 148 + @Export("updateIsInClanChat") + void updateIsInClanChat() { + this.isInClanChat = Client.currentClanSettings[0] != null && Client.currentClanSettings[0].method2358(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-956688368" + garbageValue = "979756410" ) - @Export("clearIsInFriendsChat") - void clearIsInFriendsChat() { - this.isInFriendsChat = TriBool.TriBool_unknown; // L: 152 - } // L: 153 + void method1825() { + this.isInClanChat = TriBool.TriBool_unknown; + } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1656967848" - ) - @Export("updateIsInFriendsChat") - void updateIsInFriendsChat() { - this.isInFriendsChat = class289.friendsChat != null && class289.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 156 - } // L: 157 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1811167187" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - this.isInClanChat = Client.currentClanSettings[0] != null && Client.currentClanSettings[0].method196(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 160 - } // L: 161 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1587575970" - ) - void method2213() { - this.isInClanChat = TriBool.TriBool_unknown; // L: 164 - } // L: 165 - - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1972087508" + garbageValue = "-1853309089" ) @Export("isClanMember") boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 168 - this.updateIsInClanChat(); // L: 169 + if (this.isInClanChat == TriBool.TriBool_unknown) { + this.updateIsInClanChat(); } - return this.isInClanChat == TriBool.TriBool_true; // L: 171 + return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-254306857" + descriptor = "(B)I", + garbageValue = "-85" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class248.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 175 176 178 + return this.appearance != null && this.appearance.npcTransformId != -1 ? UserComparator6.getNpcDefinition(this.appearance.npcTransformId).size : 1; } @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "-977769569" + garbageValue = "-1941334841" ) - final void method2217(int var1, int var2, byte var3) { - if (super.sequence != -1 && WorldMapScaleHandler.SequenceDefinition_get(super.sequence).field1893 == 1) { // L: 232 + final void method1829(int var1, int var2, byte var3) { + if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) { super.sequence = -1; } - super.field1280 = -1; + super.field1048 = -1; if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { - if (var3 == 2) { // L: 237 + if (var3 == 2) { Player var4 = this; - int var5 = super.pathX[0]; // L: 240 + int var5 = super.pathX[0]; int var6 = super.pathY[0]; int var7 = this.transformedSize(); - if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 244 - int var9 = this.transformedSize(); - Client.field733.approxDestinationX = var1; - Client.field733.approxDestinationY = var2; - Client.field733.approxDestinationSizeX = 1; - Client.field733.approxDestinationSizeY = 1; - ApproximateRouteStrategy var10 = Client.field733; - ApproximateRouteStrategy var11 = var10; - CollisionMap var12 = Client.collisionMaps[this.plane]; - int[] var13 = Client.field739; - int[] var14 = Client.field631; - int var15 = 0; - - label412: - while (true) { - int var16; - if (var15 >= 128) { - int var17; - int var18; - byte var20; - int var21; - int var22; - int var24; - int var26; - int var27; - int var28; - boolean var35; - int var37; - int var38; - int var40; - if (var9 == 1) { // L: 267 - var35 = class126.method2595(var5, var6, var10, var12); - } else if (var9 == 2) { - var17 = var5; - var18 = var6; - byte var19 = 64; - var20 = 64; - var21 = var5 - var19; - var22 = var6 - var20; // L: 276 - class160.directions[var19][var20] = 99; - class160.distances[var19][var20] = 0; - byte var23 = 0; - var24 = 0; // L: 280 - class160.bufferX[var23] = var5; // L: 281 - var40 = var23 + 1; - class160.bufferY[var23] = var6; // L: 282 - int[][] var25 = var12.flags; // L: 283 - - boolean var36; - while (true) { - if (var24 == var40) { - Login.field1033 = var17; - GrandExchangeOfferOwnWorldComparator.field608 = var18; - var36 = false; - break; - } - - var17 = class160.bufferX[var24]; - var18 = class160.bufferY[var24]; // L: 286 - var24 = var24 + 1 & 4095; - var37 = var17 - var21; // L: 288 - var38 = var18 - var22; - var26 = var17 - var12.xInset; - var27 = var18 - var12.yInset; - if (var11.hasArrived(2, var17, var18, var12)) { - Login.field1033 = var17; - GrandExchangeOfferOwnWorldComparator.field608 = var18; - var36 = true; // L: 295 - break; - } - - var28 = class160.distances[var37][var38] + 1; - if (var37 > 0 && class160.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136782) == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0) { - class160.bufferX[var40] = var17 - 1; - class160.bufferY[var40] = var18; - var40 = var40 + 1 & 4095; // L: 305 - class160.directions[var37 - 1][var38] = 2; - class160.distances[var37 - 1][var38] = var28; // L: 307 - } - - if (var37 < 126 && class160.directions[var37 + 1][var38] == 0 && (var25[var26 + 2][var27] & 19136899) == 0 && (var25[var26 + 2][var27 + 1] & 19136992) == 0) { // L: 312 - class160.bufferX[var40] = var17 + 1; - class160.bufferY[var40] = var18; // L: 314 - var40 = var40 + 1 & 4095; - class160.directions[var37 + 1][var38] = 8; - class160.distances[var37 + 1][var38] = var28; - } - - if (var38 > 0 && class160.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136782) == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0) { // L: 319 321 - class160.bufferX[var40] = var17; - class160.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class160.directions[var37][var38 - 1] = 1; // L: 326 - class160.distances[var37][var38 - 1] = var28; - } - - if (var38 < 126 && class160.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 2] & 19136824) == 0 && (var25[var26 + 1][var27 + 2] & 19136992) == 0) { // L: 332 - class160.bufferX[var40] = var17; - class160.bufferY[var40] = var18 + 1; // L: 334 - var40 = var40 + 1 & 4095; - class160.directions[var37][var38 + 1] = 4; - class160.distances[var37][var38 + 1] = var28; - } - - if (var37 > 0 && var38 > 0 && class160.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27] & 19136830) == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26][var27 - 1] & 19136911) == 0) { // L: 343 - class160.bufferX[var40] = var17 - 1; - class160.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; // L: 346 - class160.directions[var37 - 1][var38 - 1] = 3; - class160.distances[var37 - 1][var38 - 1] = var28; - } - - if (var37 < 126 && var38 > 0 && class160.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136911) == 0 && (var25[var26 + 2][var27 - 1] & 19136899) == 0 && (var25[var26 + 2][var27] & 19136995) == 0) { // L: 350 354 - class160.bufferX[var40] = var17 + 1; // L: 355 - class160.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class160.directions[var37 + 1][var38 - 1] = 9; // L: 358 - class160.distances[var37 + 1][var38 - 1] = var28; - } - - if (var37 > 0 && var38 < 126 && class160.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136830) == 0 && (var25[var26 - 1][var27 + 2] & 19136824) == 0 && (var25[var26][var27 + 2] & 19137016) == 0) { // L: 364 - class160.bufferX[var40] = var17 - 1; - class160.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; // L: 368 - class160.directions[var37 - 1][var38 + 1] = 6; - class160.distances[var37 - 1][var38 + 1] = var28; - } - - if (var37 < 126 && var38 < 126 && class160.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 2] & 19137016) == 0 && (var25[var26 + 2][var27 + 2] & 19136992) == 0 && (var25[var26 + 2][var27 + 1] & 19136995) == 0) { // L: 372 376 - class160.bufferX[var40] = var17 + 1; // L: 377 - class160.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class160.directions[var37 + 1][var38 + 1] = 12; - class160.distances[var37 + 1][var38 + 1] = var28; // L: 381 - } - } - - var35 = var36; - } else { - var35 = KeyHandler.method475(var5, var6, var9, var10, var12); - } - - int var8; - label435: { - var16 = var5 - 64; - var17 = var6 - 64; // L: 392 - var18 = Login.field1033; - var37 = GrandExchangeOfferOwnWorldComparator.field608; - if (!var35) { // L: 395 - var38 = Integer.MAX_VALUE; // L: 397 - var21 = Integer.MAX_VALUE; - byte var39 = 10; - var40 = var11.approxDestinationX; - var24 = var11.approxDestinationY; - int var34 = var11.approxDestinationSizeX; - var26 = var11.approxDestinationSizeY; - - for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { // L: 404 - for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { - int var29 = var27 - var16; // L: 406 - int var30 = var28 - var17; - if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class160.distances[var29][var30] < 100) { - int var31 = 0; - if (var27 < var40) { // L: 411 - var31 = var40 - var27; - } else if (var27 > var34 + var40 - 1) { - var31 = var27 - (var34 + var40 - 1); - } - - int var32 = 0; - if (var28 < var24) { - var32 = var24 - var28; - } else if (var28 > var26 + var24 - 1) { - var32 = var28 - (var24 + var26 - 1); - } - - int var33 = var31 * var31 + var32 * var32; // L: 416 - if (var33 < var38 || var38 == var33 && class160.distances[var29][var30] < var21) { - var38 = var33; - var21 = class160.distances[var29][var30]; - var18 = var27; - var37 = var28; // L: 421 - } - } - } - } - - if (var38 == Integer.MAX_VALUE) { - var8 = -1; - break label435; - } - } - - if (var18 == var5 && var6 == var37) { - var8 = 0; - } else { - var20 = 0; - class160.bufferX[var20] = var18; // L: 444 - var38 = var20 + 1; - class160.bufferY[var20] = var37; // L: 445 - - for (var21 = var22 = class160.directions[var18 - var16][var37 - var17]; var18 != var5 || var37 != var6; var21 = class160.directions[var18 - var16][var37 - var17]) { // L: 457 - if (var21 != var22) { - var22 = var21; - class160.bufferX[var38] = var18; // L: 450 - class160.bufferY[var38++] = var37; // L: 451 - } - - if ((var21 & 2) != 0) { - ++var18; - } else if ((var21 & 8) != 0) { // L: 454 - --var18; - } - - if ((var21 & 1) != 0) { - ++var37; - } else if ((var21 & 4) != 0) { - --var37; - } - } - - var40 = 0; // L: 459 - - while (var38-- > 0) { // L: 460 - var13[var40] = class160.bufferX[var38]; // L: 461 - var14[var40++] = class160.bufferY[var38]; // L: 462 - if (var40 >= var13.length) { // L: 463 - break; - } - } - - var8 = var40; // L: 465 - } - } - - var15 = var8; // L: 467 - if (var8 < 1) { // L: 468 - break; - } - - var16 = 0; // L: 469 - - while (true) { - if (var16 >= var15 - 1) { - break label412; - } - - var4.method2219(Client.field739[var16], Client.field631[var16], (byte)2); - ++var16; - } + if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { + int var10 = this.transformedSize(); + Client.field493.approxDestinationX = var1; + Client.field493.approxDestinationY = var2; + Client.field493.approxDestinationSizeX = 1; + Client.field493.approxDestinationSizeY = 1; + ApproximateRouteStrategy var11 = Client.field493; + int var12 = ClanChannel.method2508(var5, var6, var10, var11, Client.collisionMaps[this.plane], true, Client.field683, Client.field665); + if (var12 >= 1) { + for (int var13 = 0; var13 < var12 - 1; ++var13) { + var4.method1830(Client.field683[var13], Client.field665[var13], (byte)2); } - - for (var16 = 0; var16 < 128; ++var16) { - class160.directions[var15][var16] = 0; - class160.distances[var15][var16] = 99999999; - } - - ++var15; } } } - this.method2219(var1, var2, var3); // L: 472 + this.method1830(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -785,477 +578,75 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 474 + } - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1775377890" + descriptor = "(IIB)V", + garbageValue = "20" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; // L: 477 - super.field1281 = 0; // L: 478 - super.field1242 = 0; // L: 479 - super.pathX[0] = var1; // L: 480 - super.pathY[0] = var2; // L: 481 - int var3 = this.transformedSize(); // L: 482 - super.x = super.pathX[0] * 128 + var3 * 64; // L: 483 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 484 - } // L: 485 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIBI)V", - garbageValue = "1698515856" - ) - final void method2219(int var1, int var2, byte var3) { - if (super.pathLength < 9) { // L: 488 - ++super.pathLength; - } - - for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 489 - super.pathX[var4] = super.pathX[var4 - 1]; // L: 490 - super.pathY[var4] = super.pathY[var4 - 1]; // L: 491 - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 492 - } - - super.pathX[0] = var1; // L: 494 - super.pathY[0] = var2; // L: 495 - super.pathTraversed[0] = var3; // L: 496 - } // L: 497 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "3" - ) - @Export("isVisible") - final boolean isVisible() { - return this.appearance != null; // L: 500 + super.pathLength = 0; + super.field1066 = 0; + super.field1078 = 0; + super.pathX[0] = var1; + super.pathY[0] = var2; + int var3 = this.transformedSize(); + super.x = var3 * 64 + super.pathX[0] * 128; + super.y = var3 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIIIILgp;Lfl;I)V", - garbageValue = "1848847926" - ) - static final void method2258(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: 212 213 214 - if (var0 < Tiles.Tiles_minPlane) { // L: 217 - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = Tiles.getObjectDefinition(var3); // L: 218 - int var9; - int var10; - if (var4 != 1 && var4 != 3) { // L: 221 - var9 = var8.sizeX; // L: 226 - var10 = var8.sizeY; // L: 227 - } else { - var9 = var8.sizeY; // L: 222 - var10 = var8.sizeX; // L: 223 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 233 - var11 = (var9 >> 1) + var1; // L: 234 - var12 = (var9 + 1 >> 1) + var1; // L: 235 - } else { - var11 = var1; // L: 238 - var12 = var1 + 1; // L: 239 - } - - int var13; - int var14; - if (var10 + var2 <= 104) { // L: 241 - var13 = (var10 >> 1) + var2; // L: 242 - var14 = var2 + (var10 + 1 >> 1); // L: 243 - } else { - var13 = var2; // L: 246 - var14 = var2 + 1; // L: 247 - } - - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 249 - int var16 = var15[var11][var14] + var15[var11][var13] + var15[var12][var13] + var15[var12][var14] >> 2; // L: 250 - int var17 = (var1 << 7) + (var9 << 6); // L: 251 - int var18 = (var2 << 7) + (var10 << 6); // L: 252 - long var19 = UserComparator3.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 253 - int var21 = var5 + (var4 << 6); // L: 254 - if (var8.int3 == 1) { // L: 255 - var21 += 256; - } - - if (var8.hasSound()) { // L: 256 - class171.method3612(var0, var1, var2, var8, var4); - } - - Object var29; - if (var5 == 22) { // L: 257 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 258 - if (var8.animationId == -1 && var8.transforms == null) { // L: 260 - var29 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 261 - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 262 - if (var8.interactType == 1 && var7 != null) { // L: 263 - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var28; - if (var5 != 10 && var5 != 11) { // L: 266 - int[] var10000; - if (var5 >= 12) { // L: 287 - if (var8.animationId == -1 && var8.transforms == null) { // L: 289 - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 290 - } - - var6.method4046(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 291 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 292 - var10000 = Tiles.field1101[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { // L: 293 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { // L: 296 - if (var8.animationId == -1 && var8.transforms == null) { // L: 298 - var29 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 299 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1102[var4], 0, var19, var21); // L: 300 - if (var4 == 0) { // L: 301 - if (var8.clipped) { // L: 302 - class43.field307[var0][var1][var2] = 50; // L: 303 - class43.field307[var0][var1][var2 + 1] = 50; // L: 304 - } - - if (var8.modelClipped) { // L: 306 - var10000 = Tiles.field1101[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { // L: 308 - if (var8.clipped) { // L: 309 - class43.field307[var0][var1][var2 + 1] = 50; // L: 310 - class43.field307[var0][var1 + 1][var2 + 1] = 50; // L: 311 - } - - if (var8.modelClipped) { // L: 313 - var10000 = Tiles.field1101[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { // L: 315 - if (var8.clipped) { // L: 316 - class43.field307[var0][var1 + 1][var2] = 50; // L: 317 - class43.field307[var0][var1 + 1][var2 + 1] = 50; // L: 318 - } - - if (var8.modelClipped) { // L: 320 - var10000 = Tiles.field1101[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { // L: 322 - if (var8.clipped) { // L: 323 - class43.field307[var0][var1][var2] = 50; // L: 324 - class43.field307[var0][var1 + 1][var2] = 50; // L: 325 - } - - if (var8.modelClipped) { // L: 327 - var10000 = Tiles.field1101[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 329 - var7.method3216(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 330 - var6.method4204(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { // L: 333 - if (var8.animationId == -1 && var8.transforms == null) { // L: 335 - var29 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 336 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1107[var4], 0, var19, var21); // L: 337 - if (var8.clipped) { // L: 338 - if (var4 == 0) { // L: 339 - class43.field307[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 340 - class43.field307[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 341 - class43.field307[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 342 - class43.field307[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 344 - var7.method3216(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var22; - if (var5 == 2) { // L: 347 - var22 = var4 + 1 & 3; // L: 348 - Object var24; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { // L: 351 - var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 352 - var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 353 - } else { - var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 356 - var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 357 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field1102[var4], Tiles.field1102[var22], var19, var21); // L: 359 - if (var8.modelClipped) { // L: 360 - if (var4 == 0) { // L: 361 - var10000 = Tiles.field1101[var0][var1]; // L: 362 - var10000[var2] |= 585; - var10000 = Tiles.field1101[var0][var1]; // L: 363 - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { // L: 365 - var10000 = Tiles.field1101[var0][var1]; // L: 366 - var10000[var2 + 1] |= 1170; - var10000 = Tiles.field1101[var0][var1 + 1]; // L: 367 - var10000[var2] |= 585; - } else if (var4 == 2) { // L: 369 - var10000 = Tiles.field1101[var0][var1 + 1]; // L: 370 - var10000[var2] |= 585; - var10000 = Tiles.field1101[var0][var1]; // L: 371 - var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 373 - var10000 = Tiles.field1101[var0][var1]; // L: 374 - var10000[var2] |= 1170; - var10000 = Tiles.field1101[var0][var1]; // L: 375 - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 378 - var7.method3216(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 379 - var6.method4204(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { // L: 382 - if (var8.animationId == -1 && var8.transforms == null) { // L: 384 - var29 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 385 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1107[var4], 0, var19, var21); // L: 386 - if (var8.clipped) { // L: 387 - if (var4 == 0) { // L: 388 - class43.field307[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 389 - class43.field307[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 390 - class43.field307[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 391 - class43.field307[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 393 - var7.method3216(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { // L: 396 - if (var8.animationId == -1 && var8.transforms == null) { // L: 398 - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 399 - } - - var6.method4046(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 400 - if (var8.interactType != 0 && var7 != null) { // L: 401 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 402 - var6.method4204(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { // L: 405 - if (var8.animationId == -1 && var8.transforms == null) { // L: 407 - var29 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 408 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1102[var4], 0, 0, 0, var19, var21); // L: 409 - } else { - long var23; - Object var25; - if (var5 == 5) { // L: 412 - var22 = 16; // L: 413 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 414 - if (var23 != 0L) { // L: 415 - var22 = Tiles.getObjectDefinition(Message.Entity_unpackID(var23)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 417 - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 418 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1102[var4], 0, var22 * Tiles.field1100[var4], var22 * Tiles.field1105[var4], var19, var21); // L: 419 - } else if (var5 == 6) { // L: 422 - var22 = 8; // L: 423 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 424 - if (var23 != 0L) { // L: 425 - var22 = Tiles.getObjectDefinition(Message.Entity_unpackID(var23)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 427 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 428 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field1106[var4], var22 * Tiles.field1097[var4], var19, var21); // L: 429 - } else if (var5 == 7) { // L: 432 - var28 = var4 + 2 & 3; // L: 434 - if (var8.animationId == -1 && var8.transforms == null) { // L: 435 - var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 436 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 437 - } else if (var5 == 8) { // L: 440 - var22 = 8; // L: 441 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 442 - if (var23 != 0L) { // L: 443 - var22 = Tiles.getObjectDefinition(Message.Entity_unpackID(var23)).int2 / 2; - } - - int var27 = var4 + 2 & 3; // L: 446 - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 447 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 448 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 449 - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 452 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 453 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field1106[var4], var22 * Tiles.field1097[var4], var19, var21); // L: 455 - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 268 - var29 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 269 - } - - if (var29 != null && var6.method4046(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 270 271 - var28 = 15; // L: 272 - if (var29 instanceof Model) { // L: 273 - var28 = ((Model)var29).method4331() / 4; // L: 274 - if (var28 > 30) { // L: 275 - var28 = 30; - } - } - - for (int var31 = 0; var31 <= var9; ++var31) { // L: 277 - for (int var32 = 0; var32 <= var10; ++var32) { // L: 278 - if (var28 > class43.field307[var0][var31 + var1][var32 + var2]) { // L: 279 - class43.field307[var0][var31 + var1][var32 + var2] = (byte)var28; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 284 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } - } // L: 264 285 294 331 345 380 394 403 410 420 430 438 456 458 - @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "879452665" + descriptor = "(IIBI)V", + garbageValue = "-934855592" ) - static int method2235(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1295 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1296 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1297 - return 1; // L: 1298 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1300 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1301 - return 1; // L: 1302 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1304 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.text; // L: 1305 - return 1; // L: 1306 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1308 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1309 - return 1; // L: 1310 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1312 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1313 - return 1; // L: 1314 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1316 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1317 - return 1; // L: 1318 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1320 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1321 - return 1; // L: 1322 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1324 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1325 - return 1; // L: 1326 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1328 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1329 - return 1; // L: 1330 - } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1332 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1333 - return 1; // L: 1334 - } else if (var0 == 2610) { // L: 1336 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1337 - return 1; // L: 1338 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1340 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color; // L: 1341 - return 1; // L: 1342 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1344 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color2; // L: 1345 - return 1; // L: 1346 - } else if (var0 == 2613) { // L: 1348 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1349 - return 1; // L: 1350 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1352 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1353 - return 1; // L: 1354 - } else if (var0 != 2615 && var0 != 2616) { // L: 1356 - return 2; // L: 1360 - } else { - ++ChatChannel.Interpreter_intStackSize; // L: 1357 - return 1; // L: 1358 + final void method1830(int var1, int var2, byte var3) { + if (super.pathLength < 9) { + ++super.pathLength; } + + for (int var4 = super.pathLength; var4 > 0; --var4) { + super.pathX[var4] = super.pathX[var4 - 1]; + super.pathY[var4] = super.pathY[var4 - 1]; + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; + } + + super.pathX[0] = var1; + super.pathY[0] = var2; + super.pathTraversed[0] = var3; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "74" + ) + @Export("isVisible") + final boolean isVisible() { + return this.appearance != null; + } + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lio;I)Ljava/lang/String;", + garbageValue = "-110735832" + ) + static String method1833(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; + } + + var0 = var0.substring(0, var3) + KeyHandler.method83(JagexCache.method2617(var1, var2 - 1)) + var0.substring(var3 + 2); + } + } + } + + return var0; } } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index c4b5372113..d4a24dd0fb 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -3,529 +3,547 @@ 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("ih") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("equipmentIndices") static final int[] equipmentIndices; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("PlayerAppearance_cachedModels") - public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("f") + static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("s") @Export("equipment") int[] equipment; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("bodyColors") int[] bodyColors; @ObfuscatedName("v") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1143886593 + intValue = 1145661801 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 6473412202917111637L + longValue = -1088179132598858805L ) @Export("hash") long hash; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -8931955685626883585L + longValue = -755428217211497471L ) - long field2933; - @ObfuscatedName("m") + long field2929; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Let;" + descriptor = "[Ler;" ) - class136[] field2939; - @ObfuscatedName("r") - boolean field2942; + class137[] field2934; + @ObfuscatedName("f") + boolean field2935; static { - equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 - PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 27 + equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; + PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } public PlayerComposition() { - this.field2942 = false; // L: 21 + this.field2935 = false; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([I[Let;Z[IZII)V", - garbageValue = "196124213" + descriptor = "([I[Ler;Z[IZII)V", + garbageValue = "449012519" ) - public void method4837(int[] var1, class136[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field2939 = var2; // L: 30 - this.field2942 = var3; // L: 31 - this.update(var1, var4, var5, var6); // L: 32 - } // L: 33 + public void method4718(int[] var1, class137[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field2934 = var2; + this.field2935 = var3; + this.update(var1, var4, var5, var6); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([I[IZIB)V", - garbageValue = "94" + descriptor = "([I[IZII)V", + garbageValue = "1067042495" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { - if (var1 == null) { // L: 36 - var1 = new int[12]; // L: 37 + if (var1 == null) { + var1 = new int[12]; - for (int var5 = 0; var5 < 7; ++var5) { // L: 38 - for (int var6 = 0; var6 < TileItem.KitDefinition_fileCount; ++var6) { // L: 39 - KitDefinition var7 = class23.KitDefinition_get(var6); // L: 40 - if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { // L: 41 - var1[equipmentIndices[var5]] = var6 + 256; // L: 42 - break; // L: 43 + for (int var5 = 0; var5 < 7; ++var5) { + for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { + KitDefinition var7 = PendingSpawn.KitDefinition_get(var6); + if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { + var1[equipmentIndices[var5]] = var6 + 256; + break; } } } } - this.equipment = var1; // L: 48 - this.bodyColors = var2; // L: 49 - this.isFemale = var3; // L: 50 - this.npcTransformId = var4; // L: 51 - this.setHash(); // L: 52 - } // L: 53 + this.equipment = var1; + this.bodyColors = var2; + this.isFemale = var3; + this.npcTransformId = var4; + this.setHash(); + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1938874220" + descriptor = "(IZB)V", + garbageValue = "1" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { - if (var1 != 1 || !this.isFemale) { // L: 56 - int var3 = this.equipment[equipmentIndices[var1]]; // L: 57 - if (var3 != 0) { // L: 58 - var3 -= 256; // L: 59 + if (var1 != 1 || !this.isFemale) { + int var3 = this.equipment[equipmentIndices[var1]]; + if (var3 != 0) { + var3 -= 256; KitDefinition var4; do { - if (!var2) { // L: 61 - --var3; // L: 62 - if (var3 < 0) { // L: 63 - var3 = TileItem.KitDefinition_fileCount - 1; + if (!var2) { + --var3; + if (var3 < 0) { + var3 = KitDefinition.KitDefinition_fileCount - 1; } } else { - ++var3; // L: 66 - if (var3 >= TileItem.KitDefinition_fileCount) { // L: 67 + ++var3; + if (var3 >= KitDefinition.KitDefinition_fileCount) { var3 = 0; } } - var4 = class23.KitDefinition_get(var3); // L: 69 - } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); // L: 70 + var4 = PendingSpawn.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); - this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 - this.setHash(); // L: 73 + this.equipment[equipmentIndices[var1]] = var3 + 256; + this.setHash(); } } - } // L: 74 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1585830935" - ) - public void method4820(int var1, boolean var2) { - int var3 = this.bodyColors[var1]; // L: 77 - boolean var4; - if (!var2) { // L: 78 - do { - --var3; // L: 80 - if (var3 < 0) { // L: 81 - var3 = class69.field568[var1].length - 1; // L: 82 - } - - if (var1 == 4 && var3 >= 8) { // L: 86 - var4 = false; // L: 87 - } else { - var4 = true; // L: 90 - } - } while(!var4); // L: 92 - } else { - do { - ++var3; // L: 97 - if (var3 >= class69.field568[var1].length) { // L: 98 - var3 = 0; - } - - if (var1 == 4 && var3 >= 8) { // L: 101 - var4 = false; // L: 102 - } else { - var4 = true; // L: 105 - } - } while(!var4); // L: 107 - } - - this.bodyColors[var1] = var3; // L: 110 - this.setHash(); // L: 111 - } // L: 112 + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "86" + descriptor = "(IZI)V", + garbageValue = "1927127385" + ) + public void method4724(int var1, boolean var2) { + int var3 = this.bodyColors[var1]; + if (!var2) { + do { + --var3; + if (var3 < 0) { + var3 = Varps.field2914[var1].length - 1; + } + } while(!class15.method162(var1, var3)); + } else { + do { + ++var3; + if (var3 >= Varps.field2914[var1].length) { + var3 = 0; + } + } while(!class15.method162(var1, var3)); + } + + this.bodyColors[var1] = var3; + this.setHash(); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1021940736" ) @Export("changeSex") public void changeSex(boolean var1) { - if (this.isFemale != var1) { // L: 115 - this.update((int[])null, this.bodyColors, var1, -1); // L: 116 + if (this.isFemale != var1) { + this.update((int[])null, this.bodyColors, var1, -1); } - } // L: 117 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1987316978" + descriptor = "(Lnv;I)V", + garbageValue = "454693909" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); // L: 120 + var1.writeByte(this.isFemale ? 1 : 0); int var2; - for (var2 = 0; var2 < 7; ++var2) { // L: 121 - int var3 = this.equipment[equipmentIndices[var2]]; // L: 122 - if (var3 == 0) { // L: 123 + for (var2 = 0; var2 < 7; ++var2) { + int var3 = this.equipment[equipmentIndices[var2]]; + if (var3 == 0) { var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); // L: 124 + var1.writeByte(var3 - 256); } } - for (var2 = 0; var2 < 5; ++var2) { // L: 126 + for (var2 = 0; var2 < 5; ++var2) { var1.writeByte(this.bodyColors[var2]); } - } // L: 127 + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1503997487" + garbageValue = "1186311397" ) @Export("setHash") void setHash() { - long var1 = this.hash; // L: 130 - int var3 = this.equipment[5]; // L: 131 - int var4 = this.equipment[9]; // L: 132 - this.equipment[5] = var4; // L: 133 - this.equipment[9] = var3; // L: 134 - this.hash = 0L; // L: 135 + 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; int var5; - for (var5 = 0; var5 < 12; ++var5) { // L: 136 - this.hash <<= 4; // L: 137 - if (this.equipment[var5] >= 256) { // L: 138 + for (var5 = 0; var5 < 12; ++var5) { + this.hash <<= 4; + if (this.equipment[var5] >= 256) { this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { // L: 140 + if (this.equipment[0] >= 256) { this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { // L: 141 + if (this.equipment[1] >= 256) { this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { // L: 142 - this.hash <<= 3; // L: 143 - this.hash += (long)this.bodyColors[var5]; // L: 144 + for (var5 = 0; var5 < 5; ++var5) { + this.hash <<= 3; + this.hash += (long)this.bodyColors[var5]; } - this.hash <<= 1; // L: 146 - this.hash += (long)(this.isFemale ? 1 : 0); // L: 147 - this.equipment[5] = var3; // L: 148 - this.equipment[9] = var4; // L: 149 - if (var1 != 0L && this.hash != var1 || this.field2942) { // L: 150 + 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.field2935) { PlayerAppearance_cachedModels.remove(var1); } - } // L: 151 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lfm;ILfm;IB)Lgd;", - garbageValue = "16" + descriptor = "(Lfz;ILfz;II)Lgl;", + garbageValue = "-1324971136" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { // L: 154 - return class248.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155 + if (this.npcTransformId != -1) { + return UserComparator6.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { - long var5 = this.hash; // L: 157 - int[] var7 = this.equipment; // L: 158 - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 159 - var7 = new int[12]; // L: 160 + long var5 = this.hash; + int[] var7 = this.equipment; + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { + var7 = new int[12]; - for (int var8 = 0; var8 < 12; ++var8) { // L: 161 + for (int var8 = 0; var8 < 12; ++var8) { var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { // L: 162 - var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 163 - var7[5] = var1.shield; // L: 164 + if (var1.shield >= 0) { + var5 += (long)(var1.shield - this.equipment[5] << 40); + var7[5] = var1.shield; } - if (var1.weapon >= 0) { // L: 166 - var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 167 - var7[3] = var1.weapon; // L: 168 + if (var1.weapon >= 0) { + var5 += (long)(var1.weapon - this.equipment[3] << 48); + var7[3] = var1.weapon; } } - Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 171 - if (var18 == null) { // L: 172 - boolean var9 = false; // L: 173 + Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); + if (var18 == null) { + boolean var9 = false; int var11; - for (int var10 = 0; var10 < 12; ++var10) { // L: 174 - var11 = var7[var10]; // L: 175 - if (var11 >= 256 && var11 < 512 && !class23.KitDefinition_get(var11 - 256).ready()) { // L: 176 177 + for (int var10 = 0; var10 < 12; ++var10) { + var11 = var7[var10]; + if (var11 >= 256 && var11 < 512 && !PendingSpawn.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !class250.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180 + if (var11 >= 512 && !KeyHandler.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } - if (var9) { // L: 183 - if (this.field2933 != -1L) { // L: 184 - var18 = (Model)PlayerAppearance_cachedModels.get(this.field2933); + if (var9) { + if (this.field2929 != -1L) { + var18 = (Model)PlayerAppearance_cachedModels.get(this.field2929); } - if (var18 == null) { // L: 185 + if (var18 == null) { return null; } } - if (var18 == null) { // L: 187 - ModelData[] var19 = new ModelData[12]; // L: 188 - var11 = 0; // L: 189 + if (var18 == null) { + ModelData[] var19 = new ModelData[12]; + var11 = 0; int var13; - for (int var12 = 0; var12 < 12; ++var12) { // L: 190 - var13 = var7[var12]; // L: 191 - if (var13 >= 256 && var13 < 512) { // L: 192 - ModelData var14 = class23.KitDefinition_get(var13 - 256).getModelData(); // L: 193 - if (var14 != null) { // L: 194 + for (int var12 = 0; var12 < 12; ++var12) { + var13 = var7[var12]; + if (var13 >= 256 && var13 < 512) { + ModelData var14 = PendingSpawn.KitDefinition_get(var13 - 256).getModelData(); + if (var14 != null) { var19[var11++] = var14; } } - if (var13 >= 512) { // L: 196 - ItemComposition var22 = class250.ItemDefinition_get(var13 - 512); // L: 197 - ModelData var15 = var22.method3070(this.isFemale); // L: 198 - if (var15 != null) { // L: 199 - if (this.field2939 != null) { // L: 200 - class136 var16 = this.field2939[var12]; // L: 201 - if (var16 != null) { // L: 202 + if (var13 >= 512) { + ItemComposition var22 = KeyHandler.ItemDefinition_get(var13 - 512); + ModelData var15 = var22.method3058(this.isFemale); + if (var15 != null) { + if (this.field2934 != null) { + class137 var16 = this.field2934[var12]; + if (var16 != null) { int var17; - if (var16.field1542 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1542.length) { // L: 203 - for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204 - var15.recolor(var22.recolorTo[var17], var16.field1542[var17]); // L: 205 + if (var16.field1515 != null && var22.recolorFrom != null && var16.field1515.length == var22.recolorTo.length) { + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { + var15.recolor(var22.recolorTo[var17], var16.field1515[var17]); } } - if (var16.field1541 != null && var22.retextureFrom != null && var16.field1541.length == var22.retextureTo.length) { // L: 208 - for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209 - var15.retexture(var22.retextureTo[var17], var16.field1541[var17]); // L: 210 + if (var16.field1518 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1518.length) { + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { + var15.retexture(var22.retextureTo[var17], var16.field1518[var17]); } } } } - var19[var11++] = var15; // L: 215 + var19[var11++] = var15; } } } - ModelData var20 = new ModelData(var19, var11); // L: 219 + ModelData var20 = new ModelData(var19, var11); - for (var13 = 0; var13 < 5; ++var13) { // L: 220 - if (this.bodyColors[var13] < class69.field568[var13].length) { // L: 221 - var20.recolor(VarcInt.field1581[var13], class69.field568[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { + if (this.bodyColors[var13] < Varps.field2914[var13].length) { + var20.recolor(class282.field3634[var13], Varps.field2914[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < Skills.field3175[var13].length) { // L: 222 - var20.recolor(ModelData0.field2517[var13], Skills.field3175[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < VertexNormal.field2498[var13].length) { + var20.recolor(class7.field25[var13], VertexNormal.field2498[var13][this.bodyColors[var13]]); } } - var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224 - PlayerAppearance_cachedModels.put(var18, var5); // L: 225 - this.field2933 = var5; // L: 226 + var18 = var20.toModel(64, 850, -30, -50, -30); + PlayerAppearance_cachedModels.put(var18, var5); + this.field2929 = var5; } } - if (var1 == null && var3 == null) { // L: 230 + if (var1 == null && var3 == null) { return var18; } else { Model var21; - if (var1 != null && var3 != null) { // L: 231 + if (var1 != null && var3 != null) { var21 = var1.applyTransformations(var18, var2, var3, var4); - } else if (var1 != null) { // L: 232 + } else if (var1 != null) { var21 = var1.transformActorModel(var18, var2); } else { - var21 = var3.transformActorModel(var18, var4); // L: 233 + var21 = var3.transformActorModel(var18, var4); } - return var21; // L: 234 + return var21; } } } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lga;", - garbageValue = "-1528210123" + descriptor = "(I)Lgz;", + garbageValue = "-251554342" ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { // L: 238 - return class248.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239 + if (this.npcTransformId != -1) { + return UserComparator6.getNpcDefinition(this.npcTransformId).getModelData(); } else { - boolean var1 = false; // L: 241 + boolean var1 = false; int var3; - for (int var2 = 0; var2 < 12; ++var2) { // L: 242 - var3 = this.equipment[var2]; // L: 243 - if (var3 >= 256 && var3 < 512 && !class23.KitDefinition_get(var3 - 256).method2754()) { // L: 244 245 + for (int var2 = 0; var2 < 12; ++var2) { + var3 = this.equipment[var2]; + if (var3 >= 256 && var3 < 512 && !PendingSpawn.KitDefinition_get(var3 - 256).method2755()) { var1 = true; } - if (var3 >= 512 && !class250.ItemDefinition_get(var3 - 512).method3102(this.isFemale)) { // L: 247 248 + if (var3 >= 512 && !KeyHandler.ItemDefinition_get(var3 - 512).method3059(this.isFemale)) { var1 = true; } } - if (var1) { // L: 251 + if (var1) { return null; } else { - ModelData[] var7 = new ModelData[12]; // L: 252 - var3 = 0; // L: 253 + ModelData[] var7 = new ModelData[12]; + var3 = 0; int var5; - for (int var4 = 0; var4 < 12; ++var4) { // L: 254 - var5 = this.equipment[var4]; // L: 255 + for (int var4 = 0; var4 < 12; ++var4) { + var5 = this.equipment[var4]; ModelData var6; - if (var5 >= 256 && var5 < 512) { // L: 256 - var6 = class23.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257 - if (var6 != null) { // L: 258 + if (var5 >= 256 && var5 < 512) { + var6 = PendingSpawn.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + if (var6 != null) { var7[var3++] = var6; } } - if (var5 >= 512) { // L: 260 - var6 = class250.ItemDefinition_get(var5 - 512).method3082(this.isFemale); // L: 261 - if (var6 != null) { // L: 262 + if (var5 >= 512) { + var6 = KeyHandler.ItemDefinition_get(var5 - 512).method3047(this.isFemale); + if (var6 != null) { var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); // L: 265 + ModelData var8 = new ModelData(var7, var3); - for (var5 = 0; var5 < 5; ++var5) { // L: 266 - if (this.bodyColors[var5] < class69.field568[var5].length) { // L: 267 - var8.recolor(VarcInt.field1581[var5], class69.field568[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { + if (this.bodyColors[var5] < Varps.field2914[var5].length) { + var8.recolor(class282.field3634[var5], Varps.field2914[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < Skills.field3175[var5].length) { // L: 268 - var8.recolor(ModelData0.field2517[var5], Skills.field3175[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < VertexNormal.field2498[var5].length) { + var8.recolor(class7.field25[var5], VertexNormal.field2498[var5][this.bodyColors[var5]]); } } - return var8; // L: 270 + return var8; } } } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2124364299" + garbageValue = "-1747428254" ) @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 + class248.getNpcDefinition(this.npcTransformId).id; // L: 274 275 + 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 + UserComparator6.getNpcDefinition(this.npcTransformId).id; } - @ObfuscatedName("jc") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIIIIS)V", - garbageValue = "7586" + descriptor = "(IB)I", + garbageValue = "111" ) - static final void method4850(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 9851 - int var7 = var3 - var1; // L: 9852 - int var8 = var6 >= 0 ? var6 : -var6; // L: 9853 - int var9 = var7 >= 0 ? var7 : -var7; // L: 9854 - int var10 = var8; // L: 9855 - if (var8 < var9) { // L: 9856 - var10 = var9; + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; } + } - if (var10 != 0) { // L: 9857 - int var11 = (var6 << 16) / var10; // L: 9858 - int var12 = (var7 << 16) / var10; // L: 9859 - if (var12 <= var11) { // L: 9860 - var11 = -var11; - } else { - var12 = -var12; // L: 9861 + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-1479534515" + ) + static int method4755(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + EnumComposition var10 = class99.getEnum(var3); + if (var10.outputType != 's') { } - int var13 = var5 * var12 >> 17; // L: 9862 - int var14 = var5 * var12 + 1 >> 17; // L: 9863 - int var15 = var5 * var11 >> 17; // L: 9864 - int var16 = var5 * var11 + 1 >> 17; // L: 9865 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9866 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9867 - int var17 = var0 + var13; // L: 9868 - int var18 = var0 - var14; // L: 9869 - int var19 = var0 + var6 - var14; // L: 9870 - int var20 = var0 + var13 + var6; // L: 9871 - int var21 = var15 + var1; // L: 9872 - int var22 = var1 - var16; // L: 9873 - int var23 = var7 + var1 - var16; // L: 9874 - int var24 = var15 + var7 + var1; // L: 9875 - Rasterizer3D.method3959(var17, var18, var19); // L: 9876 - Rasterizer3D.method3962(var21, var22, var23, var17, var18, var19, var4); // L: 9877 - Rasterizer3D.method3959(var17, var19, var20); // L: 9878 - Rasterizer3D.method3962(var21, var23, var24, var17, var19, var20, var4); // L: 9879 - } - } // L: 9880 - - @ObfuscatedName("lp") - @ObfuscatedSignature( - descriptor = "(Liv;B)Liv;", - garbageValue = "-77" - ) - static Widget method4851(Widget var0) { - int var1 = class8.method104(class22.getWidgetFlags(var0)); // L: 11552 - if (var1 == 0) { // L: 11553 - return null; - } else { - for (int var2 = 0; var2 < var1; ++var2) { // L: 11554 - var0 = WorldMapData_1.getWidget(var0.parentId); // L: 11555 - if (var0 == null) { // L: 11556 - return null; + for (var6 = 0; var6 < var10.outputCount; ++var6) { + if (var9 == var10.keys[var6]) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var10.strVals[var6]; + var10 = null; + break; } } - return var0; // L: 11558 + if (var10 != null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + EnumComposition var4 = class99.getEnum(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + EnumComposition var7 = class99.getEnum(var5); + if (var3 == var7.inputType && var9 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var9 == 115) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var9 == 115) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var9 == 115) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } } } } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 94a5d16146..7db497495e 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("ab") @Implements("PlayerProvider") public interface PlayerProvider { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lbq;", - garbageValue = "2087332852" + descriptor = "(I)Ly;", + garbageValue = "1627596097" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 2fa40bc0c6..6c0ad5c4b6 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,85 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jh") @Implements("PlayerType") -public enum PlayerType implements Enumerated -{ - @ObfuscatedName("f") +public enum PlayerType implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljh;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljh;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljh;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljh;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljh;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljh;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljh;" ) - field3544(6, 22, false, false, true); + field3540(6, 22, false, false, true); - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1170932769 + intValue = 54331325 ) @Export("id") final int id; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1972754767 + intValue = -103099681 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { - this.id = var3; // L: 24 - this.modIcon = var4; // L: 25 - this.isPrivileged = var6; // L: 26 - this.isUser = var7; // L: 27 - } // L: 28 + this.id = var3; + this.modIcon = var4; + this.isPrivileged = var6; + this.isUser = var7; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 31 + return this.id; } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index dd964d88cb..1fc5bfc9df 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,82 +4,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("cw") @Implements("Players") public class Players { + @ObfuscatedName("qc") + static boolean field1182; @ObfuscatedName("v") - static byte[] field1372; - @ObfuscatedName("y") - static byte[] field1361; + static byte[] field1174; @ObfuscatedName("j") + static byte[] field1170; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lnt;" + descriptor = "[Lnv;" ) - static Buffer[] field1362; - @ObfuscatedName("o") + static Buffer[] field1167; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1407274759 + intValue = 1053067897 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1572681721 + intValue = 298853217 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1672795699 + intValue = -408351623 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; @ObfuscatedName("k") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnv;" ) - static Buffer field1373; + static Buffer field1181; static { - field1372 = new byte[2048]; // L: 18 - field1361 = new byte[2048]; // L: 19 - field1362 = new Buffer[2048]; // L: 20 - Players_count = 0; // L: 21 - Players_indices = new int[2048]; // L: 22 - Players_emptyIdxCount = 0; // L: 23 - Players_emptyIndices = new int[2048]; // L: 24 - Players_regions = new int[2048]; // L: 25 - Players_orientations = new int[2048]; // L: 26 - Players_targetIndices = new int[2048]; // L: 27 - Players_pendingUpdateCount = 0; // L: 28 - Players_pendingUpdateIndices = new int[2048]; // L: 29 - field1373 = new Buffer(new byte[5000]); // L: 30 + field1174 = new byte[2048]; + field1170 = new byte[2048]; + field1167 = new Buffer[2048]; + Players_count = 0; + Players_indices = new int[2048]; + Players_emptyIdxCount = 0; + Players_emptyIndices = new int[2048]; + Players_regions = new int[2048]; + Players_orientations = new int[2048]; + Players_targetIndices = new int[2048]; + Players_pendingUpdateCount = 0; + Players_pendingUpdateIndices = new int[2048]; + field1181 = new Buffer(new byte[5000]); } - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1219077649" + descriptor = "(Ljy;IIIZI)V", + garbageValue = "-1034711419" ) - public static void method2402() { - ParamComposition.ParamDefinition_cached.clear(); // L: 68 - } // L: 69 + public static void method2022(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class234.musicPlayerStatus = 1; + class234.musicTrackArchive = var0; + class234.musicTrackGroupId = var1; + UserComparator6.musicTrackFileId = var2; + HorizontalAlignment.musicTrackVolume = var3; + EnumComposition.musicTrackBoolean = var4; + ClanChannel.pcmSampleLength = 10000; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-701145156" + ) + public static boolean method2021(int var0) { + return (var0 >> 20 & 1) != 0; + } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 95e355f0df..7a8f46e417 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("oo") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Loo;" ) - static final PrivateChatMode field3885; - @ObfuscatedName("e") + static final PrivateChatMode field4299; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Loo;" ) - public static final PrivateChatMode field3886; + public static final PrivateChatMode field4298; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Loo;" ) - static final PrivateChatMode field3881; - @ObfuscatedName("y") + static final PrivateChatMode field4297; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1188638191 + intValue = 631961063 ) - public final int field3884; + public final int field4300; static { - field3885 = new PrivateChatMode(0); // L: 5 - field3886 = new PrivateChatMode(1); // L: 6 - field3881 = new PrivateChatMode(2); - } // L: 7 + field4299 = new PrivateChatMode(0); + field4298 = new PrivateChatMode(1); + field4297 = new PrivateChatMode(2); + } PrivateChatMode(int var1) { - this.field3884 = var1; // L: 11 - } // L: 12 + this.field4300 = var1; + } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index e68ea6ee20..e949d5a2f1 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,239 +4,233 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("bv") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("oq") - @ObfuscatedSignature( - descriptor = "Lei;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -620929205 + intValue = -1111424395 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1503104185 + intValue = -1253498993 ) @Export("plane") int plane; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1281749377 + intValue = 255024795 ) @Export("sourceX") int sourceX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -856181149 + intValue = 1599918591 ) @Export("sourceY") int sourceY; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2061408833 + intValue = 1504804357 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -722624469 + intValue = 991764239 ) @Export("endHeight") int endHeight; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -578493745 + intValue = -367161897 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1349240519 + intValue = -915919331 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 383721093 + intValue = 1457010005 ) @Export("slope") int slope; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1902000949 + intValue = 754451797 ) @Export("startHeight") int startHeight; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -770535721 + intValue = 1233798491 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("isMoving") boolean isMoving; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("x") double x; @ObfuscatedName("k") @Export("y") double y; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("z") double z; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("speedX") double speedX; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("speedY") double speedY; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("speed") double speed; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("speedZ") double speedZ; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -9873959 + intValue = 124208403 ) @Export("yaw") int yaw; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -909606039 + intValue = -1460402629 ) @Export("pitch") int pitch; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfz;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2026775219 + intValue = 25550675 ) @Export("frame") int frame; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -472667051 + intValue = 1297468435 ) @Export("frameCycle") int frameCycle; Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { - this.isMoving = false; // L: 20 - this.frame = 0; // L: 32 - this.frameCycle = 0; // L: 33 - this.id = var1; // L: 36 - this.plane = var2; // L: 37 - this.sourceX = var3; // L: 38 - this.sourceY = var4; // L: 39 - this.sourceZ = var5; // L: 40 - this.cycleStart = var6; // L: 41 - this.cycleEnd = var7; // L: 42 - this.slope = var8; // L: 43 - this.startHeight = var9; // L: 44 - this.targetIndex = var10; // L: 45 - this.endHeight = var11; // L: 46 - this.isMoving = false; // L: 47 - int var12 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 48 - if (var12 != -1) { // L: 49 - this.sequenceDefinition = WorldMapScaleHandler.SequenceDefinition_get(var12); + this.isMoving = false; + this.frame = 0; + this.frameCycle = 0; + this.id = var1; + this.plane = var2; + this.sourceX = var3; + this.sourceY = var4; + this.sourceZ = var5; + this.cycleStart = var6; + this.cycleEnd = var7; + this.slope = var8; + this.startHeight = var9; + this.targetIndex = var10; + this.endHeight = var11; + this.isMoving = false; + int var12 = PcmPlayer.SpotAnimationDefinition_get(this.id).sequence; + if (var12 != -1) { + this.sequenceDefinition = World.SequenceDefinition_get(var12); } else { - this.sequenceDefinition = null; // L: 50 + this.sequenceDefinition = null; } - } // L: 51 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-4" + descriptor = "(IIIII)V", + garbageValue = "-1925687009" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; - if (!this.isMoving) { // L: 54 - var5 = (double)(var1 - this.sourceX); // L: 55 - double var7 = (double)(var2 - this.sourceY); // L: 56 - double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 - this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; // L: 58 - this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; // L: 59 - this.z = (double)this.sourceZ; // L: 60 + if (!this.isMoving) { + var5 = (double)(var1 - this.sourceX); + double var7 = (double)(var2 - this.sourceY); + double var9 = Math.sqrt(var7 * var7 + var5 * var5); + this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; + this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; + this.z = (double)this.sourceZ; } - var5 = (double)(this.cycleEnd + 1 - var4); // L: 62 - this.speedX = ((double)var1 - this.x) / var5; // L: 63 - this.speedY = ((double)var2 - this.y) / var5; // L: 64 - this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); // L: 65 - if (!this.isMoving) { // L: 66 + var5 = (double)(this.cycleEnd + 1 - var4); + this.speedX = ((double)var1 - this.x) / var5; + this.speedY = ((double)var2 - this.y) / var5; + this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); + if (!this.isMoving) { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); // L: 67 - } // L: 68 + this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lgd;", - garbageValue = "326918784" + descriptor = "(I)Lgl;", + garbageValue = "1291603774" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 92 - Model var2 = var1.getModel(this.frame); // L: 93 - if (var2 == null) { // L: 94 + SpotAnimationDefinition var1 = PcmPlayer.SpotAnimationDefinition_get(this.id); + Model var2 = var1.getModel(this.frame); + if (var2 == null) { return null; } else { - var2.rotateZ(this.pitch); // L: 95 - return var2; // L: 96 + var2.rotateZ(this.pitch); + return var2; } } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1411274037" + garbageValue = "-893243986" ) @Export("advance") final void advance(int var1) { - this.isMoving = true; // L: 71 - this.x += (double)var1 * this.speedX; // L: 72 - this.y += this.speedY * (double)var1; // L: 73 - this.z += this.speedZ * (double)var1 + 0.5D * this.accelerationZ * (double)var1 * (double)var1; // 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 - this.frameCycle += var1; // L: 79 + this.isMoving = true; + this.x += this.speedX * (double)var1; + this.y += this.speedY * (double)var1; + this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; + this.speedZ += this.accelerationZ * (double)var1; + this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; + this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; + if (this.sequenceDefinition != null) { + this.frameCycle += var1; while (true) { do { do { - if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 80 - return; // L: 89 + if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { + return; } - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 81 - ++this.frame; // L: 82 - } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 83 + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; + ++this.frame; + } while(this.frame < this.sequenceDefinition.frameIds.length); - this.frame -= this.sequenceDefinition.frameCount; // L: 84 - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 85 + this.frame -= this.sequenceDefinition.frameCount; + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); this.frame = 0; } @@ -245,80 +239,41 @@ public final class Projectile extends Renderable { @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-530547820" + descriptor = "(Ljy;I)V", + garbageValue = "-1667200203" ) - public static void method2075() { - ItemComposition.ItemDefinition_cached.clear(); // L: 555 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 556 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 557 - } // L: 558 + public static void method1702(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } - @ObfuscatedName("fq") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-114" + descriptor = "([BIIII[Lfy;I)V", + garbageValue = "-1319516605" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { // L: 1388 - if (Client.gameState == 0) { // L: 1389 - class1.client.method672(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1390 - Client.loginState = 0; // L: 1391 - Client.field811 = 0; // L: 1392 - Client.field654 = 0; // L: 1393 - Client.timer.method5675(var0); // L: 1394 - if (var0 != 20) { // L: 1395 - class19.method281(false); + static final void method1700(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 64; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var8 + var2] &= -16777217; + } } } - - if (var0 != 20 && var0 != 40 && DefaultsGroup.field3887 != null) { // L: 1397 1398 - DefaultsGroup.field3887.close(); // L: 1399 - DefaultsGroup.field3887 = null; // L: 1400 - } - - if (Client.gameState == 25) { // L: 1403 - Client.field678 = 0; // L: 1404 - Client.field618 = 0; // L: 1405 - Client.field789 = 1; // L: 1406 - Client.field742 = 0; // L: 1407 - Client.field677 = 1; // L: 1408 - } - - if (var0 != 5 && var0 != 10) { // L: 1410 - if (var0 == 20) { // L: 1413 - DesktopPlatformInfoProvider.method6109(JagexCache.archive10, ModeWhere.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1414 - } else if (var0 == 11) { // L: 1416 - DesktopPlatformInfoProvider.method6109(JagexCache.archive10, ModeWhere.archive8, false, 4); // L: 1417 - } else if (class377.clearLoginScreen) { // L: 1420 - Coord.titleboxSprite = null; // L: 1421 - class289.titlebuttonSprite = null; // L: 1422 - Login.runesSprite = null; // L: 1423 - class339.leftTitleSprite = null; // L: 1424 - class377.rightTitleSprite = null; // L: 1425 - Messages.logoSprite = null; // L: 1426 - GrandExchangeEvents.title_muteSprite = null; // L: 1427 - Login.options_buttons_0Sprite = null; // L: 1428 - WorldMapCacheName.options_buttons_2Sprite = null; // L: 1429 - Varcs.worldSelectBackSprites = null; // L: 1430 - class364.worldSelectFlagSprites = null; // L: 1431 - class10.worldSelectArrows = null; // L: 1432 - Huffman.worldSelectStars = null; // L: 1433 - class35.field244 = null; // L: 1434 - PendingSpawn.loginScreenRunesAnimation.method2296(); // L: 1435 - PcmPlayer.method856(2); // L: 1436 - class105.method2358(true); // L: 1437 - class377.clearLoginScreen = false; // L: 1438 - } - } else { - DesktopPlatformInfoProvider.method6109(JagexCache.archive10, ModeWhere.archive8, true, 0); // L: 1411 - } - - Client.gameState = var0; // L: 1440 } - } // L: 1441 + + Buffer var10 = new Buffer(var0); + + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + for (int var9 = 0; var9 < 64; ++var9) { + class125.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); + } + } + } + + } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index df1d5af79a..2735828a00 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,88 +14,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("am") +@ObfuscatedName("e") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("component") Component component; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("image") Image image; RasterProvider(int var1, int var2, Component var3) { - super.width = var1; // L: 23 - super.height = var2; // L: 24 - super.pixels = new int[var2 * var1 + 1]; // L: 25 - DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length); // L: 26 - DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255); // L: 27 - WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null); // L: 28 - this.image = new BufferedImage(var5, var6, false, new Hashtable()); // L: 29 - this.setComponent(var3); // L: 30 - this.apply(); // L: 31 - } // L: 32 + super.width = var1; + super.height = var2; + super.pixels = new int[var2 * var1 + 1]; + DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length); + DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255); + WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null); + this.image = new BufferedImage(var5, var6, false, new Hashtable()); + this.setComponent(var3); + this.apply(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "1" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1711952892" ) @Export("setComponent") final void setComponent(Component var1) { - this.component = var1; // L: 35 - } // L: 36 + this.component = var1; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-474214385" + descriptor = "(IIB)V", + garbageValue = "-13" ) @Export("drawFull") public final void drawFull(int var1, int var2) { - this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 - } // L: 40 + this.drawFull0(this.component.getGraphics(), var1, var2); + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "640" + descriptor = "(IIIII)V", + garbageValue = "-984138546" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { - this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 - } // L: 44 + this.draw0(this.component.getGraphics(), var1, var2, var3, var4); + } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "-941399356" + descriptor = "(Ljava/awt/Graphics;IIB)V", + garbageValue = "14" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { - var1.drawImage(this.image, var2, var3, this.component); // L: 48 - } catch (Exception var5) { // L: 50 - this.component.repaint(); // L: 51 + var1.drawImage(this.image, var2, var3, this.component); + } catch (Exception var5) { + this.component.repaint(); } - } // L: 53 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-1413696470" + garbageValue = "-2135638956" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { - Shape var6 = var1.getClip(); // L: 57 - var1.clipRect(var2, var3, var4, var5); // L: 58 - var1.drawImage(this.image, 0, 0, this.component); // L: 59 - var1.setClip(var6); // L: 60 - } catch (Exception var7) { // L: 62 - this.component.repaint(); // L: 63 + Shape var6 = var1.getClip(); + var1.clipRect(var2, var3, var4, var5); + var1.drawImage(this.image, 0, 0, this.component); + var1.setClip(var6); + } catch (Exception var7) { + this.component.repaint(); } - } // L: 65 + } } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index f221f94982..c6efb9b15b 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,171 +3,171 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("og") +@ObfuscatedName("oz") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; static { - Rasterizer2D_yClipStart = 0; // L: 11 - Rasterizer2D_yClipEnd = 0; // L: 12 - Rasterizer2D_xClipStart = 0; // L: 13 - Rasterizer2D_xClipEnd = 0; // L: 14 + Rasterizer2D_yClipStart = 0; + Rasterizer2D_yClipEnd = 0; + Rasterizer2D_xClipStart = 0; + Rasterizer2D_xClipEnd = 0; } protected Rasterizer2D() { - } // L: 16 + } - @ObfuscatedName("ct") + @ObfuscatedName("dn") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { - Rasterizer2D_pixels = var0; // L: 19 - Rasterizer2D_width = var1; // L: 20 - Rasterizer2D_height = var2; // L: 21 - Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 - } // L: 23 + Rasterizer2D_pixels = var0; + Rasterizer2D_width = var1; + Rasterizer2D_height = var2; + Rasterizer2D_setClip(0, 0, var1, var2); + } - @ObfuscatedName("ci") + @ObfuscatedName("de") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { - Rasterizer2D_xClipStart = 0; // L: 26 - Rasterizer2D_yClipStart = 0; // L: 27 - Rasterizer2D_xClipEnd = Rasterizer2D_width; // L: 28 - Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 - } // L: 30 + Rasterizer2D_xClipStart = 0; + Rasterizer2D_yClipStart = 0; + Rasterizer2D_xClipEnd = Rasterizer2D_width; + Rasterizer2D_yClipEnd = Rasterizer2D_height; + } - @ObfuscatedName("cs") + @ObfuscatedName("dc") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { - if (var0 < 0) { // L: 33 + if (var0 < 0) { var0 = 0; } - if (var1 < 0) { // L: 34 + if (var1 < 0) { var1 = 0; } - if (var2 > Rasterizer2D_width) { // L: 35 + if (var2 > Rasterizer2D_width) { var2 = Rasterizer2D_width; } if (var3 > Rasterizer2D_height) { - var3 = Rasterizer2D_height; // L: 36 + var3 = Rasterizer2D_height; } - Rasterizer2D_xClipStart = var0; // L: 37 - Rasterizer2D_yClipStart = var1; // L: 38 - Rasterizer2D_xClipEnd = var2; // L: 39 - Rasterizer2D_yClipEnd = var3; // L: 40 - } // L: 41 + Rasterizer2D_xClipStart = var0; + Rasterizer2D_yClipStart = var1; + Rasterizer2D_xClipEnd = var2; + Rasterizer2D_yClipEnd = var3; + } - @ObfuscatedName("co") + @ObfuscatedName("do") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { - if (Rasterizer2D_xClipStart < var0) { // L: 44 + if (Rasterizer2D_xClipStart < var0) { Rasterizer2D_xClipStart = var0; } - if (Rasterizer2D_yClipStart < var1) { // L: 45 + if (Rasterizer2D_yClipStart < var1) { Rasterizer2D_yClipStart = var1; } - if (Rasterizer2D_xClipEnd > var2) { // L: 46 + if (Rasterizer2D_xClipEnd > var2) { Rasterizer2D_xClipEnd = var2; } - if (Rasterizer2D_yClipEnd > var3) { // L: 47 + if (Rasterizer2D_yClipEnd > var3) { Rasterizer2D_yClipEnd = var3; } - } // L: 48 + } - @ObfuscatedName("cj") + @ObfuscatedName("dx") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { - var0[0] = Rasterizer2D_xClipStart; // L: 51 - var0[1] = Rasterizer2D_yClipStart; // L: 52 - var0[2] = Rasterizer2D_xClipEnd; // L: 53 - var0[3] = Rasterizer2D_yClipEnd; // L: 54 - } // L: 55 + var0[0] = Rasterizer2D_xClipStart; + var0[1] = Rasterizer2D_yClipStart; + var0[2] = Rasterizer2D_xClipEnd; + var0[3] = Rasterizer2D_yClipEnd; + } - @ObfuscatedName("cr") + @ObfuscatedName("dr") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { - Rasterizer2D_xClipStart = var0[0]; // L: 58 - Rasterizer2D_yClipStart = var0[1]; // L: 59 - Rasterizer2D_xClipEnd = var0[2]; // L: 60 - Rasterizer2D_yClipEnd = var0[3]; // L: 61 - } // L: 62 + Rasterizer2D_xClipStart = var0[0]; + Rasterizer2D_yClipStart = var0[1]; + Rasterizer2D_xClipEnd = var0[2]; + Rasterizer2D_yClipEnd = var0[3]; + } - @ObfuscatedName("cl") + @ObfuscatedName("da") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { - int var0 = 0; // L: 65 + int var0 = 0; int var1; - for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { // L: 66 67 75 - Rasterizer2D_pixels[var0++] = 0; // L: 68 - Rasterizer2D_pixels[var0++] = 0; // L: 69 - Rasterizer2D_pixels[var0++] = 0; // L: 70 - Rasterizer2D_pixels[var0++] = 0; // L: 71 - Rasterizer2D_pixels[var0++] = 0; // L: 72 - Rasterizer2D_pixels[var0++] = 0; // L: 73 - Rasterizer2D_pixels[var0++] = 0; // L: 74 + for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; } - for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { // L: 77 78 + for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { } - } // L: 79 + } - @ObfuscatedName("cw") + @ObfuscatedName("dw") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { - if (var2 == 0) { // L: 82 - Rasterizer2D_setPixel(var0, var1, var3); // L: 83 + if (var2 == 0) { + Rasterizer2D_setPixel(var0, var1, var3); } else { - if (var2 < 0) { // L: 86 + if (var2 < 0) { var2 = -var2; } - int var4 = var1 - var2; // L: 87 - if (var4 < Rasterizer2D_yClipStart) { // L: 88 + int var4 = var1 - var2; + if (var4 < Rasterizer2D_yClipStart) { var4 = Rasterizer2D_yClipStart; } - int var5 = var2 + var1 + 1; // L: 89 - if (var5 > Rasterizer2D_yClipEnd) { // L: 90 + int var5 = var2 + var1 + 1; + if (var5 > Rasterizer2D_yClipEnd) { var5 = Rasterizer2D_yClipEnd; } - int var6 = var4; // L: 91 - int var7 = var2 * var2; // L: 92 - int var8 = 0; // L: 93 - int var9 = var1 - var4; // L: 94 - int var10 = var9 * var9; // L: 95 - int var11 = var10 - var9; // L: 96 - if (var1 > var5) { // L: 97 + int var6 = var4; + int var7 = var2 * var2; + int var8 = 0; + int var9 = var1 - var4; + int var10 = var9 * var9; + int var11 = var10 - var9; + if (var1 > var5) { var1 = var5; } @@ -175,99 +175,99 @@ public class Rasterizer2D extends DualNode { int var13; int var14; int var15; - while (var6 < var1) { // L: 98 - while (var11 <= var7 || var10 <= var7) { // L: 99 - var10 = var10 + var8 + var8; // L: 100 - var11 += var8++ + var8; // L: 101 + while (var6 < var1) { + while (var11 <= var7 || var10 <= var7) { + var10 = var10 + var8 + var8; + var11 += var8++ + var8; } - var12 = var0 - var8 + 1; // L: 103 - if (var12 < Rasterizer2D_xClipStart) { // L: 104 + var12 = var0 - var8 + 1; + if (var12 < Rasterizer2D_xClipStart) { var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; // L: 105 - if (var13 > Rasterizer2D_xClipEnd) { // L: 106 + var13 = var0 + var8; + if (var13 > Rasterizer2D_xClipEnd) { var13 = Rasterizer2D_xClipEnd; } - var14 = var12 + var6 * Rasterizer2D_width; // L: 107 + var14 = var12 + var6 * Rasterizer2D_width; - for (var15 = var12; var15 < var13; ++var15) { // L: 108 + for (var15 = var12; var15 < var13; ++var15) { Rasterizer2D_pixels[var14++] = var3; } - ++var6; // L: 109 - var10 -= var9-- + var9; // L: 110 - var11 -= var9 + var9; // L: 111 + ++var6; + var10 -= var9-- + var9; + var11 -= var9 + var9; } - var8 = var2; // L: 113 - var9 = var6 - var1; // L: 114 - var11 = var7 + var9 * var9; // L: 115 - var10 = var11 - var2; // L: 116 + var8 = var2; + var9 = var6 - var1; + var11 = var7 + var9 * var9; + var10 = var11 - var2; - for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { // L: 117 118 131 - while (var11 > var7 && var10 > var7) { // L: 119 - var11 -= var8-- + var8; // L: 120 - var10 -= var8 + var8; // L: 121 + for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { + while (var11 > var7 && var10 > var7) { + var11 -= var8-- + var8; + var10 -= var8 + var8; } - var12 = var0 - var8; // L: 123 - if (var12 < Rasterizer2D_xClipStart) { // L: 124 + var12 = var0 - var8; + if (var12 < Rasterizer2D_xClipStart) { var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; // L: 125 - if (var13 > Rasterizer2D_xClipEnd - 1) { // L: 126 + var13 = var0 + var8; + if (var13 > Rasterizer2D_xClipEnd - 1) { var13 = Rasterizer2D_xClipEnd - 1; } - var14 = var12 + var6 * Rasterizer2D_width; // L: 127 + var14 = var12 + var6 * Rasterizer2D_width; for (var15 = var12; var15 <= var13; ++var15) { - Rasterizer2D_pixels[var14++] = var3; // L: 128 + Rasterizer2D_pixels[var14++] = var3; } - ++var6; // L: 129 - var11 = var11 + var9 + var9; // L: 130 + ++var6; + var11 = var11 + var9 + var9; } } - } // L: 84 133 + } - @ObfuscatedName("ck") + @ObfuscatedName("dj") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var4 != 0) { // L: 136 - if (var4 == 256) { // L: 137 - drawCircle(var0, var1, var2, var3); // L: 138 + if (var4 != 0) { + if (var4 == 256) { + drawCircle(var0, var1, var2, var3); } else { - if (var2 < 0) { // L: 141 + if (var2 < 0) { var2 = -var2; } - int var5 = 256 - var4; // L: 142 - int var6 = (var3 >> 16 & 255) * var4; // L: 143 - int var7 = (var3 >> 8 & 255) * var4; // L: 144 - int var8 = var4 * (var3 & 255); // L: 145 - int var12 = var1 - var2; // L: 149 - if (var12 < Rasterizer2D_yClipStart) { // L: 150 + int var5 = 256 - var4; + int var6 = (var3 >> 16 & 255) * var4; + int var7 = (var3 >> 8 & 255) * var4; + int var8 = var4 * (var3 & 255); + int var12 = var1 - var2; + if (var12 < Rasterizer2D_yClipStart) { var12 = Rasterizer2D_yClipStart; } - int var13 = var2 + var1 + 1; // L: 151 - if (var13 > Rasterizer2D_yClipEnd) { // L: 152 + int var13 = var2 + var1 + 1; + if (var13 > Rasterizer2D_yClipEnd) { var13 = Rasterizer2D_yClipEnd; } - int var14 = var12; // L: 153 - int var15 = var2 * var2; // L: 154 - int var16 = 0; // L: 155 - int var17 = var1 - var12; // L: 156 - int var18 = var17 * var17; // L: 157 - int var19 = var18 - var17; // L: 158 - if (var1 > var13) { // L: 159 + int var14 = var12; + int var15 = var2 * var2; + int var16 = 0; + int var17 = var1 - var12; + int var18 = var17 * var17; + int var19 = var18 - var17; + if (var1 > var13) { var1 = var13; } @@ -279,561 +279,561 @@ public class Rasterizer2D extends DualNode { int var22; int var23; int var24; - while (var14 < var1) { // L: 160 - while (var19 <= var15 || var18 <= var15) { // L: 161 - var18 = var18 + var16 + var16; // L: 162 - var19 += var16++ + var16; // L: 163 + while (var14 < var1) { + while (var19 <= var15 || var18 <= var15) { + var18 = var18 + var16 + var16; + var19 += var16++ + var16; } - var20 = var0 - var16 + 1; // L: 165 - if (var20 < Rasterizer2D_xClipStart) { // L: 166 + var20 = var0 - var16 + 1; + if (var20 < Rasterizer2D_xClipStart) { var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; // L: 167 - if (var21 > Rasterizer2D_xClipEnd) { // L: 168 + var21 = var0 + var16; + if (var21 > Rasterizer2D_xClipEnd) { var21 = Rasterizer2D_xClipEnd; } - var22 = var20 + var14 * Rasterizer2D_width; // L: 169 + var22 = var20 + var14 * Rasterizer2D_width; - for (var23 = var20; var23 < var21; ++var23) { // L: 170 - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); // L: 171 - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; // L: 172 - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); // L: 173 - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 174 - Rasterizer2D_pixels[var22++] = var24; // L: 175 + for (var23 = var20; var23 < var21; ++var23) { + var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); + var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; + var11 = var5 * (Rasterizer2D_pixels[var22] & 255); + var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var22++] = var24; } - ++var14; // L: 177 - var18 -= var17-- + var17; // L: 178 - var19 -= var17 + var17; // L: 179 + ++var14; + var18 -= var17-- + var17; + var19 -= var17 + var17; } - var16 = var2; // L: 181 - var17 = -var17; // L: 182 - var19 = var15 + var17 * var17; // L: 183 - var18 = var19 - var2; // L: 184 + var16 = var2; + var17 = -var17; + var19 = var15 + var17 * var17; + var18 = var19 - var2; - for (var19 -= var17; var14 < var13; var18 += var17++ + var17) { // L: 185 186 205 - while (var19 > var15 && var18 > var15) { // L: 187 - var19 -= var16-- + var16; // L: 188 - var18 -= var16 + var16; // L: 189 + for (var19 -= var17; var14 < var13; var18 += var17++ + var17) { + while (var19 > var15 && var18 > var15) { + var19 -= var16-- + var16; + var18 -= var16 + var16; } - var20 = var0 - var16; // L: 191 - if (var20 < Rasterizer2D_xClipStart) { // L: 192 + var20 = var0 - var16; + if (var20 < Rasterizer2D_xClipStart) { var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; // L: 193 - if (var21 > Rasterizer2D_xClipEnd - 1) { // L: 194 + var21 = var0 + var16; + if (var21 > Rasterizer2D_xClipEnd - 1) { var21 = Rasterizer2D_xClipEnd - 1; } - var22 = var20 + var14 * Rasterizer2D_width; // L: 195 + var22 = var20 + var14 * Rasterizer2D_width; - for (var23 = var20; var23 <= var21; ++var23) { // L: 196 - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); // L: 197 - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; // L: 198 - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); // L: 199 - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 200 - Rasterizer2D_pixels[var22++] = var24; // L: 201 + for (var23 = var20; var23 <= var21; ++var23) { + var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); + var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; + var11 = var5 * (Rasterizer2D_pixels[var22] & 255); + var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var22++] = var24; } - ++var14; // L: 203 - var19 = var19 + var17 + var17; // L: 204 + ++var14; + var19 = var19 + var17 + var17; } } } - } // L: 139 207 + } - @ObfuscatedName("cn") + @ObfuscatedName("dm") @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 - var2 -= Rasterizer2D_xClipStart - var0; // L: 211 - var0 = Rasterizer2D_xClipStart; // L: 212 + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { // L: 214 - var3 -= Rasterizer2D_yClipStart - var1; // L: 215 - var1 = Rasterizer2D_yClipStart; // L: 216 + if (var1 < Rasterizer2D_yClipStart) { + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 218 - var2 = Rasterizer2D_xClipEnd - var0; - } - - if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 219 - var3 = Rasterizer2D_yClipEnd - var1; - } - - var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280); // L: 220 - int var6 = 256 - var5; // L: 221 - int var7 = Rasterizer2D_width - var2; // L: 222 - int var8 = var0 + Rasterizer2D_width * var1; // L: 223 - - for (int var9 = 0; var9 < var3; ++var9) { // L: 224 - for (int var10 = -var2; var10 < 0; ++var10) { // L: 225 - int var11 = Rasterizer2D_pixels[var8]; // L: 226 - var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); // L: 227 - Rasterizer2D_pixels[var8++] = var11 + var4; // L: 228 - } - - var8 += var7; // L: 230 - } - - } // L: 232 - - @ObfuscatedName("ch") - @Export("Rasterizer2D_fillRectangle") - public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { - if (var0 < Rasterizer2D_xClipStart) { // L: 235 - var2 -= Rasterizer2D_xClipStart - var0; // L: 236 - var0 = Rasterizer2D_xClipStart; // L: 237 - } - - if (var1 < Rasterizer2D_yClipStart) { // L: 239 - var3 -= Rasterizer2D_yClipStart - var1; // L: 240 - var1 = Rasterizer2D_yClipStart; // L: 241 - } - - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 243 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; // L: 244 + var3 = Rasterizer2D_yClipEnd - var1; } - int var5 = Rasterizer2D_width - var2; // L: 245 - int var6 = var0 + Rasterizer2D_width * var1; // L: 246 + var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280); + int var6 = 256 - var5; + int var7 = Rasterizer2D_width - var2; + int var8 = var0 + Rasterizer2D_width * var1; - for (int var7 = -var3; var7 < 0; ++var7) { // L: 247 - for (int var8 = -var2; var8 < 0; ++var8) { // L: 248 - Rasterizer2D_pixels[var6++] = var4; // L: 249 + for (int var9 = 0; var9 < var3; ++var9) { + for (int var10 = -var2; var10 < 0; ++var10) { + int var11 = Rasterizer2D_pixels[var8]; + var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); + Rasterizer2D_pixels[var8++] = var11 + var4; } - var6 += var5; // L: 251 + var8 += var7; } - } // L: 253 + } @ObfuscatedName("du") + @Export("Rasterizer2D_fillRectangle") + public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; + } + + if (var1 < Rasterizer2D_yClipStart) { + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; + } + + if (var0 + var2 > Rasterizer2D_xClipEnd) { + var2 = Rasterizer2D_xClipEnd - var0; + } + + if (var3 + var1 > Rasterizer2D_yClipEnd) { + var3 = Rasterizer2D_yClipEnd - var1; + } + + int var5 = Rasterizer2D_width - var2; + int var6 = var0 + Rasterizer2D_width * var1; + + for (int var7 = -var3; var7 < 0; ++var7) { + for (int var8 = -var2; var8 < 0; ++var8) { + Rasterizer2D_pixels[var6++] = var4; + } + + var6 += var5; + } + + } + + @ObfuscatedName("dv") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { - if (var2 > 0 && var3 > 0) { // L: 256 - int var6 = 0; // L: 257 - int var7 = 65536 / var3; // L: 258 - if (var0 < Rasterizer2D_xClipStart) { // L: 259 - var2 -= Rasterizer2D_xClipStart - var0; // L: 260 - var0 = Rasterizer2D_xClipStart; // L: 261 + if (var2 > 0 && var3 > 0) { + int var6 = 0; + int var7 = 65536 / var3; + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { // L: 263 - var6 += (Rasterizer2D_yClipStart - var1) * var7; // L: 264 - var3 -= Rasterizer2D_yClipStart - var1; // L: 265 - var1 = Rasterizer2D_yClipStart; // L: 266 + if (var1 < Rasterizer2D_yClipStart) { + var6 += (Rasterizer2D_yClipStart - var1) * var7; + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 268 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 269 + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } - int var8 = Rasterizer2D_width - var2; // L: 270 - int var9 = var0 + Rasterizer2D_width * var1; // L: 271 + int var8 = Rasterizer2D_width - var2; + int var9 = var0 + Rasterizer2D_width * var1; - for (int var10 = -var3; var10 < 0; ++var10) { // L: 272 - int var11 = 65536 - var6 >> 8; // L: 273 - int var12 = var6 >> 8; // L: 274 - int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; // L: 275 + for (int var10 = -var3; var10 < 0; ++var10) { + int var11 = 65536 - var6 >> 8; + int var12 = var6 >> 8; + int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; - for (int var14 = -var2; var14 < 0; ++var14) { // L: 276 - Rasterizer2D_pixels[var9++] = var13; // L: 277 + for (int var14 = -var2; var14 < 0; ++var14) { + Rasterizer2D_pixels[var9++] = var13; } - var9 += var8; // L: 279 - var6 += var7; // L: 280 + var9 += var8; + var6 += var7; } } - } // L: 282 + } @ObfuscatedName("db") @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 - int var8 = 0; // L: 286 - int var9 = 65536 / var3; // L: 287 - if (var0 < Rasterizer2D_xClipStart) { // L: 288 - var2 -= Rasterizer2D_xClipStart - var0; // L: 289 - var0 = Rasterizer2D_xClipStart; // L: 290 + if (var2 > 0 && var3 > 0) { + int var8 = 0; + int var9 = 65536 / var3; + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { // L: 292 - var8 += (Rasterizer2D_yClipStart - var1) * var9; // L: 293 - var3 -= Rasterizer2D_yClipStart - var1; // L: 294 - var1 = Rasterizer2D_yClipStart; // L: 295 + if (var1 < Rasterizer2D_yClipStart) { + var8 += (Rasterizer2D_yClipStart - var1) * var9; + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 297 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 298 + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } - int var10 = Rasterizer2D_width - var2; // L: 299 - int var11 = var0 + Rasterizer2D_width * var1; // L: 300 + int var10 = Rasterizer2D_width - var2; + int var11 = var0 + Rasterizer2D_width * var1; - for (int var12 = -var3; var12 < 0; ++var12) { // L: 301 - int var13 = 65536 - var8 >> 8; // L: 302 - int var14 = var8 >> 8; // L: 303 - int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; // L: 304 - if (var15 == 0) { // L: 305 - var11 += Rasterizer2D_width; // L: 306 - var8 += var9; // L: 307 + for (int var12 = -var3; var12 < 0; ++var12) { + int var13 = 65536 - var8 >> 8; + int var14 = var8 >> 8; + int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; + if (var15 == 0) { + var11 += Rasterizer2D_width; + var8 += var9; } else { - int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; // L: 310 - int var17 = 255 - var15; // L: 311 - int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); // L: 312 + int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; + int var17 = 255 - var15; + int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); - for (int var19 = -var2; var19 < 0; ++var19) { // L: 313 - int var20 = Rasterizer2D_pixels[var11]; // L: 314 - if (var20 == 0) { // L: 315 - Rasterizer2D_pixels[var11++] = var18; // L: 316 + for (int var19 = -var2; var19 < 0; ++var19) { + int var20 = Rasterizer2D_pixels[var11]; + if (var20 == 0) { + Rasterizer2D_pixels[var11++] = var18; } else { - var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); // L: 319 - Rasterizer2D_pixels[var11++] = var18 + var20; // L: 320 + var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); + Rasterizer2D_pixels[var11++] = var18 + var20; } } - var11 += var10; // L: 323 - var8 += var9; // L: 324 + var11 += var10; + var8 += var9; } } } - } // L: 326 + } - @ObfuscatedName("dm") + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" ) @Export("Rasterizer2D_drawGradientPixels") public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { - if (var0 + var2 >= 0 && var3 + var1 >= 0) { // L: 329 - if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { // L: 330 - int var8 = 0; // L: 331 - int var9 = 0; // L: 332 - if (var0 < 0) { // L: 333 - var8 -= var0; // L: 334 - var2 += var0; // L: 335 + if (var0 + var2 >= 0 && var3 + var1 >= 0) { + if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { + int var8 = 0; + int var9 = 0; + if (var0 < 0) { + var8 -= var0; + var2 += var0; } - if (var1 < 0) { // L: 337 - var9 -= var1; // L: 338 - var3 += var1; // L: 339 + if (var1 < 0) { + var9 -= var1; + var3 += var1; } - if (var0 + var2 > Rasterizer2D_width) { // L: 341 - var2 = Rasterizer2D_width - var0; // L: 342 + if (var0 + var2 > Rasterizer2D_width) { + var2 = Rasterizer2D_width - var0; } - if (var3 + var1 > Rasterizer2D_height) { // L: 344 - var3 = Rasterizer2D_height - var1; // L: 345 + if (var3 + var1 > Rasterizer2D_height) { + var3 = Rasterizer2D_height - var1; } - int var10 = var6.length / var7; // L: 347 - int var11 = Rasterizer2D_width - var2; // L: 348 - int var12 = var4 >>> 24; // L: 349 - int var13 = var5 >>> 24; // L: 350 + int var10 = var6.length / var7; + int var11 = Rasterizer2D_width - var2; + int var12 = var4 >>> 24; + int var13 = var5 >>> 24; int var14; int var15; int var16; int var17; int var18; - if (var12 == 255 && var13 == 255) { // L: 351 - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 352 + if (var12 == 255 && var13 == 255) { + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { // L: 353 - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { // L: 354 - var17 = (var15 - var1) % var10; // L: 355 - var18 = (var16 - var0) % var7; // L: 356 - if (var6[var18 + var17 * var7] != 0) { // L: 357 + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + if (var6[var18 + var17 * var7] != 0) { Rasterizer2D_pixels[var14++] = var5; } else { - Rasterizer2D_pixels[var14++] = var4; // L: 358 + Rasterizer2D_pixels[var14++] = var4; } } - var14 += var11; // L: 360 + var14 += var11; } } else { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 364 + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { // L: 365 - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { // L: 366 - var17 = (var15 - var1) % var10; // L: 367 - var18 = (var16 - var0) % var7; // L: 368 - int var19 = var4; // L: 369 - if (var6[var18 + var17 * var7] != 0) { // L: 370 + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + int var19 = var4; + if (var6[var18 + var17 * var7] != 0) { var19 = var5; } - int var20 = var19 >>> 24; // L: 371 - int var21 = 255 - var20; // L: 372 - int var22 = Rasterizer2D_pixels[var14]; // L: 373 - int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; // L: 374 - Rasterizer2D_pixels[var14++] = var23; // L: 375 + int var20 = var19 >>> 24; + int var21 = 255 - var20; + int var22 = Rasterizer2D_pixels[var14]; + int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; + Rasterizer2D_pixels[var14++] = var23; } - var14 += var11; // L: 377 + var14 += var11; } } } } - } // L: 380 - - @ObfuscatedName("dh") - @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 - Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); // L: 384 - Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); // L: 385 - Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 - } // L: 387 + } @ObfuscatedName("di") - @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 - Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); // L: 391 - if (var3 >= 3) { // L: 392 - Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); // L: 393 - Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); // L: 394 - } - - } // L: 396 + @Export("Rasterizer2D_drawRectangle") + public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { + Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); + Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); + Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); + Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); + } @ObfuscatedName("ds") + @Export("Rasterizer2D_drawRectangleAlpha") + public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { + Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); + Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); + if (var3 >= 3) { + Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); + Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); + } + + } + + @ObfuscatedName("dq") @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 - if (var0 < Rasterizer2D_xClipStart) { // L: 400 - var2 -= Rasterizer2D_xClipStart - var0; // L: 401 - var0 = Rasterizer2D_xClipStart; // L: 402 + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 404 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - int var4 = var0 + Rasterizer2D_width * var1; // L: 405 + int var4 = var0 + Rasterizer2D_width * var1; - for (int var5 = 0; var5 < var2; ++var5) { // L: 406 + for (int var5 = 0; var5 < var2; ++var5) { Rasterizer2D_pixels[var4 + var5] = var3; } } - } // L: 407 + } - @ObfuscatedName("df") + @ObfuscatedName("dt") @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 - if (var0 < Rasterizer2D_xClipStart) { // L: 411 - var2 -= Rasterizer2D_xClipStart - var0; // L: 412 - var0 = Rasterizer2D_xClipStart; // L: 413 + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 415 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - int var5 = 256 - var4; // L: 416 - int var6 = (var3 >> 16 & 255) * var4; // L: 417 - int var7 = (var3 >> 8 & 255) * var4; // L: 418 - int var8 = var4 * (var3 & 255); // L: 419 - int var12 = var0 + Rasterizer2D_width * var1; // L: 423 + int var5 = 256 - var4; + int var6 = (var3 >> 16 & 255) * var4; + int var7 = (var3 >> 8 & 255) * var4; + int var8 = var4 * (var3 & 255); + int var12 = var0 + Rasterizer2D_width * var1; - for (int var13 = 0; var13 < var2; ++var13) { // L: 424 - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); // L: 425 - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; // L: 426 - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); // L: 427 - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 428 - Rasterizer2D_pixels[var12++] = var14; // L: 429 + for (int var13 = 0; var13 < var2; ++var13) { + int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); + int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; + int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); + int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var12++] = var14; } } - } // L: 431 + } - @ObfuscatedName("dg") + @ObfuscatedName("dp") @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 - if (var1 < Rasterizer2D_yClipStart) { // L: 435 - var2 -= Rasterizer2D_yClipStart - var1; // L: 436 - var1 = Rasterizer2D_yClipStart; // L: 437 + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { + if (var1 < Rasterizer2D_yClipStart) { + var2 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 439 + if (var2 + var1 > Rasterizer2D_yClipEnd) { var2 = Rasterizer2D_yClipEnd - var1; } - int var4 = var0 + Rasterizer2D_width * var1; // L: 440 + int var4 = var0 + Rasterizer2D_width * var1; - for (int var5 = 0; var5 < var2; ++var5) { // L: 441 + for (int var5 = 0; var5 < var2; ++var5) { Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3; } } - } // L: 442 + } - @ObfuscatedName("dq") + @ObfuscatedName("dg") @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 - if (var1 < Rasterizer2D_yClipStart) { // L: 446 - var2 -= Rasterizer2D_yClipStart - var1; // L: 447 - var1 = Rasterizer2D_yClipStart; // L: 448 + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { + if (var1 < Rasterizer2D_yClipStart) { + var2 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 450 + if (var2 + var1 > Rasterizer2D_yClipEnd) { var2 = Rasterizer2D_yClipEnd - var1; } - int var5 = 256 - var4; // L: 451 - int var6 = (var3 >> 16 & 255) * var4; // L: 452 - int var7 = (var3 >> 8 & 255) * var4; // L: 453 - int var8 = var4 * (var3 & 255); // L: 454 - int var12 = var0 + Rasterizer2D_width * var1; // L: 458 + int var5 = 256 - var4; + int var6 = (var3 >> 16 & 255) * var4; + int var7 = (var3 >> 8 & 255) * var4; + int var8 = var4 * (var3 & 255); + int var12 = var0 + Rasterizer2D_width * var1; - for (int var13 = 0; var13 < var2; ++var13) { // L: 459 - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); // L: 460 - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; // L: 461 - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); // L: 462 - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 463 - Rasterizer2D_pixels[var12] = var14; // L: 464 - var12 += Rasterizer2D_width; // L: 465 + for (int var13 = 0; var13 < var2; ++var13) { + int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); + int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; + int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); + int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var12] = var14; + var12 += Rasterizer2D_width; } } - } // L: 467 + } - @ObfuscatedName("dz") + @ObfuscatedName("dy") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { - var2 -= var0; // L: 470 - var3 -= var1; // L: 471 - if (var3 == 0) { // L: 472 - if (var2 >= 0) { // L: 473 + var2 -= var0; + var3 -= var1; + if (var3 == 0) { + if (var2 >= 0) { Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); } else { - Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); // L: 474 + Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); } - } else if (var2 == 0) { // L: 477 - if (var3 >= 0) { // L: 478 + } else if (var2 == 0) { + if (var3 >= 0) { Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); } else { - Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); // L: 479 + Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); } } else { - if (var3 + var2 < 0) { // L: 482 - var0 += var2; // L: 483 - var2 = -var2; // L: 484 - var1 += var3; // L: 485 - var3 = -var3; // L: 486 + if (var3 + var2 < 0) { + var0 += var2; + var2 = -var2; + var1 += var3; + var3 = -var3; } int var5; int var6; - if (var2 > var3) { // L: 488 - var1 <<= 16; // L: 489 - var1 += 32768; // L: 490 - var3 <<= 16; // L: 491 - var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); // L: 492 - var2 += var0; // L: 493 - if (var0 < Rasterizer2D_xClipStart) { // L: 494 - var1 += var5 * (Rasterizer2D_xClipStart - var0); // L: 495 - var0 = Rasterizer2D_xClipStart; // L: 496 + if (var2 > var3) { + var1 <<= 16; + var1 += 32768; + var3 <<= 16; + var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); + var2 += var0; + if (var0 < Rasterizer2D_xClipStart) { + var1 += var5 * (Rasterizer2D_xClipStart - var0); + var0 = Rasterizer2D_xClipStart; } - if (var2 >= Rasterizer2D_xClipEnd) { // L: 498 + if (var2 >= Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - 1; } - while (var0 <= var2) { // L: 499 - var6 = var1 >> 16; // L: 500 - if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { // L: 501 + while (var0 <= var2) { + var6 = var1 >> 16; + if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4; } - var1 += var5; // L: 502 - ++var0; // L: 503 + var1 += var5; + ++var0; } } else { - var0 <<= 16; // L: 507 - var0 += 32768; // L: 508 - var2 <<= 16; // L: 509 - var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); // L: 510 - var3 += var1; // L: 511 - if (var1 < Rasterizer2D_yClipStart) { // L: 512 - var0 += (Rasterizer2D_yClipStart - var1) * var5; // L: 513 - var1 = Rasterizer2D_yClipStart; // L: 514 + var0 <<= 16; + var0 += 32768; + var2 <<= 16; + var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); + var3 += var1; + if (var1 < Rasterizer2D_yClipStart) { + var0 += (Rasterizer2D_yClipStart - var1) * var5; + var1 = Rasterizer2D_yClipStart; } - if (var3 >= Rasterizer2D_yClipEnd) { // L: 516 + if (var3 >= Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - 1; } - while (var1 <= var3) { // L: 517 - var6 = var0 >> 16; // L: 518 - if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { // L: 519 + while (var1 <= var3) { + var6 = var0 >> 16; + if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4; } - var0 += var5; // L: 520 - ++var1; // L: 521 + var0 += var5; + ++var1; } } } - } // L: 475 480 524 + } - @ObfuscatedName("dc") + @ObfuscatedName("dl") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { - if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527 - Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; // L: 528 + if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { + Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; } - } // L: 529 + } - @ObfuscatedName("dt") + @ObfuscatedName("dd") @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 + int var5 = var0 + Rasterizer2D_width * var1; - for (var1 = 0; var1 < var3.length; ++var1) { // L: 533 - int var6 = var5 + var3[var1]; // L: 534 + for (var1 = 0; var1 < var3.length; ++var1) { + int var6 = var5 + var3[var1]; - for (var0 = -var4[var1]; var0 < 0; ++var0) { // L: 535 + for (var0 = -var4[var1]; var0 < 0; ++var0) { Rasterizer2D_pixels[var6++] = var2; } - var5 += Rasterizer2D_width; // L: 536 + var5 += Rasterizer2D_width; } - } // L: 538 + } } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 330f97420d..6c7b54152e 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,763 +3,763 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gs") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("f") - static boolean field2262; - @ObfuscatedName("e") - static boolean field2259; + @ObfuscatedName("s") + static boolean field2251; + @ObfuscatedName("t") + static boolean field2248; @ObfuscatedName("v") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("y") - public static boolean field2281; @ObfuscatedName("j") + public static boolean field2249; + @ObfuscatedName("l") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; @ObfuscatedName("k") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhy;" + descriptor = "Lhp;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("l") - static int[] field2280; - @ObfuscatedName("w") - static int[] field2282; - @ObfuscatedName("a") + @ObfuscatedName("d") + static int[] field2253; + @ObfuscatedName("y") + static int[] field2270; + @ObfuscatedName("g") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2262 = false; // L: 8 - field2259 = false; // L: 9 - Rasterizer3D_isLowDetailTexture = false; // L: 10 - field2281 = 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 - field2280 = new int[512]; // L: 31 - field2282 = new int[2048]; // L: 32 - Rasterizer3D_sine = new int[2048]; // L: 33 - Rasterizer3D_cosine = new int[2048]; // L: 34 + field2251 = false; + field2248 = false; + Rasterizer3D_isLowDetailTexture = false; + field2249 = true; + Rasterizer3D_alpha = 0; + Rasterizer3D_zoom = 512; + Rasterizer3D_rowOffsets = new int[1024]; + Rasterizer3D_colorPalette = new int[65536]; + field2253 = new int[512]; + field2270 = new int[2048]; + Rasterizer3D_sine = new int[2048]; + Rasterizer3D_cosine = new int[2048]; int var0; - for (var0 = 1; var0 < 512; ++var0) { // L: 37 - field2280[var0] = 32768 / var0; // L: 38 + for (var0 = 1; var0 < 512; ++var0) { + field2253[var0] = 32768 / var0; } - for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field2282[var0] = 65536 / var0; // L: 41 + for (var0 = 1; var0 < 2048; ++var0) { + field2270[var0] = 65536 / var0; } - for (var0 = 0; var0 < 2048; ++var0) { // L: 43 - Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); // L: 44 - Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); // L: 45 + for (var0 = 0; var0 < 2048; ++var0) { + Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); + Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); } - } // L: 47 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @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 + Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @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[UrlRequester.method2504(Rasterizer3D_clipHeight)]; + Rasterizer3D_clipWidth = var2 - var0; + Rasterizer3D_clipHeight = var3 - var1; + Rasterizer3D_method3(); + if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { + Rasterizer3D_rowOffsets = new int[SoundSystem.method530(Rasterizer3D_clipHeight)]; } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 + int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 63 - Rasterizer3D_rowOffsets[var5] = var4; // L: 64 - var4 += Rasterizer2D.Rasterizer2D_width; // L: 65 + for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { + Rasterizer3D_rowOffsets[var5] = var4; + var4 += Rasterizer2D.Rasterizer2D_width; } - } // L: 67 + } @ObfuscatedName("v") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { - Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 - Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 71 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 72 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 73 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 74 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 - } // L: 76 - - @ObfuscatedName("y") - public static final void method3950(int var0, int var1) { - int var2 = Rasterizer3D_rowOffsets[0]; // L: 79 - int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80 - int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81 - Rasterizer3D_clipMidX = var0 - var4; // L: 82 - Rasterizer3D_clipMidY = var1 - var3; // L: 83 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 84 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 85 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 86 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 - } // L: 88 + Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; + Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; + } @ObfuscatedName("j") + public static final void method3895(int var0, int var1) { + int var2 = Rasterizer3D_rowOffsets[0]; + int var3 = var2 / Rasterizer2D.Rasterizer2D_width; + int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_clipMidX = var0 - var4; + Rasterizer3D_clipMidY = var1 - var3; + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; + } + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lhy;)V" + descriptor = "(Lhp;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; // L: 91 - } // L: 92 + Rasterizer3D_textureLoader = var0; + } - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 - } // L: 96 + Rasterizer3D_buildPalette(var0, 0, 512); + } - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; // L: 99 + int var4 = var2 * 128; - for (int var5 = var2; var5 < var3; ++var5) { // L: 100 - double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 101 - double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 102 + for (int var5 = var2; var5 < var3; ++var5) { + double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; + double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; - for (int var10 = 0; var10 < 128; ++var10) { // L: 103 - double var11 = (double)var10 / 128.0D; // L: 104 - double var13 = var11; // L: 105 - double var15 = var11; // L: 106 - double var17 = var11; // L: 107 - if (var8 != 0.0D) { // L: 108 + for (int var10 = 0; var10 < 128; ++var10) { + double var11 = (double)var10 / 128.0D; + double var13 = var11; + double var15 = var11; + double var17 = var11; + if (var8 != 0.0D) { double var19; - if (var11 < 0.5D) { // L: 110 + if (var11 < 0.5D) { var19 = var11 * (1.0D + var8); } else { - var19 = var11 + var8 - var11 * var8; // L: 111 + var19 = var11 + var8 - var11 * var8; } - double var21 = 2.0D * var11 - var19; // L: 112 - double var23 = var6 + 0.3333333333333333D; // L: 113 - if (var23 > 1.0D) { // L: 114 + double var21 = 2.0D * var11 - var19; + double var23 = var6 + 0.3333333333333333D; + if (var23 > 1.0D) { --var23; } - double var27 = var6 - 0.3333333333333333D; // L: 116 - if (var27 < 0.0D) { // L: 117 + double var27 = var6 - 0.3333333333333333D; + if (var27 < 0.0D) { ++var27; } - if (6.0D * var23 < 1.0D) { // L: 118 + if (6.0D * var23 < 1.0D) { var13 = var21 + (var19 - var21) * 6.0D * var23; - } else if (2.0D * var23 < 1.0D) { // L: 119 + } else if (2.0D * var23 < 1.0D) { var13 = var19; - } else if (3.0D * var23 < 2.0D) { // L: 120 + } else if (3.0D * var23 < 2.0D) { var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D; } else { - var13 = var21; // L: 121 + var13 = var21; } - if (6.0D * var6 < 1.0D) { // L: 122 + if (6.0D * var6 < 1.0D) { var15 = var21 + (var19 - var21) * 6.0D * var6; - } else if (2.0D * var6 < 1.0D) { // L: 123 + } else if (2.0D * var6 < 1.0D) { var15 = var19; - } else if (3.0D * var6 < 2.0D) { // L: 124 + } else if (3.0D * var6 < 2.0D) { var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D; } else { - var15 = var21; // L: 125 + var15 = var21; } - if (6.0D * var27 < 1.0D) { // L: 126 + if (6.0D * var27 < 1.0D) { var17 = var21 + (var19 - var21) * 6.0D * var27; - } else if (2.0D * var27 < 1.0D) { // L: 127 + } else if (2.0D * var27 < 1.0D) { var17 = var19; - } else if (3.0D * var27 < 2.0D) { // L: 128 + } else if (3.0D * var27 < 2.0D) { var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D; } else { - var17 = var21; // L: 129 + var17 = var21; } } - int var29 = (int)(var13 * 256.0D); // L: 131 - int var20 = (int)(var15 * 256.0D); // L: 132 - int var30 = (int)(var17 * 256.0D); // L: 133 - int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 134 - var22 = Rasterizer3D_brighten(var22, var0); // L: 135 - if (var22 == 0) { // L: 136 + int var29 = (int)(var13 * 256.0D); + int var20 = (int)(var15 * 256.0D); + int var30 = (int)(var17 * 256.0D); + int var22 = var30 + (var20 << 8) + (var29 << 16); + var22 = Rasterizer3D_brighten(var22, var0); + if (var22 == 0) { var22 = 1; } - Rasterizer3D_colorPalette[var4++] = var22; // L: 137 + Rasterizer3D_colorPalette[var4++] = var22; } } - } // L: 140 - - @ObfuscatedName("r") - @Export("Rasterizer3D_brighten") - static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 - double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 144 - double var7 = (double)(var0 & 255) / 256.0D; // L: 145 - var3 = Math.pow(var3, var1); // L: 146 - var5 = Math.pow(var5, var1); // L: 147 - var7 = Math.pow(var7, var1); // L: 148 - int var9 = (int)(var3 * 256.0D); // L: 149 - int var10 = (int)(var5 * 256.0D); // L: 150 - int var11 = (int)(var7 * 256.0D); // L: 151 - return var11 + (var10 << 8) + (var9 << 16); // L: 152 } - @ObfuscatedName("h") - public static void method3959(int var0, int var1, int var2) { - field2262 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 - } // L: 157 + @ObfuscatedName("f") + @Export("Rasterizer3D_brighten") + static int Rasterizer3D_brighten(int var0, double var1) { + double var3 = (double)(var0 >> 16) / 256.0D; + double var5 = (double)(var0 >> 8 & 255) / 256.0D; + double var7 = (double)(var0 & 255) / 256.0D; + var3 = Math.pow(var3, var1); + var5 = Math.pow(var5, var1); + var7 = Math.pow(var7, var1); + int var9 = (int)(var3 * 256.0D); + int var10 = (int)(var5 * 256.0D); + int var11 = (int)(var7 * 256.0D); + return var11 + (var10 << 8) + (var9 << 16); + } - @ObfuscatedName("d") - static final void method3960(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = var4 - var3; // L: 160 - int var10 = var1 - var0; // L: 161 - int var11 = var5 - var3; // L: 162 - int var12 = var2 - var0; // L: 163 - int var13 = var7 - var6; // L: 164 - int var14 = var8 - var6; // L: 165 + @ObfuscatedName("o") + public static void method3900(int var0, int var1, int var2) { + field2251 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + } + + @ObfuscatedName("x") + static final void method3905(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + int var9 = var4 - var3; + int var10 = var1 - var0; + int var11 = var5 - var3; + int var12 = var2 - var0; + int var13 = var7 - var6; + int var14 = var8 - var6; int var15; - if (var2 != var1) { // L: 167 + if (var2 != var1) { var15 = (var5 - var4 << 14) / (var2 - var1); } else { - var15 = 0; // L: 168 + var15 = 0; } int var16; - if (var0 != var1) { // L: 170 + if (var0 != var1) { var16 = (var9 << 14) / var10; } else { - var16 = 0; // L: 171 + var16 = 0; } int var17; - if (var0 != var2) { // L: 173 + if (var0 != var2) { var17 = (var11 << 14) / var12; } else { - var17 = 0; // L: 174 + var17 = 0; } - int var18 = var9 * var12 - var11 * var10; // L: 175 - if (var18 != 0) { // L: 176 - int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 177 - int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 178 - if (var0 <= var1 && var0 <= var2) { // L: 179 - if (var0 < Rasterizer3D_clipHeight) { // L: 180 - if (var1 > Rasterizer3D_clipHeight) { // L: 181 + int var18 = var9 * var12 - var11 * var10; + if (var18 != 0) { + int var19 = (var13 * var12 - var14 * var10 << 8) / var18; + int var20 = (var14 * var9 - var13 * var11 << 8) / var18; + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 182 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - var6 = var19 + ((var6 << 8) - var3 * var19); // L: 183 - if (var1 < var2) { // L: 184 - var5 = var3 <<= 14; // L: 185 - if (var0 < 0) { // L: 186 - var5 -= var0 * var17; // L: 187 - var3 -= var0 * var16; // L: 188 - var6 -= var0 * var20; // L: 189 - var0 = 0; // L: 190 + var6 = var19 + ((var6 << 8) - var3 * var19); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var17; + var3 -= var0 * var16; + var6 -= var0 * var20; + var0 = 0; } - var4 <<= 14; // L: 192 - if (var1 < 0) { // L: 193 - var4 -= var15 * var1; // L: 194 - var1 = 0; // L: 195 + var4 <<= 14; + if (var1 < 0) { + var4 -= var15 * var1; + var1 = 0; } - if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 197 - var2 -= var1; // L: 218 - var1 -= var0; // L: 219 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 220 + if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 221 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 228 + --var2; if (var2 < 0) { - return; // L: 235 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // L: 229 - var5 += var17; // L: 230 - var4 += var15; // L: 231 - var6 += var20; // L: 232 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 233 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 222 - var5 += var17; // L: 223 - var3 += var16; // L: 224 - var6 += var20; // L: 225 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 226 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var1; // L: 198 - var1 -= var0; // L: 199 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 200 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 201 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 208 + --var2; if (var2 < 0) { - return; // L: 215 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // L: 209 - var5 += var17; // L: 210 - var4 += var15; // L: 211 - var6 += var20; // L: 212 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 213 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 202 - var5 += var17; // L: 203 - var3 += var16; // L: 204 - var6 += var20; // L: 205 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 206 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } } else { - var4 = var3 <<= 14; // L: 239 - if (var0 < 0) { // L: 240 - var4 -= var0 * var17; // L: 241 - var3 -= var0 * var16; // L: 242 - var6 -= var0 * var20; // L: 243 - var0 = 0; // L: 244 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var17; + var3 -= var0 * var16; + var6 -= var0 * var20; + var0 = 0; } - var5 <<= 14; // L: 246 - if (var2 < 0) { // L: 247 - var5 -= var15 * var2; // L: 248 - var2 = 0; // L: 249 + var5 <<= 14; + if (var2 < 0) { + var5 -= var15 * var2; + var2 = 0; } - if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 251 - var1 -= var2; // L: 252 - var2 -= var0; // L: 253 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 254 + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 255 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 262 + --var1; if (var1 < 0) { - return; // L: 269 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 263 - var5 += var15; // L: 264 - var3 += var16; // L: 265 - var6 += var20; // L: 266 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 267 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 256 - var4 += var17; // L: 257 - var3 += var16; // L: 258 - var6 += var20; // L: 259 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 260 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var2; // L: 272 - var2 -= var0; // L: 273 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 274 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 275 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 282 + --var1; if (var1 < 0) { - return; // L: 289 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 283 - var5 += var15; // L: 284 - var3 += var16; // L: 285 - var6 += var20; // L: 286 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 287 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 276 - var4 += var17; // L: 277 - var3 += var16; // L: 278 - var6 += var20; // L: 279 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 280 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var1 <= var2) { // L: 293 - if (var1 < Rasterizer3D_clipHeight) { // L: 294 - if (var2 > Rasterizer3D_clipHeight) { // L: 295 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 296 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - var7 = var19 + ((var7 << 8) - var19 * var4); // L: 297 - if (var2 < var0) { // L: 298 - var3 = var4 <<= 14; // L: 299 - if (var1 < 0) { // L: 300 - var3 -= var16 * var1; // L: 301 - var4 -= var15 * var1; // L: 302 - var7 -= var20 * var1; // L: 303 - var1 = 0; // L: 304 + var7 = var19 + ((var7 << 8) - var19 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var16 * var1; + var4 -= var15 * var1; + var7 -= var20 * var1; + var1 = 0; } - var5 <<= 14; // L: 306 - if (var2 < 0) { // L: 307 - var5 -= var17 * var2; // L: 308 - var2 = 0; // L: 309 + var5 <<= 14; + if (var2 < 0) { + var5 -= var17 * var2; + var2 = 0; } - if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 311 - var0 -= var2; // L: 332 - var2 -= var1; // L: 333 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 334 + if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 335 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 342 + --var0; if (var0 < 0) { - return; // L: 349 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // L: 343 - var3 += var16; // L: 344 - var5 += var17; // L: 345 - var7 += var20; // L: 346 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 347 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 336 - var3 += var16; // L: 337 - var4 += var15; // L: 338 - var7 += var20; // L: 339 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 340 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var2; // L: 312 - var2 -= var1; // L: 313 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 314 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 315 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 322 + --var0; if (var0 < 0) { - return; // L: 329 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // L: 323 - var3 += var16; // L: 324 - var5 += var17; // L: 325 - var7 += var20; // L: 326 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 327 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 316 - var3 += var16; // L: 317 - var4 += var15; // L: 318 - var7 += var20; // L: 319 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 320 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } } else { - var5 = var4 <<= 14; // L: 353 - if (var1 < 0) { // L: 354 - var5 -= var16 * var1; // L: 355 - var4 -= var15 * var1; // L: 356 - var7 -= var20 * var1; // L: 357 - var1 = 0; // L: 358 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var16 * var1; + var4 -= var15 * var1; + var7 -= var20 * var1; + var1 = 0; } - var3 <<= 14; // L: 360 - if (var0 < 0) { // L: 361 - var3 -= var0 * var17; // L: 362 - var0 = 0; // L: 363 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var17; + var0 = 0; } - if (var16 < var15) { // L: 365 - var2 -= var0; // L: 366 - var0 -= var1; // L: 367 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 368 + if (var16 < var15) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 369 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 376 + --var2; if (var2 < 0) { - return; // L: 383 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 377 - var3 += var17; // L: 378 - var4 += var15; // L: 379 - var7 += var20; // L: 380 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 381 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 370 - var5 += var16; // L: 371 - var4 += var15; // L: 372 - var7 += var20; // L: 373 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 374 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var0; // L: 386 - var0 -= var1; // L: 387 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 388 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 389 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 396 + --var2; if (var2 < 0) { - return; // L: 403 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 397 - var3 += var17; // L: 398 - var4 += var15; // L: 399 - var7 += var20; // L: 400 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 401 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 390 - var5 += var16; // L: 391 - var4 += var15; // L: 392 - var7 += var20; // L: 393 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 408 - if (var0 > Rasterizer3D_clipHeight) { // L: 409 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 410 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - var8 = var19 + ((var8 << 8) - var5 * var19); // L: 411 - if (var0 < var1) { // L: 412 - var4 = var5 <<= 14; // L: 413 - if (var2 < 0) { // L: 414 - var4 -= var15 * var2; // L: 415 - var5 -= var17 * var2; // L: 416 - var8 -= var20 * var2; // L: 417 - var2 = 0; // L: 418 + var8 = var19 + ((var8 << 8) - var5 * var19); + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var15 * var2; + var5 -= var17 * var2; + var8 -= var20 * var2; + var2 = 0; } - var3 <<= 14; // L: 420 - if (var0 < 0) { // L: 421 - var3 -= var0 * var16; // L: 422 - var0 = 0; // L: 423 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var16; + var0 = 0; } - if (var15 < var17) { // L: 425 - var1 -= var0; // L: 426 - var0 -= var2; // L: 427 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 428 + if (var15 < var17) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 429 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 436 + --var1; if (var1 < 0) { - return; // L: 443 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 437 - var4 += var15; // L: 438 - var3 += var16; // L: 439 - var8 += var20; // L: 440 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 441 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); + var4 += var15; + var3 += var16; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 430 - var4 += var15; // L: 431 - var5 += var17; // L: 432 - var8 += var20; // L: 433 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 434 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); + var4 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var0; // L: 446 - var0 -= var2; // L: 447 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 448 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 449 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 456 + --var1; if (var1 < 0) { - return; // L: 463 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 457 - var4 += var15; // L: 458 - var3 += var16; // L: 459 - var8 += var20; // L: 460 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 461 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var3 += var16; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 450 - var4 += var15; // L: 451 - var5 += var17; // L: 452 - var8 += var20; // L: 453 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } } else { - var3 = var5 <<= 14; // L: 467 - if (var2 < 0) { // L: 468 - var3 -= var15 * var2; // L: 469 - var5 -= var17 * var2; // L: 470 - var8 -= var20 * var2; // L: 471 - var2 = 0; // L: 472 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var15 * var2; + var5 -= var17 * var2; + var8 -= var20 * var2; + var2 = 0; } - var4 <<= 14; // L: 474 - if (var1 < 0) { // L: 475 - var4 -= var16 * var1; // L: 476 - var1 = 0; // L: 477 + var4 <<= 14; + if (var1 < 0) { + var4 -= var16 * var1; + var1 = 0; } - if (var15 < var17) { // L: 479 - var0 -= var1; // L: 480 - var1 -= var2; // L: 481 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 482 + if (var15 < var17) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 483 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 490 + --var0; if (var0 < 0) { - return; // L: 497 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 491 - var4 += var16; // L: 492 - var5 += var17; // L: 493 - var8 += var20; // L: 494 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 495 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 484 - var3 += var15; // L: 485 - var5 += var17; // L: 486 - var8 += var20; // L: 487 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 488 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var1; // L: 500 - var1 -= var2; // L: 501 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 502 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 503 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 510 + --var0; if (var0 < 0) { - return; // L: 517 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 511 - var4 += var16; // L: 512 - var5 += var17; // L: 513 - var8 += var20; // L: 514 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 515 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 504 - var3 += var15; // L: 505 - var5 += var17; // L: 506 - var8 += var20; // L: 507 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } } @@ -767,1298 +767,1298 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("r") @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: 524 - if (var5 > Rasterizer3D_clipWidth) { // L: 525 + if (field2251) { + if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 526 + if (var4 < 0) { var4 = 0; } } - if (var4 < var5) { // L: 528 - var1 += var4; // L: 529 - var6 += var4 * var7; // L: 530 + if (var4 < var5) { + var1 += var4; + var6 += var4 * var7; int var8; int var9; int var10; - if (field2281) { // L: 531 - var3 = var5 - var4 >> 2; // L: 532 - var7 <<= 2; // L: 533 - if (Rasterizer3D_alpha == 0) { // L: 534 - if (var3 > 0) { // L: 535 + if (field2249) { + var3 = var5 - var4 >> 2; + var7 <<= 2; + if (Rasterizer3D_alpha == 0) { + if (var3 > 0) { do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 537 - var6 += var7; // L: 538 - var0[var1++] = var2; // L: 539 - var0[var1++] = var2; // L: 540 - var0[var1++] = var2; // L: 541 - var0[var1++] = var2; // L: 542 - --var3; // L: 543 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; + var6 += var7; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + --var3; } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 545 - if (var3 > 0) { // L: 546 - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 547 + var3 = var5 - var4 & 3; + if (var3 > 0) { + var2 = Rasterizer3D_colorPalette[var6 >> 8]; do { - var0[var1++] = var2; // L: 549 - --var3; // L: 550 + var0[var1++] = var2; + --var3; } while(var3 > 0); } } else { - var8 = Rasterizer3D_alpha; // L: 554 - var9 = 256 - Rasterizer3D_alpha; // L: 555 - if (var3 > 0) { // L: 556 + var8 = Rasterizer3D_alpha; + var9 = 256 - Rasterizer3D_alpha; + if (var3 > 0) { do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 558 - var6 += var7; // L: 559 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 560 - var10 = var0[var1]; // L: 561 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 562 - var10 = var0[var1]; // L: 563 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 564 - var10 = var0[var1]; // L: 565 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 566 - var10 = var0[var1]; // L: 567 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 568 - --var3; // L: 569 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; + var6 += var7; + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); + var10 = var0[var1]; + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); + var10 = var0[var1]; + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); + var10 = var0[var1]; + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); + var10 = var0[var1]; + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); + --var3; } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 571 - if (var3 > 0) { // L: 572 - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 573 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 574 + var3 = var5 - var4 & 3; + if (var3 > 0) { + var2 = Rasterizer3D_colorPalette[var6 >> 8]; + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); do { - var10 = var0[var1]; // L: 576 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 577 - --var3; // L: 578 + var10 = var0[var1]; + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); + --var3; } while(var3 > 0); } } } else { - var3 = var5 - var4; // L: 584 - if (Rasterizer3D_alpha == 0) { // L: 585 + var3 = var5 - var4; + if (Rasterizer3D_alpha == 0) { do { - var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; // L: 587 - var6 += var7; // L: 588 - --var3; // L: 589 + var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; + var6 += var7; + --var3; } while(var3 > 0); } else { - var8 = Rasterizer3D_alpha; // L: 592 - var9 = 256 - Rasterizer3D_alpha; // L: 593 + var8 = Rasterizer3D_alpha; + var9 = 256 - Rasterizer3D_alpha; do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 595 - var6 += var7; // L: 596 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 597 - var10 = var0[var1]; // L: 598 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 599 - --var3; // L: 600 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; + var6 += var7; + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); + var10 = var0[var1]; + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); + --var3; } while(var3 > 0); } } } - } // L: 581 602 + } - @ObfuscatedName("b") - public static final void method3962(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = 0; // L: 607 - if (var0 != var1) { // L: 608 + @ObfuscatedName("p") + public static final void method3903(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = 0; + if (var0 != var1) { var7 = (var4 - var3 << 14) / (var1 - var0); } - int var8 = 0; // L: 609 - if (var2 != var1) { // L: 610 + int var8 = 0; + if (var2 != var1) { var8 = (var5 - var4 << 14) / (var2 - var1); } - int var9 = 0; // L: 611 - if (var0 != var2) { // L: 612 + int var9 = 0; + if (var0 != var2) { var9 = (var3 - var5 << 14) / (var0 - var2); } - if (var0 <= var1 && var0 <= var2) { // L: 613 - if (var0 < Rasterizer3D_clipHeight) { // L: 614 - if (var1 > Rasterizer3D_clipHeight) { // L: 615 + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 616 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var1 < var2) { // L: 617 - var5 = var3 <<= 14; // L: 618 - if (var0 < 0) { // L: 619 - var5 -= var0 * var9; // L: 620 - var3 -= var0 * var7; // L: 621 - var0 = 0; // L: 622 + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var9; + var3 -= var0 * var7; + var0 = 0; } - var4 <<= 14; // L: 624 - if (var1 < 0) { // L: 625 - var4 -= var8 * var1; // L: 626 - var1 = 0; // L: 627 + var4 <<= 14; + if (var1 < 0) { + var4 -= var8 * var1; + var1 = 0; } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 629 - var2 -= var1; // L: 630 - var1 -= var0; // L: 631 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 632 + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 633 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 639 + --var2; if (var2 < 0) { - return; // L: 645 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 640 - var5 += var9; // L: 641 - var4 += var8; // L: 642 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 643 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 634 - var5 += var9; // L: 635 - var3 += var7; // L: 636 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 637 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var1; // L: 648 - var1 -= var0; // L: 649 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 650 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 651 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 657 + --var2; if (var2 < 0) { - return; // L: 663 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 658 - var5 += var9; // L: 659 - var4 += var8; // L: 660 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 661 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 652 - var5 += var9; // L: 653 - var3 += var7; // L: 654 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 655 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } } else { - var4 = var3 <<= 14; // L: 667 - if (var0 < 0) { // L: 668 - var4 -= var0 * var9; // L: 669 - var3 -= var0 * var7; // L: 670 - var0 = 0; // L: 671 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var9; + var3 -= var0 * var7; + var0 = 0; } - var5 <<= 14; // L: 673 - if (var2 < 0) { // L: 674 - var5 -= var8 * var2; // L: 675 - var2 = 0; // L: 676 + var5 <<= 14; + if (var2 < 0) { + var5 -= var8 * var2; + var2 = 0; } - if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { // L: 678 - var1 -= var2; // L: 679 - var2 -= var0; // L: 680 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 681 + if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 682 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 688 + --var1; if (var1 < 0) { - return; // L: 694 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 689 - var5 += var8; // L: 690 - var3 += var7; // L: 691 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 692 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 683 - var4 += var9; // L: 684 - var3 += var7; // L: 685 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 686 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var2; // L: 697 - var2 -= var0; // L: 698 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 699 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 700 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 706 + --var1; if (var1 < 0) { - return; // L: 712 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 707 - var5 += var8; // L: 708 - var3 += var7; // L: 709 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 710 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 701 - var4 += var9; // L: 702 - var3 += var7; // L: 703 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 704 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var1 <= var2) { // L: 716 - if (var1 < Rasterizer3D_clipHeight) { // L: 717 - if (var2 > Rasterizer3D_clipHeight) { // L: 718 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 719 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var2 < var0) { // L: 720 - var3 = var4 <<= 14; // L: 721 - if (var1 < 0) { // L: 722 - var3 -= var7 * var1; // L: 723 - var4 -= var8 * var1; // L: 724 - var1 = 0; // L: 725 + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var7 * var1; + var4 -= var8 * var1; + var1 = 0; } - var5 <<= 14; // L: 727 - if (var2 < 0) { // L: 728 - var5 -= var9 * var2; // L: 729 - var2 = 0; // L: 730 + var5 <<= 14; + if (var2 < 0) { + var5 -= var9 * var2; + var2 = 0; } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 732 - var0 -= var2; // L: 733 - var2 -= var1; // L: 734 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 735 + if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 736 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 742 + --var0; if (var0 < 0) { - return; // L: 748 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 743 - var3 += var7; // L: 744 - var5 += var9; // L: 745 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 746 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 737 - var3 += var7; // L: 738 - var4 += var8; // L: 739 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 740 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var2; // L: 751 - var2 -= var1; // L: 752 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 753 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 754 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 760 + --var0; if (var0 < 0) { - return; // L: 766 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 761 - var3 += var7; // L: 762 - var5 += var9; // L: 763 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 764 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 755 - var3 += var7; // L: 756 - var4 += var8; // L: 757 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 758 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } } else { - var5 = var4 <<= 14; // L: 770 - if (var1 < 0) { // L: 771 - var5 -= var7 * var1; // L: 772 - var4 -= var8 * var1; // L: 773 - var1 = 0; // L: 774 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var7 * var1; + var4 -= var8 * var1; + var1 = 0; } - var3 <<= 14; // L: 776 - if (var0 < 0) { // L: 777 - var3 -= var0 * var9; // L: 778 - var0 = 0; // L: 779 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var9; + var0 = 0; } - if (var7 < var8) { // L: 781 - var2 -= var0; // L: 782 - var0 -= var1; // L: 783 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 784 + if (var7 < var8) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 785 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 791 + --var2; if (var2 < 0) { - return; // L: 797 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 792 - var3 += var9; // L: 793 - var4 += var8; // L: 794 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 795 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 786 - var5 += var7; // L: 787 - var4 += var8; // L: 788 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 789 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var0; // L: 800 - var0 -= var1; // L: 801 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 802 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 803 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 809 + --var2; if (var2 < 0) { - return; // L: 815 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 810 - var3 += var9; // L: 811 - var4 += var8; // L: 812 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 813 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 804 - var5 += var7; // L: 805 - var4 += var8; // L: 806 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 807 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 820 - if (var0 > Rasterizer3D_clipHeight) { // L: 821 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 822 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var0 < var1) { // L: 823 - var4 = var5 <<= 14; // L: 824 - if (var2 < 0) { // L: 825 - var4 -= var8 * var2; // L: 826 - var5 -= var9 * var2; // L: 827 - var2 = 0; // L: 828 + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var8 * var2; + var5 -= var9 * var2; + var2 = 0; } - var3 <<= 14; // L: 830 - if (var0 < 0) { // L: 831 - var3 -= var0 * var7; // L: 832 - var0 = 0; // L: 833 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var7; + var0 = 0; } - if (var8 < var9) { // L: 835 - var1 -= var0; // L: 836 - var0 -= var2; // L: 837 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 838 + if (var8 < var9) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 839 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 845 + --var1; if (var1 < 0) { - return; // L: 851 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 846 - var4 += var8; // L: 847 - var3 += var7; // L: 848 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 849 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); + var4 += var8; + var3 += var7; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 840 - var4 += var8; // L: 841 - var5 += var9; // L: 842 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 843 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); + var4 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var0; // L: 854 - var0 -= var2; // L: 855 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 856 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 857 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 863 + --var1; if (var1 < 0) { - return; // L: 869 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 864 - var4 += var8; // L: 865 - var3 += var7; // L: 866 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 867 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); + var4 += var8; + var3 += var7; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 858 - var4 += var8; // L: 859 - var5 += var9; // L: 860 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 861 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); + var4 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } } else { - var3 = var5 <<= 14; // L: 873 - if (var2 < 0) { // L: 874 - var3 -= var8 * var2; // L: 875 - var5 -= var9 * var2; // L: 876 - var2 = 0; // L: 877 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var8 * var2; + var5 -= var9 * var2; + var2 = 0; } - var4 <<= 14; // L: 879 - if (var1 < 0) { // L: 880 - var4 -= var7 * var1; // L: 881 - var1 = 0; // L: 882 + var4 <<= 14; + if (var1 < 0) { + var4 -= var7 * var1; + var1 = 0; } - if (var8 < var9) { // L: 884 - var0 -= var1; // L: 885 - var1 -= var2; // L: 886 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 887 + if (var8 < var9) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 888 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 894 + --var0; if (var0 < 0) { - return; // L: 900 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 895 - var4 += var7; // L: 896 - var5 += var9; // L: 897 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 898 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 889 - var3 += var8; // L: 890 - var5 += var9; // L: 891 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 892 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var1; // L: 903 - var1 -= var2; // L: 904 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 905 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 906 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 912 + --var0; if (var0 < 0) { - return; // L: 918 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 913 - var4 += var7; // L: 914 - var5 += var9; // L: 915 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 916 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 907 - var3 += var8; // L: 908 - var5 += var9; // L: 909 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 910 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } } } } - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2262) { // L: 925 - if (var5 > Rasterizer3D_clipWidth) { // L: 926 + if (field2251) { + if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 927 + if (var4 < 0) { var4 = 0; } } - if (var4 < var5) { // L: 929 - var1 += var4; // L: 930 - var3 = var5 - var4 >> 2; // L: 931 - if (Rasterizer3D_alpha != 0) { // L: 932 - if (Rasterizer3D_alpha == 254) { // L: 944 + if (var4 < var5) { + var1 += var4; + var3 = var5 - var4 >> 2; + if (Rasterizer3D_alpha != 0) { + if (Rasterizer3D_alpha == 254) { while (true) { - --var3; // L: 945 + --var3; if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 951 + var3 = var5 - var4 & 3; while (true) { - --var3; // L: 952 - if (var3 < 0) { - return; // L: 976 - } - - var0[var1++] = var0[var1]; // L: 953 - } - } - - var0[var1++] = var0[var1]; // L: 946 - var0[var1++] = var0[var1]; // L: 947 - var0[var1++] = var0[var1]; // L: 948 - var0[var1++] = var0[var1]; // L: 949 - } - } else { - int var6 = Rasterizer3D_alpha; // L: 957 - int var7 = 256 - Rasterizer3D_alpha; // L: 958 - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 959 - - while (true) { - --var3; // L: 960 - int var8; - if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 970 - - while (true) { - --var3; // L: 971 + --var3; if (var3 < 0) { return; } - var8 = var0[var1]; // L: 972 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 973 + var0[var1++] = var0[var1]; } } - var8 = var0[var1]; // L: 961 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 962 - var8 = var0[var1]; // L: 963 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 964 - var8 = var0[var1]; // L: 965 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 966 - var8 = var0[var1]; // L: 967 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 968 + var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; + } + } else { + int var6 = Rasterizer3D_alpha; + int var7 = 256 - Rasterizer3D_alpha; + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); + + while (true) { + --var3; + int var8; + if (var3 < 0) { + var3 = var5 - var4 & 3; + + while (true) { + --var3; + if (var3 < 0) { + return; + } + + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + } + } + + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); } } } else { while (true) { - --var3; // L: 933 + --var3; if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 939 + var3 = var5 - var4 & 3; while (true) { - --var3; // L: 940 + --var3; if (var3 < 0) { return; } - var0[var1++] = var2; // L: 941 + var0[var1++] = var2; } } - var0[var1++] = var2; // L: 934 - var0[var1++] = var2; // L: 935 - var0[var1++] = var2; // L: 936 - var0[var1++] = var2; // L: 937 + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; } } } } @ObfuscatedName("k") - static final void method3964(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { - int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 979 + static final void method3939(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; - if (var19 == null) { // L: 980 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 981 - method3960(var0, var1, var2, var3, var4, var5, method3968(var20, var6), method3968(var20, var7), method3968(var20, var8)); // L: 982 + if (var19 == null) { + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); + method3905(var0, var1, var2, var3, var4, var5, method3909(var20, var6), method3909(var20, var7), method3909(var20, var8)); } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 985 - field2259 = Rasterizer3D_textureLoader.vmethod4428(var18); // L: 986 - var20 = var4 - var3; // L: 987 - int var21 = var1 - var0; // L: 988 - int var22 = var5 - var3; // L: 989 - int var23 = var2 - var0; // L: 990 - int var24 = var7 - var6; // L: 991 - int var25 = var8 - var6; // L: 992 - int var26 = 0; // L: 993 - if (var0 != var1) { // L: 994 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); + field2248 = Rasterizer3D_textureLoader.vmethod4332(var18); + var20 = var4 - var3; + int var21 = var1 - var0; + int var22 = var5 - var3; + int var23 = var2 - var0; + int var24 = var7 - var6; + int var25 = var8 - var6; + int var26 = 0; + if (var0 != var1) { var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 995 - if (var2 != var1) { // L: 996 + int var27 = 0; + if (var2 != var1) { var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 997 - if (var0 != var2) { // L: 998 + int var28 = 0; + if (var0 != var2) { var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 999 - if (var29 != 0) { // L: 1000 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1001 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1002 - var10 = var9 - var10; // L: 1003 - var13 = var12 - var13; // L: 1004 - var16 = var15 - var16; // L: 1005 - var11 -= var9; // L: 1006 - var14 -= var12; // L: 1007 - var17 -= var15; // L: 1008 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1009 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1010 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1011 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1012 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1013 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1014 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1015 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1016 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1017 + int var29 = var20 * var23 - var22 * var21; + if (var29 != 0) { + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; + var10 = var9 - var10; + var13 = var12 - var13; + var16 = var15 - var16; + var11 -= var9; + var14 -= var12; + var17 -= var15; + int var32 = var11 * var12 - var9 * var14 << 14; + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); + int var35 = var10 * var12 - var13 * var9 << 14; + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); + int var38 = var13 * var11 - var10 * var14 << 14; + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1018 - if (var0 < Rasterizer3D_clipHeight) { // L: 1019 - if (var1 > Rasterizer3D_clipHeight) { // L: 1020 + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1021 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1022 - if (var1 < var2) { // L: 1023 - var5 = var3 <<= 14; // L: 1024 - if (var0 < 0) { // L: 1025 - var5 -= var0 * var28; // L: 1026 - var3 -= var0 * var26; // L: 1027 - var6 -= var0 * var31; // L: 1028 - var0 = 0; // L: 1029 + var6 = var30 + ((var6 << 9) - var3 * var30); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var4 <<= 14; // L: 1031 - if (var1 < 0) { // L: 1032 - var4 -= var27 * var1; // L: 1033 - var1 = 0; // L: 1034 + var4 <<= 14; + if (var1 < 0) { + var4 -= var27 * var1; + var1 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1036 - var32 += var34 * var41; // L: 1037 - var35 += var37 * var41; // L: 1038 - var38 += var40 * var41; // L: 1039 - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1040 - var2 -= var1; // L: 1041 - var1 -= var0; // L: 1042 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1043 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1044 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1054 + --var2; if (var2 < 0) { - return; // L: 1064 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1055 - var5 += var28; // L: 1056 - var4 += var27; // L: 1057 - var6 += var31; // L: 1058 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1059 - var32 += var34; // L: 1060 - var35 += var37; // L: 1061 - var38 += var40; // L: 1062 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1045 - var5 += var28; // L: 1046 - var3 += var26; // L: 1047 - var6 += var31; // L: 1048 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1049 - var32 += var34; // L: 1050 - var35 += var37; // L: 1051 - var38 += var40; // L: 1052 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var1; // L: 1067 - var1 -= var0; // L: 1068 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1070 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1080 + --var2; if (var2 < 0) { - return; // L: 1090 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1081 - var5 += var28; // L: 1082 - var4 += var27; // L: 1083 - var6 += var31; // L: 1084 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1085 - var32 += var34; // L: 1086 - var35 += var37; // L: 1087 - var38 += var40; // L: 1088 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071 - var5 += var28; // L: 1072 - var3 += var26; // L: 1073 - var6 += var31; // L: 1074 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075 - var32 += var34; // L: 1076 - var35 += var37; // L: 1077 - var38 += var40; // L: 1078 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var4 = var3 <<= 14; // L: 1094 - if (var0 < 0) { // L: 1095 - var4 -= var0 * var28; // L: 1096 - var3 -= var0 * var26; // L: 1097 - var6 -= var0 * var31; // L: 1098 - var0 = 0; // L: 1099 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var5 <<= 14; // L: 1101 - if (var2 < 0) { // L: 1102 - var5 -= var27 * var2; // L: 1103 - var2 = 0; // L: 1104 + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1106 - var32 += var34 * var41; // L: 1107 - var35 += var37 * var41; // L: 1108 - var38 += var40 * var41; // L: 1109 - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1110 - var1 -= var2; // L: 1111 - var2 -= var0; // L: 1112 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1113 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1114 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1124 + --var1; if (var1 < 0) { - return; // L: 1134 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1125 - var5 += var27; // L: 1126 - var3 += var26; // L: 1127 - var6 += var31; // L: 1128 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1129 - var32 += var34; // L: 1130 - var35 += var37; // L: 1131 - var38 += var40; // L: 1132 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1115 - var4 += var28; // L: 1116 - var3 += var26; // L: 1117 - var6 += var31; // L: 1118 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1119 - var32 += var34; // L: 1120 - var35 += var37; // L: 1121 - var38 += var40; // L: 1122 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var2; // L: 1137 - var2 -= var0; // L: 1138 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1139 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1140 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1150 + --var1; if (var1 < 0) { - return; // L: 1160 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1151 - var5 += var27; // L: 1152 - var3 += var26; // L: 1153 - var6 += var31; // L: 1154 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1155 - var32 += var34; // L: 1156 - var35 += var37; // L: 1157 - var38 += var40; // L: 1158 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1141 - var4 += var28; // L: 1142 - var3 += var26; // L: 1143 - var6 += var31; // L: 1144 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1145 - var32 += var34; // L: 1146 - var35 += var37; // L: 1147 - var38 += var40; // L: 1148 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var1 <= var2) { // L: 1164 - if (var1 < Rasterizer3D_clipHeight) { // L: 1165 - if (var2 > Rasterizer3D_clipHeight) { // L: 1166 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 1167 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1168 - if (var2 < var0) { // L: 1169 - var3 = var4 <<= 14; // L: 1170 - if (var1 < 0) { // L: 1171 - var3 -= var26 * var1; // L: 1172 - var4 -= var27 * var1; // L: 1173 - var7 -= var31 * var1; // L: 1174 - var1 = 0; // L: 1175 + var7 = var30 + ((var7 << 9) - var30 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var5 <<= 14; // L: 1177 - if (var2 < 0) { // L: 1178 - var5 -= var28 * var2; // L: 1179 - var2 = 0; // L: 1180 + var5 <<= 14; + if (var2 < 0) { + var5 -= var28 * var2; + var2 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1182 - var32 += var34 * var41; // L: 1183 - var35 += var37 * var41; // L: 1184 - var38 += var40 * var41; // L: 1185 - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 1186 - var0 -= var2; // L: 1213 - var2 -= var1; // L: 1214 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1215 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 1216 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 1226 + --var0; if (var0 < 0) { - return; // L: 1236 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1227 - var3 += var26; // L: 1228 - var5 += var28; // L: 1229 - var7 += var31; // L: 1230 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1231 - var32 += var34; // L: 1232 - var35 += var37; // L: 1233 - var38 += var40; // L: 1234 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1217 - var3 += var26; // L: 1218 - var4 += var27; // L: 1219 - var7 += var31; // L: 1220 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1221 - var32 += var34; // L: 1222 - var35 += var37; // L: 1223 - var38 += var40; // L: 1224 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var2; // L: 1187 - var2 -= var1; // L: 1188 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1189 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 1190 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 1200 + --var0; if (var0 < 0) { - return; // L: 1210 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1201 - var3 += var26; // L: 1202 - var5 += var28; // L: 1203 - var7 += var31; // L: 1204 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1205 - var32 += var34; // L: 1206 - var35 += var37; // L: 1207 - var38 += var40; // L: 1208 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1191 - var3 += var26; // L: 1192 - var4 += var27; // L: 1193 - var7 += var31; // L: 1194 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1195 - var32 += var34; // L: 1196 - var35 += var37; // L: 1197 - var38 += var40; // L: 1198 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var5 = var4 <<= 14; // L: 1240 - if (var1 < 0) { // L: 1241 - var5 -= var26 * var1; // L: 1242 - var4 -= var27 * var1; // L: 1243 - var7 -= var31 * var1; // L: 1244 - var1 = 0; // L: 1245 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var3 <<= 14; // L: 1247 - if (var0 < 0) { // L: 1248 - var3 -= var0 * var28; // L: 1249 - var0 = 0; // L: 1250 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1252 - var32 += var34 * var41; // L: 1253 - var35 += var37 * var41; // L: 1254 - var38 += var40 * var41; // L: 1255 - if (var26 < var27) { // L: 1256 - var2 -= var0; // L: 1257 - var0 -= var1; // L: 1258 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1259 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 1260 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 1270 + --var2; if (var2 < 0) { - return; // L: 1280 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1271 - var3 += var28; // L: 1272 - var4 += var27; // L: 1273 - var7 += var31; // L: 1274 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1275 - var32 += var34; // L: 1276 - var35 += var37; // L: 1277 - var38 += var40; // L: 1278 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1261 - var5 += var26; // L: 1262 - var4 += var27; // L: 1263 - var7 += var31; // L: 1264 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1265 - var32 += var34; // L: 1266 - var35 += var37; // L: 1267 - var38 += var40; // L: 1268 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var0; // L: 1283 - var0 -= var1; // L: 1284 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1285 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 1286 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 1296 + --var2; if (var2 < 0) { - return; // L: 1306 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1297 - var3 += var28; // L: 1298 - var4 += var27; // L: 1299 - var7 += var31; // L: 1300 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1301 - var32 += var34; // L: 1302 - var35 += var37; // L: 1303 - var38 += var40; // L: 1304 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1287 - var5 += var26; // L: 1288 - var4 += var27; // L: 1289 - var7 += var31; // L: 1290 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1291 - var32 += var34; // L: 1292 - var35 += var37; // L: 1293 - var38 += var40; // L: 1294 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 1311 - if (var0 > Rasterizer3D_clipHeight) { // L: 1312 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 1313 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 1314 - if (var0 < var1) { // L: 1315 - var4 = var5 <<= 14; // L: 1316 - if (var2 < 0) { // L: 1317 - var4 -= var27 * var2; // L: 1318 - var5 -= var28 * var2; // L: 1319 - var8 -= var31 * var2; // L: 1320 - var2 = 0; // L: 1321 + var8 = (var8 << 9) - var5 * var30 + var30; + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var3 <<= 14; // L: 1323 - if (var0 < 0) { // L: 1324 - var3 -= var0 * var26; // L: 1325 - var0 = 0; // L: 1326 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var26; + var0 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1328 - var32 += var34 * var41; // L: 1329 - var35 += var37 * var41; // L: 1330 - var38 += var40 * var41; // L: 1331 - if (var27 < var28) { // L: 1332 - var1 -= var0; // L: 1333 - var0 -= var2; // L: 1334 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1335 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 1336 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 1346 + --var1; if (var1 < 0) { - return; // L: 1356 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1347 - var4 += var27; // L: 1348 - var3 += var26; // L: 1349 - var8 += var31; // L: 1350 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1351 - var32 += var34; // L: 1352 - var35 += var37; // L: 1353 - var38 += var40; // L: 1354 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1337 - var4 += var27; // L: 1338 - var5 += var28; // L: 1339 - var8 += var31; // L: 1340 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1341 - var32 += var34; // L: 1342 - var35 += var37; // L: 1343 - var38 += var40; // L: 1344 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var0; // L: 1359 - var0 -= var2; // L: 1360 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1361 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 1362 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 1372 + --var1; if (var1 < 0) { - return; // L: 1382 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1373 - var4 += var27; // L: 1374 - var3 += var26; // L: 1375 - var8 += var31; // L: 1376 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1377 - var32 += var34; // L: 1378 - var35 += var37; // L: 1379 - var38 += var40; // L: 1380 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1363 - var4 += var27; // L: 1364 - var5 += var28; // L: 1365 - var8 += var31; // L: 1366 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1367 - var32 += var34; // L: 1368 - var35 += var37; // L: 1369 - var38 += var40; // L: 1370 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var3 = var5 <<= 14; // L: 1386 - if (var2 < 0) { // L: 1387 - var3 -= var27 * var2; // L: 1388 - var5 -= var28 * var2; // L: 1389 - var8 -= var31 * var2; // L: 1390 - var2 = 0; // L: 1391 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var4 <<= 14; // L: 1393 - if (var1 < 0) { // L: 1394 - var4 -= var26 * var1; // L: 1395 - var1 = 0; // L: 1396 + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1398 - var32 += var34 * var41; // L: 1399 - var35 += var37 * var41; // L: 1400 - var38 += var40 * var41; // L: 1401 - if (var27 < var28) { // L: 1402 - var0 -= var1; // L: 1403 - var1 -= var2; // L: 1404 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1405 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 1406 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 1416 + --var0; if (var0 < 0) { - return; // L: 1426 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1417 - var4 += var26; // L: 1418 - var5 += var28; // L: 1419 - var8 += var31; // L: 1420 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1421 - var32 += var34; // L: 1422 - var35 += var37; // L: 1423 - var38 += var40; // L: 1424 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1407 - var3 += var27; // L: 1408 - var5 += var28; // L: 1409 - var8 += var31; // L: 1410 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1411 - var32 += var34; // L: 1412 - var35 += var37; // L: 1413 - var38 += var40; // L: 1414 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var1; // L: 1429 - var1 -= var2; // L: 1430 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1431 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 1432 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 1442 + --var0; if (var0 < 0) { - return; // L: 1452 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1443 - var4 += var26; // L: 1444 - var5 += var28; // L: 1445 - var8 += var31; // L: 1446 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1447 - var32 += var34; // L: 1448 - var35 += var37; // L: 1449 - var38 += var40; // L: 1450 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1433 - var3 += var27; // L: 1434 - var5 += var28; // L: 1435 - var8 += var31; // L: 1436 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1437 - var32 += var34; // L: 1438 - var35 += var37; // L: 1439 - var38 += var40; // L: 1440 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } } } - } // L: 983 + } - @ObfuscatedName("g") + @ObfuscatedName("a") @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: 1461 - if (var6 > Rasterizer3D_clipWidth) { // L: 1462 + if (field2251) { + if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 1463 + if (var5 < 0) { var5 = 0; } } - if (var5 < var6) { // L: 1465 - var4 += var5; // L: 1466 - var7 += var5 * var8; // L: 1467 - int var17 = var6 - var5; // L: 1468 + if (var5 < var6) { + var4 += var5; + var7 += var5 * var8; + int var17 = var6 - var5; int var15; int var16; int var10000; @@ -2068,1040 +2068,1040 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 1469 - var23 = var5 - Rasterizer3D_clipMidX; // L: 1475 - var9 += var23 * (var12 >> 3); // L: 1476 - var10 += (var13 >> 3) * var23; // L: 1477 - var11 += var23 * (var14 >> 3); // L: 1478 - var22 = var11 >> 12; // L: 1479 - if (var22 != 0) { // L: 1480 - var18 = var9 / var22; // L: 1481 - var19 = var10 / var22; // L: 1482 - if (var18 < 0) { // L: 1483 + if (Rasterizer3D_isLowDetailTexture) { + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * (var12 >> 3); + var10 += (var13 >> 3) * var23; + var11 += var23 * (var14 >> 3); + var22 = var11 >> 12; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; + if (var18 < 0) { var18 = 0; - } else if (var18 > 4032) { // L: 1484 + } else if (var18 > 4032) { var18 = 4032; } } else { - var18 = 0; // L: 1487 - var19 = 0; // L: 1488 + var18 = 0; + var19 = 0; } - var9 += var12; // L: 1490 - var10 += var13; // L: 1491 - var11 += var14; // L: 1492 - var22 = var11 >> 12; // L: 1493 - if (var22 != 0) { // L: 1494 - var20 = var9 / var22; // L: 1495 - var21 = var10 / var22; // L: 1496 - if (var20 < 0) { // L: 1497 + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 4032) { // L: 1498 + } else if (var20 > 4032) { var20 = 4032; } } else { - var20 = 0; // L: 1501 - var21 = 0; // L: 1502 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 1504 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1505 - var17 >>= 3; // L: 1506 - var8 <<= 3; // L: 1507 - var15 = var7 >> 8; // L: 1508 - if (field2259) { // L: 1509 - if (var17 > 0) { // L: 1510 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2248) { + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1512 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1513 - var2 += var16; // L: 1514 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1515 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1516 - var2 += var16; // L: 1517 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1518 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1519 - var2 += var16; // L: 1520 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1521 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1522 - var2 += var16; // L: 1523 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1524 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1525 - var2 += var16; // L: 1526 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1527 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1528 - var2 += var16; // L: 1529 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1530 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1531 - var2 += var16; // L: 1532 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1533 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1534 - var10000 = var16 + var2; // L: 1535 - var18 = var20; // L: 1536 - var19 = var21; // L: 1537 - var9 += var12; // L: 1538 - var10 += var13; // L: 1539 - var11 += var14; // L: 1540 - var22 = var11 >> 12; // L: 1541 - if (var22 != 0) { // L: 1542 - var20 = var9 / var22; // L: 1543 - var21 = var10 / var22; // L: 1544 - if (var20 < 0) { // L: 1545 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 4032) { // L: 1546 + } else if (var20 > 4032) { var20 = 4032; } } else { - var20 = 0; // L: 1549 - var21 = 0; // L: 1550 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 1552 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1553 - var7 += var8; // L: 1554 - var15 = var7 >> 8; // L: 1555 - --var17; // L: 1556 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1558 - if (var17 > 0) { // L: 1559 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1561 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1562 - var2 += var16; // L: 1563 - --var17; // L: 1564 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1568 + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1570 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1571 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1573 - var2 += var16; // L: 1574 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1575 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1576 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1578 - var2 += var16; // L: 1579 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1580 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1581 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1583 - var2 += var16; // L: 1584 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1585 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1586 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1588 - var2 += var16; // L: 1589 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1590 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1591 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1593 - var2 += var16; // L: 1594 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1595 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1596 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1598 - var2 += var16; // L: 1599 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1600 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1601 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1603 - var2 += var16; // L: 1604 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1605 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1606 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1608 - var10000 = var16 + var2; // L: 1609 - var18 = var20; // L: 1610 - var19 = var21; // L: 1611 - var9 += var12; // L: 1612 - var10 += var13; // L: 1613 - var11 += var14; // L: 1614 - var22 = var11 >> 12; // L: 1615 - if (var22 != 0) { // L: 1616 - var20 = var9 / var22; // L: 1617 - var21 = var10 / var22; // L: 1618 - if (var20 < 0) { // L: 1619 + ++var4; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 4032) { // L: 1620 + } else if (var20 > 4032) { var20 = 4032; } } else { - var20 = 0; // L: 1623 - var21 = 0; // L: 1624 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 1626 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1627 - var7 += var8; // L: 1628 - var15 = var7 >> 8; // L: 1629 - --var17; // L: 1630 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1632 - if (var17 > 0) { // L: 1633 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1635 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1636 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1638 - var2 += var16; // L: 1639 - --var17; // L: 1640 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 1650 - var9 += var23 * (var12 >> 3); // L: 1651 - var10 += (var13 >> 3) * var23; // L: 1652 - var11 += var23 * (var14 >> 3); // L: 1653 - var22 = var11 >> 14; // L: 1654 - if (var22 != 0) { // L: 1655 - var18 = var9 / var22; // L: 1656 - var19 = var10 / var22; // L: 1657 - if (var18 < 0) { // L: 1658 + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * (var12 >> 3); + var10 += (var13 >> 3) * var23; + var11 += var23 * (var14 >> 3); + var22 = var11 >> 14; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; + if (var18 < 0) { var18 = 0; - } else if (var18 > 16256) { // L: 1659 + } else if (var18 > 16256) { var18 = 16256; } } else { - var18 = 0; // L: 1662 - var19 = 0; // L: 1663 + var18 = 0; + var19 = 0; } - var9 += var12; // L: 1665 - var10 += var13; // L: 1666 - var11 += var14; // L: 1667 - var22 = var11 >> 14; // L: 1668 - if (var22 != 0) { // L: 1669 - var20 = var9 / var22; // L: 1670 - var21 = var10 / var22; // L: 1671 - if (var20 < 0) { // L: 1672 + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 16256) { // L: 1673 + } else if (var20 > 16256) { var20 = 16256; } } else { - var20 = 0; // L: 1676 - var21 = 0; // L: 1677 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 1679 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1680 - var17 >>= 3; // L: 1681 - var8 <<= 3; // L: 1682 - var15 = var7 >> 8; // L: 1683 - if (field2259) { // L: 1684 - if (var17 > 0) { // L: 1685 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2248) { + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1687 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1688 - var2 += var16; // L: 1689 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1690 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1691 - var2 += var16; // L: 1692 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1693 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1694 - var2 += var16; // L: 1695 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1696 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1697 - var2 += var16; // L: 1698 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1699 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1700 - var2 += var16; // L: 1701 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1702 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1703 - var2 += var16; // L: 1704 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1705 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1706 - var2 += var16; // L: 1707 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1708 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1709 - var10000 = var16 + var2; // L: 1710 - var18 = var20; // L: 1711 - var19 = var21; // L: 1712 - var9 += var12; // L: 1713 - var10 += var13; // L: 1714 - var11 += var14; // L: 1715 - var22 = var11 >> 14; // L: 1716 - if (var22 != 0) { // L: 1717 - var20 = var9 / var22; // L: 1718 - var21 = var10 / var22; // L: 1719 - if (var20 < 0) { // L: 1720 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 16256) { // L: 1721 + } else if (var20 > 16256) { var20 = 16256; } } else { - var20 = 0; // L: 1724 - var21 = 0; // L: 1725 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 1727 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1728 - var7 += var8; // L: 1729 - var15 = var7 >> 8; // L: 1730 - --var17; // L: 1731 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1733 - if (var17 > 0) { // L: 1734 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1736 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1737 - var2 += var16; // L: 1738 - --var17; // L: 1739 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1743 + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1745 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1746 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1748 - var2 += var16; // L: 1749 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1750 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1751 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1753 - var2 += var16; // L: 1754 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1755 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1756 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1758 - var2 += var16; // L: 1759 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1760 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1761 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1763 - var2 += var16; // L: 1764 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1765 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1766 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1768 - var2 += var16; // L: 1769 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1770 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1771 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1773 - var2 += var16; // L: 1774 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1775 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1776 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1778 - var2 += var16; // L: 1779 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1780 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1781 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1783 - var10000 = var16 + var2; // L: 1784 - var18 = var20; // L: 1785 - var19 = var21; // L: 1786 - var9 += var12; // L: 1787 - var10 += var13; // L: 1788 - var11 += var14; // L: 1789 - var22 = var11 >> 14; // L: 1790 - if (var22 != 0) { // L: 1791 - var20 = var9 / var22; // L: 1792 - var21 = var10 / var22; // L: 1793 - if (var20 < 0) { // L: 1794 + ++var4; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 16256) { // L: 1795 + } else if (var20 > 16256) { var20 = 16256; } } else { - var20 = 0; // L: 1798 - var21 = 0; // L: 1799 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 1801 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1802 - var7 += var8; // L: 1803 - var15 = var7 >> 8; // L: 1804 - --var17; // L: 1805 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1807 - if (var17 > 0) { // L: 1808 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1810 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1811 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1813 - var2 += var16; // L: 1814 - --var17; // L: 1815 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } } - } // L: 1819 + } - @ObfuscatedName("t") + @ObfuscatedName("q") @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: 1822 + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; - if (var19 == null) { // L: 1823 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1824 - method3960(var0, var1, var2, var3, var4, var5, method3968(var20, var6), method3968(var20, var7), method3968(var20, var8)); // L: 1825 + if (var19 == null) { + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); + method3905(var0, var1, var2, var3, var4, var5, method3909(var20, var6), method3909(var20, var7), method3909(var20, var8)); } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1828 - field2259 = Rasterizer3D_textureLoader.vmethod4428(var18); // L: 1829 - var20 = var4 - var3; // L: 1830 - int var21 = var1 - var0; // L: 1831 - int var22 = var5 - var3; // L: 1832 - int var23 = var2 - var0; // L: 1833 - int var24 = var7 - var6; // L: 1834 - int var25 = var8 - var6; // L: 1835 - int var26 = 0; // L: 1836 - if (var0 != var1) { // L: 1837 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); + field2248 = Rasterizer3D_textureLoader.vmethod4332(var18); + var20 = var4 - var3; + int var21 = var1 - var0; + int var22 = var5 - var3; + int var23 = var2 - var0; + int var24 = var7 - var6; + int var25 = var8 - var6; + int var26 = 0; + if (var0 != var1) { var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 1838 - if (var2 != var1) { // L: 1839 + int var27 = 0; + if (var2 != var1) { var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 1840 - if (var0 != var2) { // L: 1841 + int var28 = 0; + if (var0 != var2) { var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 1842 - if (var29 != 0) { // L: 1843 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1844 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1845 - var10 = var9 - var10; // L: 1846 - var13 = var12 - var13; // L: 1847 - var16 = var15 - var16; // L: 1848 - var11 -= var9; // L: 1849 - var14 -= var12; // L: 1850 - var17 -= var15; // L: 1851 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1852 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1853 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1854 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1855 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1856 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1857 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1858 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1859 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1860 + int var29 = var20 * var23 - var22 * var21; + if (var29 != 0) { + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; + var10 = var9 - var10; + var13 = var12 - var13; + var16 = var15 - var16; + var11 -= var9; + var14 -= var12; + var17 -= var15; + int var32 = var11 * var12 - var9 * var14 << 14; + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); + int var35 = var10 * var12 - var13 * var9 << 14; + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); + int var38 = var13 * var11 - var10 * var14 << 14; + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1861 - if (var0 < Rasterizer3D_clipHeight) { // L: 1862 - if (var1 > Rasterizer3D_clipHeight) { // L: 1863 + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1864 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1865 - if (var1 < var2) { // L: 1866 - var5 = var3 <<= 14; // L: 1867 - if (var0 < 0) { // L: 1868 - var5 -= var0 * var28; // L: 1869 - var3 -= var0 * var26; // L: 1870 - var6 -= var0 * var31; // L: 1871 - var0 = 0; // L: 1872 + var6 = var30 + ((var6 << 9) - var3 * var30); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var4 <<= 14; // L: 1874 - if (var1 < 0) { // L: 1875 - var4 -= var27 * var1; // L: 1876 - var1 = 0; // L: 1877 + var4 <<= 14; + if (var1 < 0) { + var4 -= var27 * var1; + var1 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1879 - var32 += var34 * var41; // L: 1880 - var35 += var37 * var41; // L: 1881 - var38 += var40 * var41; // L: 1882 - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1883 - var2 -= var1; // L: 1884 - var1 -= var0; // L: 1885 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1887 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1897 + --var2; if (var2 < 0) { - return; // L: 1907 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1898 - var5 += var28; // L: 1899 - var4 += var27; // L: 1900 - var6 += var31; // L: 1901 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1902 - var32 += var34; // L: 1903 - var35 += var37; // L: 1904 - var38 += var40; // L: 1905 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 - var5 += var28; // L: 1889 - var3 += var26; // L: 1890 - var6 += var31; // L: 1891 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 - var32 += var34; // L: 1893 - var35 += var37; // L: 1894 - var38 += var40; // L: 1895 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var1; // L: 1910 - var1 -= var0; // L: 1911 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1913 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1923 + --var2; if (var2 < 0) { - return; // L: 1933 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1924 - var5 += var28; // L: 1925 - var4 += var27; // L: 1926 - var6 += var31; // L: 1927 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1928 - var32 += var34; // L: 1929 - var35 += var37; // L: 1930 - var38 += var40; // L: 1931 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1914 - var5 += var28; // L: 1915 - var3 += var26; // L: 1916 - var6 += var31; // L: 1917 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1918 - var32 += var34; // L: 1919 - var35 += var37; // L: 1920 - var38 += var40; // L: 1921 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var4 = var3 <<= 14; // L: 1937 - if (var0 < 0) { // L: 1938 - var4 -= var0 * var28; // L: 1939 - var3 -= var0 * var26; // L: 1940 - var6 -= var0 * var31; // L: 1941 - var0 = 0; // L: 1942 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var5 <<= 14; // L: 1944 - if (var2 < 0) { // L: 1945 - var5 -= var27 * var2; // L: 1946 - var2 = 0; // L: 1947 + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1949 - var32 += var34 * var41; // L: 1950 - var35 += var37 * var41; // L: 1951 - var38 += var40 * var41; // L: 1952 - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1953 - var1 -= var2; // L: 1954 - var2 -= var0; // L: 1955 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1957 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1967 + --var1; if (var1 < 0) { - return; // L: 1977 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 - var5 += var27; // L: 1969 - var3 += var26; // L: 1970 - var6 += var31; // L: 1971 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 - var32 += var34; // L: 1973 - var35 += var37; // L: 1974 - var38 += var40; // L: 1975 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 - var4 += var28; // L: 1959 - var3 += var26; // L: 1960 - var6 += var31; // L: 1961 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 - var32 += var34; // L: 1963 - var35 += var37; // L: 1964 - var38 += var40; // L: 1965 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var2; // L: 1980 - var2 -= var0; // L: 1981 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1983 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1993 + --var1; if (var1 < 0) { - return; // L: 2003 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1994 - var5 += var27; // L: 1995 - var3 += var26; // L: 1996 - var6 += var31; // L: 1997 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1998 - var32 += var34; // L: 1999 - var35 += var37; // L: 2000 - var38 += var40; // L: 2001 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1984 - var4 += var28; // L: 1985 - var3 += var26; // L: 1986 - var6 += var31; // L: 1987 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1988 - var32 += var34; // L: 1989 - var35 += var37; // L: 1990 - var38 += var40; // L: 1991 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var1 <= var2) { // L: 2007 - if (var1 < Rasterizer3D_clipHeight) { // L: 2008 - if (var2 > Rasterizer3D_clipHeight) { // L: 2009 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 2010 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2011 - if (var2 < var0) { // L: 2012 - var3 = var4 <<= 14; // L: 2013 - if (var1 < 0) { // L: 2014 - var3 -= var26 * var1; // L: 2015 - var4 -= var27 * var1; // L: 2016 - var7 -= var31 * var1; // L: 2017 - var1 = 0; // L: 2018 + var7 = var30 + ((var7 << 9) - var30 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var5 <<= 14; // L: 2020 - if (var2 < 0) { // L: 2021 - var5 -= var28 * var2; // L: 2022 - var2 = 0; // L: 2023 + var5 <<= 14; + if (var2 < 0) { + var5 -= var28 * var2; + var2 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2025 - var32 += var34 * var41; // L: 2026 - var35 += var37 * var41; // L: 2027 - var38 += var40 * var41; // L: 2028 - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2029 - var0 -= var2; // L: 2056 - var2 -= var1; // L: 2057 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 2059 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 2069 + --var0; if (var0 < 0) { - return; // L: 2079 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2070 - var3 += var26; // L: 2071 - var5 += var28; // L: 2072 - var7 += var31; // L: 2073 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2074 - var32 += var34; // L: 2075 - var35 += var37; // L: 2076 - var38 += var40; // L: 2077 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 - var3 += var26; // L: 2061 - var4 += var27; // L: 2062 - var7 += var31; // L: 2063 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 - var32 += var34; // L: 2065 - var35 += var37; // L: 2066 - var38 += var40; // L: 2067 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var2; // L: 2030 - var2 -= var1; // L: 2031 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 2033 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 2043 + --var0; if (var0 < 0) { - return; // L: 2053 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2044 - var3 += var26; // L: 2045 - var5 += var28; // L: 2046 - var7 += var31; // L: 2047 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2048 - var32 += var34; // L: 2049 - var35 += var37; // L: 2050 - var38 += var40; // L: 2051 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2034 - var3 += var26; // L: 2035 - var4 += var27; // L: 2036 - var7 += var31; // L: 2037 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2038 - var32 += var34; // L: 2039 - var35 += var37; // L: 2040 - var38 += var40; // L: 2041 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var5 = var4 <<= 14; // L: 2083 - if (var1 < 0) { // L: 2084 - var5 -= var26 * var1; // L: 2085 - var4 -= var27 * var1; // L: 2086 - var7 -= var31 * var1; // L: 2087 - var1 = 0; // L: 2088 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var3 <<= 14; // L: 2090 - if (var0 < 0) { // L: 2091 - var3 -= var0 * var28; // L: 2092 - var0 = 0; // L: 2093 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2095 - var32 += var34 * var41; // L: 2096 - var35 += var37 * var41; // L: 2097 - var38 += var40 * var41; // L: 2098 - if (var26 < var27) { // L: 2099 - var2 -= var0; // L: 2100 - var0 -= var1; // L: 2101 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2102 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 2103 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 2113 + --var2; if (var2 < 0) { - return; // L: 2123 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2114 - var3 += var28; // L: 2115 - var4 += var27; // L: 2116 - var7 += var31; // L: 2117 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2118 - var32 += var34; // L: 2119 - var35 += var37; // L: 2120 - var38 += var40; // L: 2121 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2104 - var5 += var26; // L: 2105 - var4 += var27; // L: 2106 - var7 += var31; // L: 2107 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2108 - var32 += var34; // L: 2109 - var35 += var37; // L: 2110 - var38 += var40; // L: 2111 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var0; // L: 2126 - var0 -= var1; // L: 2127 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2128 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 2129 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 2139 + --var2; if (var2 < 0) { - return; // L: 2149 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2140 - var3 += var28; // L: 2141 - var4 += var27; // L: 2142 - var7 += var31; // L: 2143 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2144 - var32 += var34; // L: 2145 - var35 += var37; // L: 2146 - var38 += var40; // L: 2147 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2130 - var5 += var26; // L: 2131 - var4 += var27; // L: 2132 - var7 += var31; // L: 2133 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2134 - var32 += var34; // L: 2135 - var35 += var37; // L: 2136 - var38 += var40; // L: 2137 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 2154 - if (var0 > Rasterizer3D_clipHeight) { // L: 2155 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 2156 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 2157 - if (var0 < var1) { // L: 2158 - var4 = var5 <<= 14; // L: 2159 - if (var2 < 0) { // L: 2160 - var4 -= var27 * var2; // L: 2161 - var5 -= var28 * var2; // L: 2162 - var8 -= var31 * var2; // L: 2163 - var2 = 0; // L: 2164 + var8 = (var8 << 9) - var5 * var30 + var30; + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var3 <<= 14; // L: 2166 - if (var0 < 0) { // L: 2167 - var3 -= var0 * var26; // L: 2168 - var0 = 0; // L: 2169 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var26; + var0 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2171 - var32 += var34 * var41; // L: 2172 - var35 += var37 * var41; // L: 2173 - var38 += var40 * var41; // L: 2174 - if (var27 < var28) { // L: 2175 - var1 -= var0; // L: 2176 - var0 -= var2; // L: 2177 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2178 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 2179 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 2189 + --var1; if (var1 < 0) { - return; // L: 2199 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2190 - var4 += var27; // L: 2191 - var3 += var26; // L: 2192 - var8 += var31; // L: 2193 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2194 - var32 += var34; // L: 2195 - var35 += var37; // L: 2196 - var38 += var40; // L: 2197 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2180 - var4 += var27; // L: 2181 - var5 += var28; // L: 2182 - var8 += var31; // L: 2183 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2184 - var32 += var34; // L: 2185 - var35 += var37; // L: 2186 - var38 += var40; // L: 2187 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var0; // L: 2202 - var0 -= var2; // L: 2203 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2204 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 2205 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 2215 + --var1; if (var1 < 0) { - return; // L: 2225 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2216 - var4 += var27; // L: 2217 - var3 += var26; // L: 2218 - var8 += var31; // L: 2219 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2220 - var32 += var34; // L: 2221 - var35 += var37; // L: 2222 - var38 += var40; // L: 2223 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2206 - var4 += var27; // L: 2207 - var5 += var28; // L: 2208 - var8 += var31; // L: 2209 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2210 - var32 += var34; // L: 2211 - var35 += var37; // L: 2212 - var38 += var40; // L: 2213 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var3 = var5 <<= 14; // L: 2229 - if (var2 < 0) { // L: 2230 - var3 -= var27 * var2; // L: 2231 - var5 -= var28 * var2; // L: 2232 - var8 -= var31 * var2; // L: 2233 - var2 = 0; // L: 2234 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var4 <<= 14; // L: 2236 - if (var1 < 0) { // L: 2237 - var4 -= var26 * var1; // L: 2238 - var1 = 0; // L: 2239 + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2241 - var32 += var34 * var41; // L: 2242 - var35 += var37 * var41; // L: 2243 - var38 += var40 * var41; // L: 2244 - if (var27 < var28) { // L: 2245 - var0 -= var1; // L: 2246 - var1 -= var2; // L: 2247 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2248 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 2249 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 2259 + --var0; if (var0 < 0) { - return; // L: 2269 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2260 - var4 += var26; // L: 2261 - var5 += var28; // L: 2262 - var8 += var31; // L: 2263 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2264 - var32 += var34; // L: 2265 - var35 += var37; // L: 2266 - var38 += var40; // L: 2267 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2250 - var3 += var27; // L: 2251 - var5 += var28; // L: 2252 - var8 += var31; // L: 2253 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2254 - var32 += var34; // L: 2255 - var35 += var37; // L: 2256 - var38 += var40; // L: 2257 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var1; // L: 2272 - var1 -= var2; // L: 2273 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2274 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 2275 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 2285 + --var0; if (var0 < 0) { - return; // L: 2295 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2286 - var4 += var26; // L: 2287 - var5 += var28; // L: 2288 - var8 += var31; // L: 2289 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2290 - var32 += var34; // L: 2291 - var35 += var37; // L: 2292 - var38 += var40; // L: 2293 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2276 - var3 += var27; // L: 2277 - var5 += var28; // L: 2278 - var8 += var31; // L: 2279 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2280 - var32 += var34; // L: 2281 - var35 += var37; // L: 2282 - var38 += var40; // L: 2283 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } } } - } // L: 1826 + } - @ObfuscatedName("x") + @ObfuscatedName("u") @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: 2304 - if (var6 > Rasterizer3D_clipWidth) { // L: 2305 + if (field2251) { + if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 2306 + if (var5 < 0) { var5 = 0; } } - if (var5 < var6) { // L: 2308 - var4 += var5; // L: 2309 - var7 += var5 * var8; // L: 2310 - int var17 = var6 - var5; // L: 2311 + if (var5 < var6) { + var4 += var5; + var7 += var5 * var8; + int var17 = var6 - var5; int var15; int var16; int var18; @@ -3110,336 +3110,336 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 2312 - var23 = var5 - Rasterizer3D_clipMidX; // L: 2319 - var9 += var23 * var12; // L: 2320 - var10 += var13 * var23; // L: 2321 - var11 += var23 * var14; // L: 2322 - var22 = var11 >> 12; // L: 2323 - if (var22 != 0) { // L: 2324 - var18 = var9 / var22; // L: 2325 - var19 = var10 / var22; // L: 2326 + if (Rasterizer3D_isLowDetailTexture) { + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * var12; + var10 += var13 * var23; + var11 += var23 * var14; + var22 = var11 >> 12; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; } else { - var18 = 0; // L: 2329 - var19 = 0; // L: 2330 + var18 = 0; + var19 = 0; } - var9 += var17 * var12; // L: 2332 - var10 += var13 * var17; // L: 2333 - var11 += var17 * var14; // L: 2334 - var22 = var11 >> 12; // L: 2335 - if (var22 != 0) { // L: 2336 - var20 = var9 / var22; // L: 2337 - var21 = var10 / var22; // L: 2338 + var9 += var17 * var12; + var10 += var13 * var17; + var11 += var17 * var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; } else { - var20 = 0; // L: 2341 - var21 = 0; // L: 2342 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 2344 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2345 - var17 >>= 3; // L: 2346 - var8 <<= 3; // L: 2347 - var15 = var7 >> 8; // L: 2348 - if (field2259) { // L: 2350 - if (var17 > 0) { // L: 2351 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2248) { + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2353 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2354 - var2 += var16; // L: 2355 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2356 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2357 - var2 += var16; // L: 2358 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2359 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2360 - var2 += var16; // L: 2361 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2362 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2363 - var2 += var16; // L: 2364 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2365 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2366 - var2 += var16; // L: 2367 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2368 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2369 - var2 += var16; // L: 2370 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2371 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2372 - var2 += var16; // L: 2373 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2374 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2375 - var2 += var16; // L: 2376 - var7 += var8; // L: 2377 - var15 = var7 >> 8; // L: 2378 - --var17; // L: 2379 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2381 - if (var17 > 0) { // L: 2382 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2384 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2385 - var2 += var16; // L: 2386 - --var17; // L: 2387 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2391 + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2393 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2394 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2396 - var2 += var16; // L: 2397 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2398 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2399 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2401 - var2 += var16; // L: 2402 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2403 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2404 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2406 - var2 += var16; // L: 2407 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2408 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2409 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2411 - var2 += var16; // L: 2412 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2413 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2414 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2416 - var2 += var16; // L: 2417 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2418 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2419 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2421 - var2 += var16; // L: 2422 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2423 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2424 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2426 - var2 += var16; // L: 2427 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2428 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2429 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2431 - var2 += var16; // L: 2432 - var7 += var8; // L: 2433 - var15 = var7 >> 8; // L: 2434 - --var17; // L: 2435 + ++var4; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2437 - if (var17 > 0) { // L: 2438 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2440 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2441 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2443 - var2 += var16; // L: 2444 - --var17; // L: 2445 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 2456 - var9 += var23 * var12; // L: 2457 - var10 += var13 * var23; // L: 2458 - var11 += var23 * var14; // L: 2459 - var22 = var11 >> 14; // L: 2460 - if (var22 != 0) { // L: 2461 - var18 = var9 / var22; // L: 2462 - var19 = var10 / var22; // L: 2463 + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * var12; + var10 += var13 * var23; + var11 += var23 * var14; + var22 = var11 >> 14; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; } else { - var18 = 0; // L: 2466 - var19 = 0; // L: 2467 + var18 = 0; + var19 = 0; } - var9 += var17 * var12; // L: 2469 - var10 += var13 * var17; // L: 2470 - var11 += var17 * var14; // L: 2471 - var22 = var11 >> 14; // L: 2472 - if (var22 != 0) { // L: 2473 - var20 = var9 / var22; // L: 2474 - var21 = var10 / var22; // L: 2475 + var9 += var17 * var12; + var10 += var13 * var17; + var11 += var17 * var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; } else { - var20 = 0; // L: 2478 - var21 = 0; // L: 2479 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 2481 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2482 - var17 >>= 3; // L: 2483 - var8 <<= 3; // L: 2484 - var15 = var7 >> 8; // L: 2485 - if (field2259) { // L: 2487 - if (var17 > 0) { // L: 2488 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2248) { + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2490 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2491 - var2 += var16; // L: 2492 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2493 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2494 - var2 += var16; // L: 2495 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2496 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2497 - var2 += var16; // L: 2498 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2499 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2500 - var2 += var16; // L: 2501 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2502 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2503 - var2 += var16; // L: 2504 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2505 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2506 - var2 += var16; // L: 2507 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2508 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2509 - var2 += var16; // L: 2510 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2511 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2512 - var2 += var16; // L: 2513 - var7 += var8; // L: 2514 - var15 = var7 >> 8; // L: 2515 - --var17; // L: 2516 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2518 - if (var17 > 0) { // L: 2519 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2521 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2522 - var2 += var16; // L: 2523 - --var17; // L: 2524 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2528 + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2530 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2531 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2533 - var2 += var16; // L: 2534 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2535 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2536 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2538 - var2 += var16; // L: 2539 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2540 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2541 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2543 - var2 += var16; // L: 2544 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2545 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2546 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2548 - var2 += var16; // L: 2549 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2550 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2551 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2553 - var2 += var16; // L: 2554 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2555 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2556 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2558 - var2 += var16; // L: 2559 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2560 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2561 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2563 - var2 += var16; // L: 2564 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2565 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2566 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2568 - var2 += var16; // L: 2569 - var7 += var8; // L: 2570 - var15 = var7 >> 8; // L: 2571 - --var17; // L: 2572 + ++var4; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2574 - if (var17 > 0) { // L: 2575 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2577 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2578 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2580 - var2 += var16; // L: 2581 - --var17; // L: 2582 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } } - } // L: 2586 + } - @ObfuscatedName("u") - static final int method3968(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 2589 - if (var1 < 2) { // L: 2590 + @ObfuscatedName("e") + static final int method3909(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 2591 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 2592 - } - - @ObfuscatedName("q") - static final int method3969(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2596 - } - - @ObfuscatedName("s") - static final int method3970(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2600 - } - - @ObfuscatedName("p") - static final int method3992(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; // L: 2604 + return (var0 & 65408) + var1; } @ObfuscatedName("c") - static final int method4000(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; // L: 2608 + static final int method3910(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("n") - static final int method3973(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2612 + @ObfuscatedName("i") + static final int method3891(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; } - @ObfuscatedName("l") - static final int method4031(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2616 + @ObfuscatedName("m") + static final int method3942(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; + } + + @ObfuscatedName("b") + static final int method3913(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; + } + + @ObfuscatedName("z") + static final int method3930(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; + } + + @ObfuscatedName("d") + static final int method3915(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 0b7527a210..28a4d19e49 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,1567 +3,1567 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("al") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("f") - int field469; - @ObfuscatedName("e") - int field457; + @ObfuscatedName("s") + int field242; + @ObfuscatedName("t") + int field236; @ObfuscatedName("v") - int field458; - @ObfuscatedName("y") - int field459; + int field237; @ObfuscatedName("j") - int field460; + int field238; + @ObfuscatedName("l") + int field239; + @ObfuscatedName("n") + int field247; + @ObfuscatedName("f") + int field241; @ObfuscatedName("o") - int field461; - @ObfuscatedName("m") - int field456; - @ObfuscatedName("r") @Export("numLoops") int numLoops; - @ObfuscatedName("h") + @ObfuscatedName("x") @Export("start") int start; - @ObfuscatedName("d") + @ObfuscatedName("r") @Export("end") int end; - @ObfuscatedName("z") - boolean field466; - @ObfuscatedName("b") - int field462; - @ObfuscatedName("i") - int field468; + @ObfuscatedName("p") + boolean field245; + @ObfuscatedName("h") + int field244; @ObfuscatedName("k") - int field467; - @ObfuscatedName("g") - int field470; + int field243; + @ObfuscatedName("a") + int field248; + @ObfuscatedName("q") + int field249; @ObfuscatedSignature( - descriptor = "(Lar;III)V" + descriptor = "(Lz;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.field466 = var1.field380; // L: 54 - this.field457 = var2; // L: 55 - this.field458 = var3; // L: 56 - this.field459 = var4; // L: 57 - this.field469 = 0; // L: 58 - this.method943(); // L: 59 - } // L: 60 + super.sound = var1; + this.start = var1.start; + this.end = var1.end; + this.field245 = var1.field167; + this.field236 = var2; + this.field237 = var3; + this.field238 = var4; + this.field242 = 0; + this.method555(); + } @ObfuscatedSignature( - descriptor = "(Lar;II)V" + descriptor = "(Lz;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.field466 = var1.field380; // L: 42 - this.field457 = var2; // L: 43 - this.field458 = var3; // L: 44 - this.field459 = 8192; // L: 45 - this.field469 = 0; // L: 46 - this.method943(); // L: 47 - } // L: 48 + super.sound = var1; + this.start = var1.start; + this.end = var1.end; + this.field245 = var1.field167; + this.field236 = var2; + this.field237 = var3; + this.field238 = 8192; + this.field242 = 0; + this.method555(); + } - @ObfuscatedName("j") - void method943() { - this.field460 = this.field458; // L: 73 - this.field461 = method1056(this.field458, this.field459); // L: 74 - this.field456 = method1043(this.field458, this.field459); // L: 75 - } // L: 76 + @ObfuscatedName("l") + void method555() { + this.field239 = this.field237; + this.field247 = method660(this.field237, this.field238); + this.field241 = method634(this.field237, this.field238); + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return null; // L: 200 + return null; } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lbc;" + descriptor = "()Laq;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return null; // L: 204 + return null; } - @ObfuscatedName("r") - protected int vmethod4740() { - return this.field458 == 0 && this.field462 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("f") + protected int vmethod4662() { + return this.field237 == 0 && this.field244 == 0 ? 0 : 1; } - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field458 == 0 && this.field462 == 0) { // L: 213 - this.skip(var3); // L: 214 + if (this.field237 == 0 && this.field244 == 0) { + this.skip(var3); } else { - RawSound var4 = (RawSound)super.sound; // L: 217 - int var5 = this.start << 8; // L: 218 - int var6 = this.end << 8; // L: 219 - int var7 = var4.samples.length << 8; // L: 220 - int var8 = var6 - var5; // L: 221 - if (var8 <= 0) { // L: 222 + RawSound var4 = (RawSound)super.sound; + int var5 = this.start << 8; + int var6 = this.end << 8; + int var7 = var4.samples.length << 8; + int var8 = var6 - var5; + if (var8 <= 0) { this.numLoops = 0; } - int var9 = var2; // L: 223 - var3 += var2; // L: 224 - if (this.field469 < 0) { // L: 225 - if (this.field457 <= 0) { // L: 226 - this.method945(); // L: 228 - this.remove(); // L: 229 - return; // L: 230 + int var9 = var2; + var3 += var2; + if (this.field242 < 0) { + if (this.field236 <= 0) { + this.method610(); + this.remove(); + return; } - this.field469 = 0; + this.field242 = 0; } - if (this.field469 >= var7) { // L: 233 - if (this.field457 >= 0) { // L: 234 - this.method945(); // L: 236 - this.remove(); // L: 237 - return; // L: 238 + if (this.field242 >= var7) { + if (this.field236 >= 0) { + this.method610(); + this.remove(); + return; } - this.field469 = var7 - 1; + this.field242 = var7 - 1; } - if (this.numLoops < 0) { // L: 241 - if (this.field466) { // L: 242 - if (this.field457 < 0) { // L: 243 - var9 = this.method966(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field469 >= var5) { // L: 245 + if (this.numLoops < 0) { + if (this.field245) { + if (this.field236 < 0) { + var9 = this.method687(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field242 >= var5) { return; } - this.field469 = var5 + var5 - 1 - this.field469; // L: 246 - this.field457 = -this.field457; // L: 247 + this.field242 = var5 + var5 - 1 - this.field242; + this.field236 = -this.field236; } while (true) { - var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field469 < var6) { // L: 251 + var9 = this.method696(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field242 < var6) { return; } - this.field469 = var6 + var6 - 1 - this.field469; // L: 252 - this.field457 = -this.field457; // L: 253 - var9 = this.method966(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field469 >= var5) { // L: 255 + this.field242 = var6 + var6 - 1 - this.field242; + this.field236 = -this.field236; + var9 = this.method687(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field242 >= var5) { return; } - this.field469 = var5 + var5 - 1 - this.field469; // L: 256 - this.field457 = -this.field457; // L: 257 + this.field242 = var5 + var5 - 1 - this.field242; + this.field236 = -this.field236; } - } else if (this.field457 < 0) { // L: 260 + } else if (this.field236 < 0) { while (true) { - var9 = this.method966(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field469 >= var5) { // L: 263 + var9 = this.method687(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field242 >= var5) { return; } - this.field469 = var6 - 1 - (var6 - 1 - this.field469) % var8; // L: 264 + this.field242 = var6 - 1 - (var6 - 1 - this.field242) % var8; } } else { while (true) { - var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field469 < var6) { // L: 270 + var9 = this.method696(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field242 < var6) { return; } - this.field469 = var5 + (this.field469 - var5) % var8; // L: 271 + this.field242 = var5 + (this.field242 - var5) % var8; } } } else { - if (this.numLoops > 0) { // L: 275 - if (this.field466) { // L: 276 + if (this.numLoops > 0) { + if (this.field245) { label127: { - if (this.field457 < 0) { // L: 277 - var9 = this.method966(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field469 >= var5) { // L: 279 + if (this.field236 < 0) { + var9 = this.method687(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field242 >= var5) { return; } - this.field469 = var5 + var5 - 1 - this.field469; // L: 280 - this.field457 = -this.field457; // L: 281 - if (--this.numLoops == 0) { // L: 282 + this.field242 = var5 + var5 - 1 - this.field242; + this.field236 = -this.field236; + if (--this.numLoops == 0) { break label127; } } do { - var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field469 < var6) { // L: 286 + var9 = this.method696(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field242 < var6) { return; } - this.field469 = var6 + var6 - 1 - this.field469; // L: 287 - this.field457 = -this.field457; // L: 288 - if (--this.numLoops == 0) { // L: 289 + this.field242 = var6 + var6 - 1 - this.field242; + this.field236 = -this.field236; + if (--this.numLoops == 0) { break; } - var9 = this.method966(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field469 >= var5) { // L: 291 + var9 = this.method687(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field242 >= var5) { return; } - this.field469 = var5 + var5 - 1 - this.field469; // L: 292 - this.field457 = -this.field457; // L: 293 - } while(--this.numLoops != 0); // L: 294 + this.field242 = var5 + var5 - 1 - this.field242; + this.field236 = -this.field236; + } while(--this.numLoops != 0); } } else { int var10; - if (this.field457 < 0) { // L: 297 + if (this.field236 < 0) { while (true) { - var9 = this.method966(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field469 >= var5) { // L: 300 + var9 = this.method687(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field242 >= var5) { return; } - var10 = (var6 - 1 - this.field469) / var8; // L: 301 - if (var10 >= this.numLoops) { // L: 302 - this.field469 += var8 * this.numLoops; // L: 303 - this.numLoops = 0; // L: 304 - break; // L: 305 + var10 = (var6 - 1 - this.field242) / var8; + if (var10 >= this.numLoops) { + this.field242 += var8 * this.numLoops; + this.numLoops = 0; + break; } - this.field469 += var8 * var10; // L: 307 - this.numLoops -= var10; // L: 308 + this.field242 += var8 * var10; + this.numLoops -= var10; } } else { while (true) { - var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field469 < var6) { // L: 314 + var9 = this.method696(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field242 < var6) { return; } - var10 = (this.field469 - var5) / var8; // L: 315 - if (var10 >= this.numLoops) { // L: 316 - this.field469 -= var8 * this.numLoops; // L: 317 - this.numLoops = 0; // L: 318 - break; // L: 319 + var10 = (this.field242 - var5) / var8; + if (var10 >= this.numLoops) { + this.field242 -= var8 * this.numLoops; + this.numLoops = 0; + break; } - this.field469 -= var8 * var10; // L: 321 - this.numLoops -= var10; // L: 322 + this.field242 -= var8 * var10; + this.numLoops -= var10; } } } } - if (this.field457 < 0) { // L: 326 - this.method966(var1, var9, 0, var3, 0); // L: 327 - if (this.field469 < 0) { // L: 328 - this.field469 = -1; // L: 329 - this.method945(); // L: 330 - this.remove(); // L: 331 + if (this.field236 < 0) { + this.method687(var1, var9, 0, var3, 0); + if (this.field242 < 0) { + this.field242 = -1; + this.method610(); + this.remove(); } } else { - this.method1080(var1, var9, var7, var3, 0); // L: 335 - if (this.field469 >= var7) { // L: 336 - this.field469 = var7; // L: 337 - this.method945(); // L: 338 - this.remove(); // L: 339 + this.method696(var1, var9, var7, var3, 0); + if (this.field242 >= var7) { + this.field242 = var7; + this.method610(); + this.remove(); } } } } - } // L: 215 342 + } - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { - this.numLoops = var1; // L: 79 - } // L: 80 + this.numLoops = var1; + } - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("skip") public synchronized void skip(int var1) { - if (this.field462 > 0) { // L: 345 - if (var1 >= this.field462) { // L: 346 - if (this.field458 == Integer.MIN_VALUE) { // L: 347 - this.field458 = 0; // L: 348 - this.field456 = 0; // L: 349 - this.field461 = 0; // L: 350 - this.field460 = 0; // L: 351 - this.remove(); // L: 352 - var1 = this.field462; // L: 353 + if (this.field244 > 0) { + if (var1 >= this.field244) { + if (this.field237 == Integer.MIN_VALUE) { + this.field237 = 0; + this.field241 = 0; + this.field247 = 0; + this.field239 = 0; + this.remove(); + var1 = this.field244; } - this.field462 = 0; // L: 355 - this.method943(); // L: 356 + this.field244 = 0; + this.method555(); } else { - this.field460 += this.field468 * var1; // L: 359 - this.field461 += this.field467 * var1; // L: 360 - this.field456 += this.field470 * var1; // L: 361 - this.field462 -= var1; // L: 362 + this.field239 += this.field243 * var1; + this.field247 += this.field248 * var1; + this.field241 += this.field249 * var1; + this.field244 -= var1; } } - RawSound var2 = (RawSound)super.sound; // L: 365 - int var3 = this.start << 8; // L: 366 - int var4 = this.end << 8; // L: 367 - int var5 = var2.samples.length << 8; // L: 368 - int var6 = var4 - var3; // L: 369 - if (var6 <= 0) { // L: 370 + RawSound var2 = (RawSound)super.sound; + int var3 = this.start << 8; + int var4 = this.end << 8; + int var5 = var2.samples.length << 8; + int var6 = var4 - var3; + if (var6 <= 0) { this.numLoops = 0; } - if (this.field469 < 0) { // L: 371 - if (this.field457 <= 0) { // L: 372 - this.method945(); // L: 374 - this.remove(); // L: 375 - return; // L: 376 + if (this.field242 < 0) { + if (this.field236 <= 0) { + this.method610(); + this.remove(); + return; } - this.field469 = 0; + this.field242 = 0; } - if (this.field469 >= var5) { // L: 379 - if (this.field457 >= 0) { // L: 380 - this.method945(); // L: 382 - this.remove(); // L: 383 - return; // L: 384 + if (this.field242 >= var5) { + if (this.field236 >= 0) { + this.method610(); + this.remove(); + return; } - this.field469 = var5 - 1; + this.field242 = var5 - 1; } - this.field469 += this.field457 * var1; // L: 387 - if (this.numLoops < 0) { // L: 388 - if (!this.field466) { // L: 389 - if (this.field457 < 0) { // L: 404 - if (this.field469 >= var3) { // L: 405 + this.field242 += this.field236 * var1; + if (this.numLoops < 0) { + if (!this.field245) { + if (this.field236 < 0) { + if (this.field242 >= var3) { return; } - this.field469 = var4 - 1 - (var4 - 1 - this.field469) % var6; // L: 406 + this.field242 = var4 - 1 - (var4 - 1 - this.field242) % var6; } else { - if (this.field469 < var4) { // L: 409 + if (this.field242 < var4) { return; } - this.field469 = var3 + (this.field469 - var3) % var6; // L: 410 + this.field242 = var3 + (this.field242 - var3) % var6; } } else { - if (this.field457 < 0) { // L: 390 - if (this.field469 >= var3) { // L: 391 + if (this.field236 < 0) { + if (this.field242 >= var3) { return; } - this.field469 = var3 + var3 - 1 - this.field469; // L: 392 - this.field457 = -this.field457; // L: 393 + this.field242 = var3 + var3 - 1 - this.field242; + this.field236 = -this.field236; } - while (this.field469 >= var4) { // L: 396 - this.field469 = var4 + var4 - 1 - this.field469; // L: 397 - this.field457 = -this.field457; // L: 398 - if (this.field469 >= var3) { // L: 399 + while (this.field242 >= var4) { + this.field242 = var4 + var4 - 1 - this.field242; + this.field236 = -this.field236; + if (this.field242 >= var3) { return; } - this.field469 = var3 + var3 - 1 - this.field469; // L: 400 - this.field457 = -this.field457; // L: 401 + this.field242 = var3 + var3 - 1 - this.field242; + this.field236 = -this.field236; } } } else { - if (this.numLoops > 0) { // L: 414 - if (this.field466) { // L: 415 + if (this.numLoops > 0) { + if (this.field245) { label129: { - if (this.field457 < 0) { // L: 416 - if (this.field469 >= var3) { // L: 417 + if (this.field236 < 0) { + if (this.field242 >= var3) { return; } - this.field469 = var3 + var3 - 1 - this.field469; // L: 418 - this.field457 = -this.field457; // L: 419 - if (--this.numLoops == 0) { // L: 420 + this.field242 = var3 + var3 - 1 - this.field242; + this.field236 = -this.field236; + if (--this.numLoops == 0) { break label129; } } do { - if (this.field469 < var4) { // L: 423 + if (this.field242 < var4) { return; } - this.field469 = var4 + var4 - 1 - this.field469; // L: 424 - this.field457 = -this.field457; // L: 425 - if (--this.numLoops == 0) { // L: 426 + this.field242 = var4 + var4 - 1 - this.field242; + this.field236 = -this.field236; + if (--this.numLoops == 0) { break; } - if (this.field469 >= var3) { // L: 427 + if (this.field242 >= var3) { return; } - this.field469 = var3 + var3 - 1 - this.field469; // L: 428 - this.field457 = -this.field457; // L: 429 - } while(--this.numLoops != 0); // L: 430 + this.field242 = var3 + var3 - 1 - this.field242; + this.field236 = -this.field236; + } while(--this.numLoops != 0); } } else { label161: { int var7; - if (this.field457 < 0) { // L: 433 - if (this.field469 >= var3) { // L: 434 + if (this.field236 < 0) { + if (this.field242 >= var3) { return; } - var7 = (var4 - 1 - this.field469) / var6; // L: 435 - if (var7 >= this.numLoops) { // L: 436 - this.field469 += var6 * this.numLoops; // L: 437 - this.numLoops = 0; // L: 438 - break label161; // L: 439 + var7 = (var4 - 1 - this.field242) / var6; + if (var7 >= this.numLoops) { + this.field242 += var6 * this.numLoops; + this.numLoops = 0; + break label161; } - this.field469 += var6 * var7; // L: 441 - this.numLoops -= var7; // L: 442 + this.field242 += var6 * var7; + this.numLoops -= var7; } else { - if (this.field469 < var4) { // L: 445 + if (this.field242 < var4) { return; } - var7 = (this.field469 - var3) / var6; // L: 446 - if (var7 >= this.numLoops) { // L: 447 - this.field469 -= var6 * this.numLoops; // L: 448 - this.numLoops = 0; // L: 449 - break label161; // L: 450 + var7 = (this.field242 - var3) / var6; + if (var7 >= this.numLoops) { + this.field242 -= var6 * this.numLoops; + this.numLoops = 0; + break label161; } - this.field469 -= var6 * var7; // L: 452 - this.numLoops -= var7; // L: 453 + this.field242 -= var6 * var7; + this.numLoops -= var7; } - return; // L: 455 + return; } } } - if (this.field457 < 0) { // L: 457 - if (this.field469 < 0) { // L: 458 - this.field469 = -1; // L: 459 - this.method945(); // L: 460 - this.remove(); // L: 461 + if (this.field236 < 0) { + if (this.field242 < 0) { + this.field242 = -1; + this.method610(); + this.remove(); } - } else if (this.field469 >= var5) { // L: 465 - this.field469 = var5; // L: 466 - this.method945(); // L: 467 - this.remove(); // L: 468 + } else if (this.field242 >= var5) { + this.field242 = var5; + this.method610(); + this.remove(); } } - } // L: 412 471 + } - @ObfuscatedName("b") - public synchronized void method936(int var1) { - this.method947(var1 << 6, this.method949()); // L: 83 - } // L: 84 + @ObfuscatedName("p") + public synchronized void method557(int var1) { + this.method559(var1 << 6, this.method561()); + } - @ObfuscatedName("i") - synchronized void method1001(int var1) { - this.method947(var1, this.method949()); // L: 87 - } // L: 88 + @ObfuscatedName("h") + synchronized void method558(int var1) { + this.method559(var1, this.method561()); + } @ObfuscatedName("k") - synchronized void method947(int var1, int var2) { - this.field458 = var1; // L: 91 - this.field459 = var2; // L: 92 - this.field462 = 0; // L: 93 - this.method943(); // L: 94 - } // L: 95 - - @ObfuscatedName("g") - public synchronized int method948() { - return this.field458 == Integer.MIN_VALUE ? 0 : this.field458; // L: 98 + synchronized void method559(int var1, int var2) { + this.field237 = var1; + this.field238 = var2; + this.field244 = 0; + this.method555(); } - @ObfuscatedName("t") - public synchronized int method949() { - return this.field459 < 0 ? -1 : this.field459; // L: 102 + @ObfuscatedName("a") + public synchronized int method560() { + return this.field237 == Integer.MIN_VALUE ? 0 : this.field237; } - @ObfuscatedName("x") - public synchronized void method950(int var1) { - int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 - if (var1 < -1) { // L: 107 + @ObfuscatedName("q") + public synchronized int method561() { + return this.field238 < 0 ? -1 : this.field238; + } + + @ObfuscatedName("u") + public synchronized void method562(int var1) { + int var2 = ((RawSound)super.sound).samples.length << 8; + if (var1 < -1) { var1 = -1; } - if (var1 > var2) { // L: 108 + if (var1 > var2) { var1 = var2; } - this.field469 = var1; // L: 109 - } // L: 110 + this.field242 = var1; + } - @ObfuscatedName("u") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method941() { - this.field457 = (this.field457 ^ this.field457 >> 31) + (this.field457 >>> 31); // L: 113 - this.field457 = -this.field457; // L: 114 - } // L: 115 + public synchronized void method563() { + this.field236 = (this.field236 ^ this.field236 >> 31) + (this.field236 >>> 31); + this.field236 = -this.field236; + } - @ObfuscatedName("q") - void method945() { - if (this.field462 != 0) { // L: 118 - if (this.field458 == Integer.MIN_VALUE) { - this.field458 = 0; // L: 119 + @ObfuscatedName("c") + void method610() { + if (this.field244 != 0) { + if (this.field237 == Integer.MIN_VALUE) { + this.field237 = 0; } - this.field462 = 0; // L: 120 - this.method943(); // L: 121 + this.field244 = 0; + this.method555(); } - } // L: 123 + } - @ObfuscatedName("s") - public synchronized void method953(int var1, int var2) { - this.method954(var1, var2, this.method949()); // L: 126 - } // L: 127 + @ObfuscatedName("i") + public synchronized void method565(int var1, int var2) { + this.method566(var1, var2, this.method561()); + } - @ObfuscatedName("p") - public synchronized void method954(int var1, int var2, int var3) { - if (var1 == 0) { // L: 130 - this.method947(var2, var3); // L: 131 + @ObfuscatedName("m") + public synchronized void method566(int var1, int var2, int var3) { + if (var1 == 0) { + this.method559(var2, var3); } else { - int var4 = method1056(var2, var3); // L: 134 - int var5 = method1043(var2, var3); // L: 135 - if (var4 == this.field461 && var5 == this.field456) { // L: 136 - this.field462 = 0; // L: 137 + int var4 = method660(var2, var3); + int var5 = method634(var2, var3); + if (var4 == this.field247 && var5 == this.field241) { + this.field244 = 0; } else { - int var6 = var2 - this.field460; // L: 140 - if (this.field460 - var2 > var6) { // L: 141 - var6 = this.field460 - var2; + int var6 = var2 - this.field239; + if (this.field239 - var2 > var6) { + var6 = this.field239 - var2; } - if (var4 - this.field461 > var6) { // L: 142 - var6 = var4 - this.field461; + if (var4 - this.field247 > var6) { + var6 = var4 - this.field247; } - if (this.field461 - var4 > var6) { // L: 143 - var6 = this.field461 - var4; + if (this.field247 - var4 > var6) { + var6 = this.field247 - var4; } - if (var5 - this.field456 > var6) { - var6 = var5 - this.field456; // L: 144 + if (var5 - this.field241 > var6) { + var6 = var5 - this.field241; } - if (this.field456 - var5 > var6) { // L: 145 - var6 = this.field456 - var5; + if (this.field241 - var5 > var6) { + var6 = this.field241 - var5; } - if (var1 > var6) { // L: 146 + if (var1 > var6) { var1 = var6; } - this.field462 = var1; // L: 147 - this.field458 = var2; // L: 148 - this.field459 = var3; // L: 149 - this.field468 = (var2 - this.field460) / var1; // L: 150 - this.field467 = (var4 - this.field461) / var1; // L: 151 - this.field470 = (var5 - this.field456) / var1; // L: 152 + this.field244 = var1; + this.field237 = var2; + this.field238 = var3; + this.field243 = (var2 - this.field239) / var1; + this.field248 = (var4 - this.field247) / var1; + this.field249 = (var5 - this.field241) / var1; } } - } // L: 132 138 153 + } - @ObfuscatedName("c") - public synchronized void method955(int var1) { - if (var1 == 0) { // L: 156 - this.method1001(0); // L: 157 - this.remove(); // L: 158 - } else if (this.field461 == 0 && this.field456 == 0) { // L: 161 - this.field462 = 0; // L: 162 - this.field458 = 0; // L: 163 - this.field460 = 0; // L: 164 - this.remove(); // L: 165 + @ObfuscatedName("b") + public synchronized void method567(int var1) { + if (var1 == 0) { + this.method558(0); + this.remove(); + } else if (this.field247 == 0 && this.field241 == 0) { + this.field244 = 0; + this.field237 = 0; + this.field239 = 0; + this.remove(); } else { - int var2 = -this.field460; // L: 168 - if (this.field460 > var2) { // L: 169 - var2 = this.field460; + int var2 = -this.field239; + if (this.field239 > var2) { + var2 = this.field239; } - if (-this.field461 > var2) { // L: 170 - var2 = -this.field461; + if (-this.field247 > var2) { + var2 = -this.field247; } - if (this.field461 > var2) { // L: 171 - var2 = this.field461; + if (this.field247 > var2) { + var2 = this.field247; } - if (-this.field456 > var2) { // L: 172 - var2 = -this.field456; + if (-this.field241 > var2) { + var2 = -this.field241; } - if (this.field456 > var2) { // L: 173 - var2 = this.field456; + if (this.field241 > var2) { + var2 = this.field241; } - if (var1 > var2) { // L: 174 + if (var1 > var2) { var1 = var2; } - this.field462 = var1; // L: 175 - this.field458 = Integer.MIN_VALUE; // L: 176 - this.field468 = -this.field460 / var1; // L: 177 - this.field467 = -this.field461 / var1; // L: 178 - this.field470 = -this.field456 / var1; // L: 179 + this.field244 = var1; + this.field237 = Integer.MIN_VALUE; + this.field243 = -this.field239 / var1; + this.field248 = -this.field247 / var1; + this.field249 = -this.field241 / var1; } - } // L: 159 166 180 + } - @ObfuscatedName("n") - public synchronized void method1052(int var1) { - if (this.field457 < 0) { // L: 183 - this.field457 = -var1; + @ObfuscatedName("z") + public synchronized void method568(int var1) { + if (this.field236 < 0) { + this.field236 = -var1; } else { - this.field457 = var1; // L: 184 + this.field236 = var1; } - } // L: 185 - - @ObfuscatedName("l") - public synchronized int method957() { - return this.field457 < 0 ? -this.field457 : this.field457; // L: 188 } - @ObfuscatedName("w") - public boolean method1065() { - return this.field469 < 0 || this.field469 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + @ObfuscatedName("d") + public synchronized int method569() { + return this.field236 < 0 ? -this.field236 : this.field236; } - @ObfuscatedName("ae") - public boolean method959() { - return this.field462 != 0; // L: 196 + @ObfuscatedName("y") + public boolean method623() { + return this.field242 < 0 || this.field242 >= ((RawSound)super.sound).samples.length << 8; } - @ObfuscatedName("ac") - int method1080(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("av") + public boolean method571() { + return this.field244 != 0; + } + + @ObfuscatedName("az") + int method696(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field462 > 0) { // L: 474 - int var6 = var2 + this.field462; // L: 475 - if (var6 > var4) { // L: 476 + if (this.field244 > 0) { + int var6 = var2 + this.field244; + if (var6 > var4) { var6 = var4; } - this.field462 += var2; // L: 477 - if (this.field457 == 256 && (this.field469 & 255) == 0) { // L: 478 - if (PcmPlayer.PcmPlayer_stereo) { // L: 479 - var2 = method977(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this); + this.field244 += var2; + if (this.field236 == 256 && (this.field242 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method589(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this); } else { - var2 = method976(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this); // L: 480 + var2 = method588(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this); } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 - var2 = method981(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this, this.field457, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method593(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this, this.field236, var5); } else { - var2 = method965(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this, this.field457, var5); // L: 484 + var2 = method592(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this, this.field236, var5); } - this.field462 -= var2; // L: 486 - if (this.field462 != 0) { // L: 487 + this.field244 -= var2; + if (this.field244 != 0) { return var2; } - if (!this.method1057()) { // L: 488 + if (!this.method579()) { continue; } return var4; } - if (this.field457 == 256 && (this.field469 & 255) == 0) { // L: 490 - if (PcmPlayer.PcmPlayer_stereo) { // L: 491 - return method984(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this); + if (this.field236 == 256 && (this.field242 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method581(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this); } - return method968(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this); // L: 492 + return method580(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this); } - if (PcmPlayer.PcmPlayer_stereo) { // L: 495 - return method1006(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this, this.field457, var5); + if (PcmPlayer.PcmPlayer_stereo) { + return method585(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this, this.field236, var5); } - return method972(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this, this.field457, var5); // L: 496 + return method584(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this, this.field236, var5); } } - @ObfuscatedName("as") - int method966(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ak") + int vmethod716() { + int var1 = this.field239 * 3 >> 6; + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); + if (this.numLoops == 0) { + var1 -= var1 * this.field242 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; + } + + return var1 > 255 ? 255 : var1; + } + + @ObfuscatedName("aj") + int method687(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field462 > 0) { // L: 501 - int var6 = var2 + this.field462; // L: 502 - if (var6 > var4) { // L: 503 + if (this.field244 > 0) { + int var6 = var2 + this.field244; + if (var6 > var4) { var6 = var4; } - this.field462 += var2; // L: 504 - if (this.field457 == -256 && (this.field469 & 255) == 0) { // L: 505 - if (PcmPlayer.PcmPlayer_stereo) { // L: 506 - var2 = method979(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this); + this.field244 += var2; + if (this.field236 == -256 && (this.field242 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method591(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this); } else { - var2 = method978(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this); // L: 507 + var2 = method590(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this); } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 - var2 = method983(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this, this.field457, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method553(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this, this.field236, var5); } else { - var2 = method982(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this, this.field457, var5); // L: 511 + var2 = method594(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this, this.field236, var5); } - this.field462 -= var2; // L: 513 - if (this.field462 != 0) { // L: 514 + this.field244 -= var2; + if (this.field244 != 0) { return var2; } - if (!this.method1057()) { // L: 515 + if (!this.method579()) { continue; } return var4; } - if (this.field457 == -256 && (this.field469 & 255) == 0) { // L: 517 - if (PcmPlayer.PcmPlayer_stereo) { // L: 518 - return method971(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this); + if (this.field236 == -256 && (this.field242 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method583(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this); } - return method970(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this); // L: 519 + return method655(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this); } - if (PcmPlayer.PcmPlayer_stereo) { // L: 522 - return method975(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this, this.field457, var5); + if (PcmPlayer.PcmPlayer_stereo) { + return method587(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this, this.field236, var5); } - return method974(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this, this.field457, var5); // L: 523 + return method586(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this, this.field236, var5); } } - @ObfuscatedName("au") - boolean method1057() { - int var1 = this.field458; // L: 528 + @ObfuscatedName("at") + boolean method579() { + int var1 = this.field237; int var2; int var3; - if (var1 == Integer.MIN_VALUE) { // L: 531 - var3 = 0; // L: 532 - var2 = 0; // L: 533 - var1 = 0; // L: 534 + if (var1 == Integer.MIN_VALUE) { + var3 = 0; + var2 = 0; + var1 = 0; } else { - var2 = method1056(var1, this.field459); // L: 537 - var3 = method1043(var1, this.field459); // L: 538 + var2 = method660(var1, this.field238); + var3 = method634(var1, this.field238); } - if (var1 == this.field460 && var2 == this.field461 && var3 == this.field456) { // L: 540 - if (this.field458 == Integer.MIN_VALUE) { // L: 570 - this.field458 = 0; // L: 571 - this.field456 = 0; // L: 572 - this.field461 = 0; // L: 573 - this.field460 = 0; // L: 574 - this.remove(); // L: 575 - return true; // L: 576 + if (var1 == this.field239 && var2 == this.field247 && var3 == this.field241) { + if (this.field237 == Integer.MIN_VALUE) { + this.field237 = 0; + this.field241 = 0; + this.field247 = 0; + this.field239 = 0; + this.remove(); + return true; } else { - this.method943(); // L: 578 - return false; // L: 579 + this.method555(); + return false; } } else { - if (this.field460 < var1) { // L: 541 - this.field468 = 1; // L: 542 - this.field462 = var1 - this.field460; // L: 543 - } else if (this.field460 > var1) { // L: 545 - this.field468 = -1; // L: 546 - this.field462 = this.field460 - var1; // L: 547 + if (this.field239 < var1) { + this.field243 = 1; + this.field244 = var1 - this.field239; + } else if (this.field239 > var1) { + this.field243 = -1; + this.field244 = this.field239 - var1; } else { - this.field468 = 0; // L: 549 + this.field243 = 0; } - if (this.field461 < var2) { // L: 550 - this.field467 = 1; // L: 551 - if (this.field462 == 0 || this.field462 > var2 - this.field461) { // L: 552 - this.field462 = var2 - this.field461; + if (this.field247 < var2) { + this.field248 = 1; + if (this.field244 == 0 || this.field244 > var2 - this.field247) { + this.field244 = var2 - this.field247; } - } else if (this.field461 > var2) { // L: 554 - this.field467 = -1; // L: 555 - if (this.field462 == 0 || this.field462 > this.field461 - var2) { // L: 556 - this.field462 = this.field461 - var2; + } else if (this.field247 > var2) { + this.field248 = -1; + if (this.field244 == 0 || this.field244 > this.field247 - var2) { + this.field244 = this.field247 - var2; } } else { - this.field467 = 0; // L: 558 + this.field248 = 0; } - if (this.field456 < var3) { // L: 559 - this.field470 = 1; // L: 560 - if (this.field462 == 0 || this.field462 > var3 - this.field456) { // L: 561 - this.field462 = var3 - this.field456; + if (this.field241 < var3) { + this.field249 = 1; + if (this.field244 == 0 || this.field244 > var3 - this.field241) { + this.field244 = var3 - this.field241; } - } else if (this.field456 > var3) { // L: 563 - this.field470 = -1; // L: 564 - if (this.field462 == 0 || this.field462 > this.field456 - var3) { // L: 565 - this.field462 = this.field456 - var3; + } else if (this.field241 > var3) { + this.field249 = -1; + if (this.field244 == 0 || this.field244 > this.field241 - var3) { + this.field244 = this.field241 - var3; } } else { - this.field470 = 0; // L: 567 + this.field249 = 0; } - return false; // L: 568 + return false; } } - @ObfuscatedName("ay") - int vmethod1099() { - int var1 = this.field460 * 3 >> 6; // L: 31 - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 - if (this.numLoops == 0) { // L: 33 - var1 -= var1 * this.field469 / (((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("s") + static int method660(int var0, int var1) { + return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("f") - static int method1056(int var0, int var1) { - return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 - } - - @ObfuscatedName("e") - static int method1043(int var0, int var1) { - return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 + @ObfuscatedName("t") + static int method634(int var0, int var1) { + return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lar;II)Lbv;" + descriptor = "(Lz;II)Lal;" ) @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)(class341.field3921 * 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)(GrandExchangeOfferAgeComparator.field3633 * 100)), var2 << 6) : null; } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lar;III)Lbv;" + descriptor = "(Lz;III)Lal;" ) - public static RawPcmStream method937(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("am") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbv;)I" - ) - static int method968(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { - var2 >>= 8; // L: 583 - var7 >>= 8; // L: 584 - var4 <<= 2; // L: 585 - if ((var5 = var3 + var7 - var2) > var6) { // L: 586 - var5 = var6; - } - - int var10001; - for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 587 588 - var10001 = var3++; // L: 589 - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; // L: 590 - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; // L: 591 - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; // L: 592 - } - - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 594 595 - var10001 = var3++; // L: 596 - } - - var8.field469 = var2 << 8; // L: 598 - return var3; // L: 599 - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbv;)I" - ) - static int method984(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { - var3 >>= 8; // L: 603 - var9 >>= 8; // L: 604 - var5 <<= 2; // L: 605 - var6 <<= 2; // L: 606 - if ((var7 = var4 + var9 - var3) > var8) { // L: 607 - var7 = var8; - } - - var4 <<= 1; // L: 608 - var7 <<= 1; // L: 609 - - int var10001; - byte var11; - for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 610 611 - var11 = var1[var3++]; // L: 612 - var10001 = var4++; // L: 613 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 614 - var2[var10001] += var11 * var6; - var11 = var1[var3++]; // L: 615 - var10001 = var4++; // L: 616 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 617 - var2[var10001] += var11 * var6; - var11 = var1[var3++]; // L: 618 - var10001 = var4++; // L: 619 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 620 - var2[var10001] += var11 * var6; - var11 = var1[var3++]; // L: 621 - var10001 = var4++; - var2[var10001] += var11 * var5; // L: 622 - var10001 = var4++; // L: 623 - } - - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 625 626 629 - var11 = var1[var3++]; // L: 627 - var10001 = var4++; // L: 628 - var2[var10001] += var11 * var5; - var10001 = var4++; - } - - var10.field469 = var3 << 8; // L: 631 - return var4 >> 1; // L: 632 - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbv;)I" - ) - static int method970(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { - var2 >>= 8; // L: 636 - var7 >>= 8; // L: 637 - var4 <<= 2; // L: 638 - if ((var5 = var3 + var2 - (var7 - 1)) > var6) { // L: 639 - var5 = var6; - } - - int var10001; - for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 640 641 - var10001 = var3++; // L: 642 - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; // L: 643 - var10001 = var3++; // L: 644 - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; // L: 645 - } - - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 647 648 - var10001 = var3++; // L: 649 - } - - var8.field469 = var2 << 8; // L: 651 - return var3; // L: 652 - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbv;)I" - ) - static int method971(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { - var3 >>= 8; // L: 656 - var9 >>= 8; // L: 657 - var5 <<= 2; // L: 658 - var6 <<= 2; // L: 659 - if ((var7 = var3 + var4 - (var9 - 1)) > var8) { // L: 660 - var7 = var8; - } - - var4 <<= 1; // L: 661 - var7 <<= 1; // L: 662 - - int var10001; - byte var11; - for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 663 664 - var11 = var1[var3--]; // L: 665 - var10001 = var4++; // L: 666 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 667 - var2[var10001] += var11 * var6; - var11 = var1[var3--]; // L: 668 - var10001 = var4++; // L: 669 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 670 - var2[var10001] += var11 * var6; - var11 = var1[var3--]; // L: 671 - var10001 = var4++; // L: 672 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 673 - var2[var10001] += var11 * var6; - var11 = var1[var3--]; // L: 674 - var10001 = var4++; - var2[var10001] += var11 * var5; // L: 675 - var10001 = var4++; // L: 676 - } - - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 678 679 682 - var11 = var1[var3--]; // L: 680 - var10001 = var4++; // L: 681 - var2[var10001] += var11 * var5; - var10001 = var4++; - } - - var10.field469 = var3 << 8; // L: 684 - return var4 >> 1; // L: 685 - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbv;II)I" - ) - static int method972(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689 - var7 = var8; - } - - byte var13; - int var10001; - while (var5 < var7) { // L: 690 - var1 = var4 >> 8; // L: 691 - var13 = var2[var1]; // L: 692 - var10001 = var5++; // L: 693 - var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; - var4 += var11; // L: 694 - } - - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { // L: 696 - var7 = var8; - } - - for (var1 = var12; var5 < var7; var4 += var11) { // L: 697 698 701 - var13 = var2[var4 >> 8]; // L: 699 - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 - } - - var10.field469 = var4; // L: 703 - return var5; // L: 704 - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbv;II)I" - ) - static int method1006(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 - var8 = var9; - } - - var5 <<= 1; // L: 709 - - byte var14; - int var10001; - for (var8 <<= 1; var5 < var8; var4 += var12) { // L: 710 711 717 - var1 = var4 >> 8; // L: 712 - var14 = var2[var1]; // L: 713 - var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14); // L: 714 - var10001 = var5++; // L: 715 - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 716 - var3[var10001] += var0 * var7 >> 6; - } - - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 719 - var8 = var9; - } - - var8 <<= 1; // L: 720 - - for (var1 = var13; var5 < var8; var4 += var12) { // L: 721 722 727 - var14 = var2[var4 >> 8]; // L: 723 - var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); // L: 724 - var10001 = var5++; // L: 725 - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 726 - var3[var10001] += var0 * var7 >> 6; - } - - var11.field469 = var4; // L: 729 - return var5 >> 1; // L: 730 + public static RawPcmStream method554(RawSound var0, int var1, int var2, int var3) { + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbv;II)I" + descriptor = "([B[IIIIIIILal;)I" ) - static int method974(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 + static int method580(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + var2 >>= 8; + var7 >>= 8; + var4 <<= 2; + if ((var5 = var3 + var7 - var2) > var6) { + var5 = var6; + } + + int var10001; + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; + } + + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { + var10001 = var3++; + } + + var8.field242 = var2 << 8; + return var3; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIILal;)I" + ) + static int method581(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + var3 >>= 8; + var9 >>= 8; + var5 <<= 2; + var6 <<= 2; + if ((var7 = var4 + var9 - var3) > var8) { var7 = var8; } - int var10001; - while (var5 < var7) { // L: 735 - var1 = var4 >> 8; // L: 736 - byte var13 = var2[var1 - 1]; // L: 737 - var10001 = var5++; // L: 738 - var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; - var4 += var11; // L: 739 - } - - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { // L: 741 - var7 = var8; - } - - var0 = var12; // L: 742 - - for (var1 = var11; var5 < var7; var4 += var1) { // L: 743 744 746 - var10001 = var5++; - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 - } - - var10.field469 = var4; // L: 748 - return var5; // L: 749 - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbv;II)I" - ) - static int method975(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 - var8 = var9; - } - - var5 <<= 1; // L: 754 + var4 <<= 1; + var7 <<= 1; int var10001; - for (var8 <<= 1; var5 < var8; var4 += var12) { // L: 755 756 762 - var1 = var4 >> 8; // L: 757 - byte var14 = var2[var1 - 1]; // L: 758 - var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8); // L: 759 - var10001 = var5++; // L: 760 - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 761 - var3[var10001] += var0 * var7 >> 6; - } - - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { // L: 764 - var8 = var9; - } - - var8 <<= 1; // L: 765 - - for (var1 = var13; var5 < var8; var4 += var12) { // L: 766 767 771 - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); // L: 768 - var10001 = var5++; // L: 769 - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 770 - var3[var10001] += var0 * var7 >> 6; - } - - var11.field469 = var4; // L: 773 - return var5 >> 1; // L: 774 - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbv;)I" - ) - static int method976(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { - var2 >>= 8; // L: 778 - var8 >>= 8; // L: 779 - var4 <<= 2; // L: 780 - var5 <<= 2; // L: 781 - if ((var6 = var3 + var8 - var2) > var7) { // L: 782 - var6 = var7; - } - - var9.field461 += var9.field467 * (var6 - var3); // L: 783 - var9.field456 += var9.field470 * (var6 - var3); // L: 784 - - int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 - var10001 = var3++; // L: 787 - var1[var10001] += var0[var2++] * var4; - var4 += var5; // L: 788 - var10001 = var3++; // L: 789 - var1[var10001] += var0[var2++] * var4; - var4 += var5; // L: 790 - var10001 = var3++; // L: 791 - var1[var10001] += var0[var2++] * var4; - var4 += var5; // L: 792 - var10001 = var3++; // L: 793 - var1[var10001] += var0[var2++] * var4; - } - - for (var6 += 3; var3 < var6; var4 += var5) { // L: 796 797 799 - var10001 = var3++; // L: 798 - var1[var10001] += var0[var2++] * var4; - } - - var9.field460 = var4 >> 2; // L: 801 - var9.field469 = var2 << 8; // L: 802 - return var3; // L: 803 - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbv;)I" - ) - static int method977(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { - var3 >>= 8; // L: 807 - var11 >>= 8; // L: 808 - var5 <<= 2; // L: 809 - var6 <<= 2; // L: 810 - var7 <<= 2; // L: 811 - var8 <<= 2; // L: 812 - if ((var9 = var11 + var4 - var3) > var10) { // L: 813 - var9 = var10; - } - - var12.field460 += var12.field468 * (var9 - var4); // L: 814 - var4 <<= 1; // L: 815 - var9 <<= 1; // L: 816 - - byte var13; - int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { // L: 817 818 838 - var13 = var1[var3++]; // L: 819 - var10001 = var4++; // L: 820 - var2[var10001] += var13 * var5; - var5 += var7; // L: 821 - var10001 = var4++; // L: 822 - var2[var10001] += var13 * var6; - var6 += var8; // L: 823 - var13 = var1[var3++]; // L: 824 - var10001 = var4++; // L: 825 - var2[var10001] += var13 * var5; - var5 += var7; // L: 826 - var10001 = var4++; // L: 827 - var2[var10001] += var13 * var6; - var6 += var8; // L: 828 - var13 = var1[var3++]; // L: 829 - var10001 = var4++; // L: 830 - var2[var10001] += var13 * var5; - var5 += var7; // L: 831 - var10001 = var4++; // L: 832 - var2[var10001] += var13 * var6; - var6 += var8; // L: 833 - var13 = var1[var3++]; // L: 834 - var10001 = var4++; // L: 835 - var2[var10001] += var13 * var5; - var5 += var7; // L: 836 + byte var11; + for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; var10001 = var4++; - var2[var10001] += var13 * var6; // L: 837 } - for (var9 += 6; var4 < var9; var6 += var8) { // L: 840 841 846 - var13 = var1[var3++]; // L: 842 - var10001 = var4++; // L: 843 - var2[var10001] += var13 * var5; - var5 += var7; // L: 844 - var10001 = var4++; // L: 845 - var2[var10001] += var13 * var6; + for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; } - var12.field461 = var5 >> 2; // L: 848 - var12.field456 = var6 >> 2; // L: 849 - var12.field469 = var3 << 8; // L: 850 - return var4 >> 1; // L: 851 + var10.field242 = var3 << 8; + return var4 >> 1; } - @ObfuscatedName("bz") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbv;)I" + descriptor = "([B[IIIIIIILal;)I" ) - static int method978(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { - var2 >>= 8; // L: 855 - var8 >>= 8; // L: 856 - var4 <<= 2; // L: 857 - var5 <<= 2; // L: 858 - if ((var6 = var3 + var2 - (var8 - 1)) > var7) { // L: 859 - var6 = var7; + static int method655(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + var2 >>= 8; + var7 >>= 8; + var4 <<= 2; + if ((var5 = var3 + var2 - (var7 - 1)) > var6) { + var5 = var6; } - var9.field461 += var9.field467 * (var6 - var3); // L: 860 - var9.field456 += var9.field470 * (var6 - var3); // L: 861 - int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 - var10001 = var3++; // L: 864 + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { + var10001 = var3++; var1[var10001] += var0[var2--] * var4; - var4 += var5; // L: 865 - var10001 = var3++; // L: 866 + var10001 = var3++; var1[var10001] += var0[var2--] * var4; - var4 += var5; // L: 867 - var10001 = var3++; // L: 868 - var1[var10001] += var0[var2--] * var4; - var4 += var5; // L: 869 - var10001 = var3++; // L: 870 + var10001 = var3++; var1[var10001] += var0[var2--] * var4; + var10001 = var3++; } - for (var6 += 3; var3 < var6; var4 += var5) { // L: 873 874 876 - var10001 = var3++; // L: 875 - var1[var10001] += var0[var2--] * var4; + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { + var10001 = var3++; } - var9.field460 = var4 >> 2; // L: 878 - var9.field469 = var2 << 8; // L: 879 - return var3; // L: 880 + var8.field242 = var2 << 8; + return var3; } - @ObfuscatedName("bb") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbv;)I" + descriptor = "(I[B[IIIIIIIILal;)I" ) - static int method979(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { - var3 >>= 8; // L: 884 - var11 >>= 8; // L: 885 - var5 <<= 2; // L: 886 - var6 <<= 2; // L: 887 - var7 <<= 2; // L: 888 - var8 <<= 2; // L: 889 - if ((var9 = var3 + var4 - (var11 - 1)) > var10) { // L: 890 - var9 = var10; + static int method583(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + var3 >>= 8; + var9 >>= 8; + var5 <<= 2; + var6 <<= 2; + if ((var7 = var3 + var4 - (var9 - 1)) > var8) { + var7 = var8; } - var12.field460 += var12.field468 * (var9 - var4); // L: 891 - var4 <<= 1; // L: 892 - var9 <<= 1; // L: 893 + var4 <<= 1; + var7 <<= 1; + + int var10001; + byte var11; + for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + } + + for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + } + + var10.field242 = var3 << 8; + return var4 >> 1; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIILal;II)I" + ) + static int method584(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { + var7 = var8; + } byte var13; int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { // L: 894 895 915 - var13 = var1[var3--]; // L: 896 - var10001 = var4++; // L: 897 - var2[var10001] += var13 * var5; - var5 += var7; // L: 898 - var10001 = var4++; // L: 899 - var2[var10001] += var13 * var6; - var6 += var8; // L: 900 - var13 = var1[var3--]; // L: 901 - var10001 = var4++; // L: 902 - var2[var10001] += var13 * var5; - var5 += var7; // L: 903 - var10001 = var4++; // L: 904 - var2[var10001] += var13 * var6; - var6 += var8; // L: 905 - var13 = var1[var3--]; // L: 906 - var10001 = var4++; // L: 907 - var2[var10001] += var13 * var5; - var5 += var7; // L: 908 - var10001 = var4++; // L: 909 - var2[var10001] += var13 * var6; - var6 += var8; // L: 910 - var13 = var1[var3--]; // L: 911 - var10001 = var4++; // L: 912 - var2[var10001] += var13 * var5; - var5 += var7; // L: 913 - var10001 = var4++; // L: 914 - var2[var10001] += var13 * var6; + while (var5 < var7) { + var1 = var4 >> 8; + var13 = var2[var1]; + var10001 = var5++; + var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; + var4 += var11; } - for (var9 += 6; var4 < var9; var6 += var8) { // L: 917 918 923 - var13 = var1[var3--]; // L: 919 - var10001 = var4++; // L: 920 - var2[var10001] += var13 * var5; - var5 += var7; // L: 921 - var10001 = var4++; // L: 922 - var2[var10001] += var13 * var6; + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { + var7 = var8; } - var12.field461 = var5 >> 2; // L: 925 - var12.field456 = var6 >> 2; // L: 926 - var12.field469 = var3 << 8; // L: 927 - return var4 >> 1; // L: 928 + for (var1 = var12; var5 < var7; var4 += var11) { + var13 = var2[var4 >> 8]; + var10001 = var5++; + var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; + } + + var10.field242 = var4; + return var5; } - @ObfuscatedName("bv") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbv;II)I" + descriptor = "(II[B[IIIIIIIILal;II)I" ) - static int method965(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.field461 -= var11.field467 * var5; // L: 932 - var11.field456 -= var11.field470 * var5; // L: 933 - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 + static int method585(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { + var8 = var9; + } + + var5 <<= 1; + + byte var14; + int var10001; + for (var8 <<= 1; var5 < var8; var4 += var12) { + var1 = var4 >> 8; + var14 = var2[var1]; + var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14); + var10001 = var5++; + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; + var3[var10001] += var0 * var7 >> 6; + } + + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { + var8 = var9; + } + + var8 <<= 1; + + for (var1 = var13; var5 < var8; var4 += var12) { + var14 = var2[var4 >> 8]; + var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); + var10001 = var5++; + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; + var3[var10001] += var0 * var7 >> 6; + } + + var11.field242 = var4; + return var5 >> 1; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIILal;II)I" + ) + static int method586(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { + var7 = var8; + } + + int var10001; + while (var5 < var7) { + var1 = var4 >> 8; + byte var13 = var2[var1 - 1]; + var10001 = var5++; + var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; + var4 += var11; + } + + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { + var7 = var8; + } + + var0 = var12; + + for (var1 = var11; var5 < var7; var4 += var1) { + var10001 = var5++; + var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; + } + + var10.field242 = var4; + return var5; + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILal;II)I" + ) + static int method587(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { + var8 = var9; + } + + var5 <<= 1; + + int var10001; + for (var8 <<= 1; var5 < var8; var4 += var12) { + var1 = var4 >> 8; + byte var14 = var2[var1 - 1]; + var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8); + var10001 = var5++; + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; + var3[var10001] += var0 * var7 >> 6; + } + + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { + var8 = var9; + } + + var8 <<= 1; + + for (var1 = var13; var5 < var8; var4 += var12) { + var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); + var10001 = var5++; + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; + var3[var10001] += var0 * var7 >> 6; + } + + var11.field242 = var4; + return var5 >> 1; + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIIILal;)I" + ) + static int method588(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + var2 >>= 8; + var8 >>= 8; + var4 <<= 2; + var5 <<= 2; + if ((var6 = var3 + var8 - var2) > var7) { + var6 = var7; + } + + var9.field247 += var9.field248 * (var6 - var3); + var9.field241 += var9.field249 * (var6 - var3); + + int var10001; + for (var6 -= 3; var3 < var6; var4 += var5) { + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + var4 += var5; + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + var4 += var5; + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + var4 += var5; + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + } + + for (var6 += 3; var3 < var6; var4 += var5) { + var10001 = var3++; + var1[var10001] += var0[var2++] * var4; + } + + var9.field239 = var4 >> 2; + var9.field242 = var2 << 8; + return var3; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIIIILal;)I" + ) + static int method589(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + var3 >>= 8; + var11 >>= 8; + var5 <<= 2; + var6 <<= 2; + var7 <<= 2; + var8 <<= 2; + if ((var9 = var11 + var4 - var3) > var10) { + var9 = var10; + } + + var12.field239 += var12.field243 * (var9 - var4); + var4 <<= 1; + var9 <<= 1; + + byte var13; + int var10001; + for (var9 -= 6; var4 < var9; var6 += var8) { + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + } + + for (var9 += 6; var4 < var9; var6 += var8) { + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + } + + var12.field247 = var5 >> 2; + var12.field241 = var6 >> 2; + var12.field242 = var3 << 8; + return var4 >> 1; + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIIILal;)I" + ) + static int method590(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + var2 >>= 8; + var8 >>= 8; + var4 <<= 2; + var5 <<= 2; + if ((var6 = var3 + var2 - (var8 - 1)) > var7) { + var6 = var7; + } + + var9.field247 += var9.field248 * (var6 - var3); + var9.field241 += var9.field249 * (var6 - var3); + + int var10001; + for (var6 -= 3; var3 < var6; var4 += var5) { + var10001 = var3++; + var1[var10001] += var0[var2--] * var4; + var4 += var5; + var10001 = var3++; + var1[var10001] += var0[var2--] * var4; + var4 += var5; + var10001 = var3++; + var1[var10001] += var0[var2--] * var4; + var4 += var5; + var10001 = var3++; + var1[var10001] += var0[var2--] * var4; + } + + for (var6 += 3; var3 < var6; var4 += var5) { + var10001 = var3++; + var1[var10001] += var0[var2--] * var4; + } + + var9.field239 = var4 >> 2; + var9.field242 = var2 << 8; + return var3; + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIIIILal;)I" + ) + static int method591(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + var3 >>= 8; + var11 >>= 8; + var5 <<= 2; + var6 <<= 2; + var7 <<= 2; + var8 <<= 2; + if ((var9 = var3 + var4 - (var11 - 1)) > var10) { + var9 = var10; + } + + var12.field239 += var12.field243 * (var9 - var4); + var4 <<= 1; + var9 <<= 1; + + byte var13; + int var10001; + for (var9 -= 6; var4 < var9; var6 += var8) { + var13 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + } + + for (var9 += 6; var4 < var9; var6 += var8) { + var13 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + } + + var12.field247 = var5 >> 2; + var12.field241 = var6 >> 2; + var12.field242 = var3 << 8; + return var4 >> 1; + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILal;II)I" + ) + static int method592(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.field247 -= var11.field248 * var5; + var11.field241 -= var11.field249 * var5; + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } byte var14; int var10001; - while (var5 < var8) { // L: 935 - var1 = var4 >> 8; // L: 936 - var14 = var2[var1]; // L: 937 + while (var5 < var8) { + var1 = var4 >> 8; + var14 = var2[var1]; var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; // L: 938 - var6 += var7; // L: 939 - var4 += var12; // L: 940 + var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; + var6 += var7; + var4 += var12; } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 942 + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { var8 = var9; } - for (var1 = var13; var5 < var8; var4 += var12) { // L: 943 944 948 - var14 = var2[var4 >> 8]; // L: 945 - var10001 = var5++; // L: 946 + for (var1 = var13; var5 < var8; var4 += var12) { + var14 = var2[var4 >> 8]; + var10001 = var5++; var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; // L: 947 + var6 += var7; } - var11.field461 += var11.field467 * var5; // L: 950 - var11.field456 += var11.field470 * var5; // L: 951 - var11.field460 = var6; // L: 952 - var11.field469 = var4; // L: 953 - return var5; // L: 954 + var11.field247 += var11.field248 * var5; + var11.field241 += var11.field249 * var5; + var11.field239 = var6; + var11.field242 = var4; + return var5; } - @ObfuscatedName("bc") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbv;II)I" + descriptor = "(II[B[IIIIIIIIIILal;II)I" ) - static int method981(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.field460 -= var5 * var13.field468; // L: 958 - if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 + static int method593(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.field239 -= var5 * var13.field243; + if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } - var5 <<= 1; // L: 960 + var5 <<= 1; byte var16; int var10001; - for (var10 <<= 1; var5 < var10; var4 += var14) { // L: 961 962 970 - var1 = var4 >> 8; // L: 963 - var16 = var2[var1]; // L: 964 - var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); // L: 965 - var10001 = var5++; // L: 966 - var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 967 - var10001 = var5++; // L: 968 - var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 969 - } - - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { // L: 972 - var10 = var11; - } - - var10 <<= 1; // L: 973 - - for (var1 = var15; var5 < var10; var4 += var14) { // L: 974 975 982 - var16 = var2[var4 >> 8]; // L: 976 - var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); // L: 977 - var10001 = var5++; // L: 978 - var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 979 - var10001 = var5++; // L: 980 - var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 981 - } - - var5 >>= 1; // L: 984 - var13.field460 += var13.field468 * var5; // L: 985 - var13.field461 = var6; // L: 986 - var13.field456 = var7; // L: 987 - var13.field469 = var4; // L: 988 - return var5; // L: 989 - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbv;II)I" - ) - static int method982(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.field461 -= var11.field467 * var5; // L: 993 - var11.field456 -= var11.field470 * var5; // L: 994 - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 - var8 = var9; - } - - int var10001; - while (var5 < var8) { // L: 996 - var1 = var4 >> 8; // L: 997 - byte var14 = var2[var1 - 1]; // L: 998 + for (var10 <<= 1; var5 < var10; var4 += var14) { + var1 = var4 >> 8; + var16 = var2[var1]; + var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; // L: 999 - var6 += var7; // L: 1000 - var4 += var12; // L: 1001 + var3[var10001] += var0 * var6 >> 6; + var6 += var8; + var10001 = var5++; + var3[var10001] += var0 * var7 >> 6; + var7 += var9; } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { // L: 1003 + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { + var10 = var11; + } + + var10 <<= 1; + + for (var1 = var15; var5 < var10; var4 += var14) { + var16 = var2[var4 >> 8]; + var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); + var10001 = var5++; + var3[var10001] += var0 * var6 >> 6; + var6 += var8; + var10001 = var5++; + var3[var10001] += var0 * var7 >> 6; + var7 += var9; + } + + var5 >>= 1; + var13.field239 += var13.field243 * var5; + var13.field247 = var6; + var13.field241 = var7; + var13.field242 = var4; + return var5; + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILal;II)I" + ) + static int method594(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.field247 -= var11.field248 * var5; + var11.field241 -= var11.field249 * var5; + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } - var0 = var13; // L: 1004 - - for (var1 = var12; var5 < var8; var4 += var1) { // L: 1005 1006 1009 - var10001 = var5++; // L: 1007 - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; - var6 += var7; // L: 1008 + int var10001; + while (var5 < var8) { + var1 = var4 >> 8; + byte var14 = var2[var1 - 1]; + var10001 = var5++; + var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; + var6 += var7; + var4 += var12; } - var11.field461 += var11.field467 * var5; // L: 1011 - var11.field456 += var11.field470 * var5; // L: 1012 - var11.field460 = var6; // L: 1013 - var11.field469 = var4; // L: 1014 - return var5; // L: 1015 + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { + var8 = var9; + } + + var0 = var13; + + for (var1 = var12; var5 < var8; var4 += var1) { + var10001 = var5++; + var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; + var6 += var7; + } + + var11.field247 += var11.field248 * var5; + var11.field241 += var11.field249 * var5; + var11.field239 = var6; + var11.field242 = var4; + return var5; } - @ObfuscatedName("ba") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbv;II)I" + descriptor = "(II[B[IIIIIIIIIILal;II)I" ) - static int method983(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.field460 -= var5 * var13.field468; // L: 1019 - if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 + static int method553(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.field239 -= var5 * var13.field243; + if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } - var5 <<= 1; // L: 1021 + var5 <<= 1; int var10001; - for (var10 <<= 1; var5 < var10; var4 += var14) { // L: 1022 1023 1031 - var1 = var4 >> 8; // L: 1024 - byte var16 = var2[var1 - 1]; // L: 1025 - var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8); // L: 1026 - var10001 = var5++; // L: 1027 + for (var10 <<= 1; var5 < var10; var4 += var14) { + var1 = var4 >> 8; + byte var16 = var2[var1 - 1]; + var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 1028 - var10001 = var5++; // L: 1029 + var6 += var8; + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 1030 + var7 += var9; } - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { // L: 1033 + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { var10 = var11; } - var10 <<= 1; // L: 1034 + var10 <<= 1; - for (var1 = var15; var5 < var10; var4 += var14) { // L: 1035 1036 1042 - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); // L: 1037 - var10001 = var5++; // L: 1038 + for (var1 = var15; var5 < var10; var4 += var14) { + var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 1039 - var10001 = var5++; // L: 1040 + var6 += var8; + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 1041 + var7 += var9; } - var5 >>= 1; // L: 1044 - var13.field460 += var13.field468 * var5; // L: 1045 - var13.field461 = var6; // L: 1046 - var13.field456 = var7; // L: 1047 - var13.field469 = var4; // L: 1048 - return var5; // L: 1049 + var5 >>= 1; + var13.field239 += var13.field243 * var5; + var13.field247 = var6; + var13.field241 = var7; + var13.field242 = var4; + return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index cbce23717f..b020a62e78 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,57 +3,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("z") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("samples") public byte[] samples; @ObfuscatedName("v") @Export("start") public int start; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("end") int end; - @ObfuscatedName("j") - public boolean field380; + @ObfuscatedName("l") + public boolean field167; RawSound(int var1, byte[] var2, int var3, int var4) { - this.sampleRate = var1; // L: 13 - this.samples = var2; // L: 14 - this.start = var3; // L: 15 - this.end = var4; // L: 16 - } // L: 17 + this.sampleRate = var1; + this.samples = var2; + this.start = var3; + this.end = var4; + } RawSound(int var1, byte[] var2, int var3, int var4, boolean var5) { - this.sampleRate = var1; // L: 20 - this.samples = var2; // L: 21 - this.start = var3; // L: 22 - this.end = var4; // L: 23 - this.field380 = var5; // L: 24 - } // L: 25 + this.sampleRate = var1; + this.samples = var2; + this.start = var3; + this.end = var4; + this.field167 = var5; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lbt;)Lar;" + descriptor = "(Lao;)Lz;" ) @Export("resample") public RawSound resample(Decimator var1) { - this.samples = var1.resample(this.samples); // L: 28 - this.sampleRate = var1.scaleRate(this.sampleRate); // L: 29 - if (this.start == this.end) { // L: 30 + this.samples = var1.resample(this.samples); + this.sampleRate = var1.scaleRate(this.sampleRate); + if (this.start == this.end) { this.start = this.end = var1.scalePosition(this.start); } else { - this.start = var1.scalePosition(this.start); // L: 32 - this.end = var1.scalePosition(this.end); // L: 33 - if (this.start == this.end) { // L: 34 + this.start = var1.scalePosition(this.start); + this.end = var1.scalePosition(this.end); + if (this.start == this.end) { --this.start; } } - return this; // L: 36 + return this; } } diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index a2221a17f3..b048de3937 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -6,108 +6,131 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("af") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1718223303 - ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; - @ObfuscatedName("f") - @Export("intReplaceValues") - int[] intReplaceValues; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1554436787 + intValue = 445083465 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1579568443 + intValue = -580526265 ) @Export("size") int size; - @ObfuscatedName("y") + @ObfuscatedName("v") @Export("operations") int[] operations; @ObfuscatedName("j") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("fields") Field[] fields; - @ObfuscatedName("m") - @Export("arguments") - byte[][][] arguments; - @ObfuscatedName("r") + @ObfuscatedName("n") + @Export("intReplaceValues") + int[] intReplaceValues; + @ObfuscatedName("w") @Export("methods") Method[] methods; + @ObfuscatedName("f") + @Export("arguments") + byte[][][] arguments; ReflectionCheck() { - } // L: 17 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)Ljs;", - garbageValue = "1563707266" - ) - public static GameBuild method1228(int var0) { - GameBuild[] var1 = UserComparator8.method2538(); // L: 23 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24 - GameBuild var3 = var1[var2]; // L: 25 - if (var0 == var3.buildId) { - return var3; // L: 27 - } - } - - return null; // L: 31 } - @ObfuscatedName("o") + @ObfuscatedName("gb") @ObfuscatedSignature( - descriptor = "(Lbk;Lbk;IZIZB)I", - garbageValue = "88" + descriptor = "(Lbx;I)V", + garbageValue = "152789303" ) - static int method1227(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = WorldMapRectangle.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 = WorldMapRectangle.compareWorlds(var0, var1, var4, var5); // L: 205 - return var5 ? -var7 : var7; // L: 206 + static final void method848(Actor var0) { + if (var0.field1074 != 0) { + if (var0.targetIndex != -1) { + Object var1 = null; + if (var0.targetIndex < 32768) { + var1 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { + var1 = Client.players[var0.targetIndex - 32768]; + } + + if (var1 != null) { + int var2 = var0.x - ((Actor)var1).x; + int var3 = var0.y - ((Actor)var1).y; + if (var2 != 0 || var3 != 0) { + var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; + } + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + } + + if (var0.field1048 != -1 && (var0.pathLength == 0 || var0.field1078 > 0)) { + var0.orientation = var0.field1048; + var0.field1048 = -1; + } + + int var4 = var0.orientation - var0.rotation & 2047; + if (var4 == 0 && var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + if (var4 != 0) { + ++var0.field1072; + boolean var6; + if (var4 > 1024) { + var0.rotation -= var0.field1074; + var6 = true; + if (var4 < var0.field1074 || var4 > 2048 - var0.field1074) { + var0.rotation = var0.orientation; + var6 = false; + } + + if (var0.movementSequence == var0.idleSequence && (var0.field1072 > 25 || var6)) { + if (var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } else { + var0.rotation += var0.field1074; + var6 = true; + if (var4 < var0.field1074 || var4 > 2048 - var0.field1074) { + var0.rotation = var0.orientation; + var6 = false; + } + + if (var0.idleSequence == var0.movementSequence && (var0.field1072 > 25 || var6)) { + if (var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } + + var0.rotation &= 2047; + } else { + var0.field1072 = 0; + } + } } - @ObfuscatedName("fk") + @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "111" + descriptor = "(I)Z", + garbageValue = "1463309122" ) - static void method1230(int var0, int var1) { - if (class4.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3795 - class105.method2357(class160.archive11, var0, 0, class4.clientPreferences.musicVolume, false); // L: 3796 - Client.field862 = true; // L: 3797 - } - - } // L: 3799 - - @ObfuscatedName("il") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "0" - ) - static final void method1229(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7766 - if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 7767 - Client.field712[var4] = true; - } - } - - } // L: 7769 + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; + } } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index e855aef683..50ad996fda 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -1,44 +1,34 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gr") +@ObfuscatedName("gy") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("ju") - @ObfuscatedSignature( - descriptor = "Lgj;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("ct") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -1816711147 + intValue = -1128111775 ) @Export("height") public int height; protected Renderable() { - this.height = 1000; // L: 6 - } // L: 8 + this.height = 1000; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lgd;", - garbageValue = "326918784" + descriptor = "(I)Lgl;", + garbageValue = "1291603774" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("bh") + @ObfuscatedName("cd") @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(); @@ -49,330 +39,292 @@ public abstract class Renderable extends DualNode { } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", - garbageValue = "1767289693" + descriptor = "(Lnu;II)V", + garbageValue = "-728254783" ) - public static File method4244(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; // L: 40 - SecureRandomCallable.JagexCache_locationFile = new File(JagexCache.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 41 - String var4 = null; // L: 42 - String var5 = null; // L: 43 - boolean var6 = false; // L: 44 - Buffer var8; - int var11; - File var27; - if (SecureRandomCallable.JagexCache_locationFile.exists()) { // L: 45 - try { - AccessFile var7 = new AccessFile(SecureRandomCallable.JagexCache_locationFile, "rw", 10000L); // L: 48 + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; + if (var2) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.field1003 = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (GrandExchangeOfferNameComparator.baseX + var4.pathX[0] >> 13 << 14) + (NPC.baseY + var4.pathY[0] >> 13); + if (var4.field1048 != -1) { + Players.Players_orientations[var1] = var4.field1048; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + class102.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + --var6; + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { + ++var6; + ++var7; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field1003 = false; + } else if (var2) { + var4.field1003 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field1003 = false; + var4.method1829(var6, var7, Players.field1170[var1]); + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field1003 = false; + } else if (var2) { + var4.field1003 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field1003 = false; + var4.method1829(var6, var7, Players.field1170[var1]); + } + + } else { + var5 = var0.readBits(1); + int var8; int var9; - for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 49 50 53 - var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); // L: 51 - if (var9 == -1) { // L: 52 - throw new IOException(); + int var10; + int var11; + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { + var8 -= 32; } - } - var8.offset = 0; // L: 55 - var9 = var8.readUnsignedByte(); // L: 56 - if (var9 < 1 || var9 > 3) { // L: 57 - throw new IOException("" + var9); - } - - int var10 = 0; // L: 58 - if (var9 > 1) { // L: 59 - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { // L: 60 - var4 = var8.readStringCp1252NullCircumfixed(); // L: 61 - if (var10 == 1) { // L: 62 - var5 = var8.readStringCp1252NullCircumfixed(); + var9 = var6 & 31; + if (var9 > 15) { + var9 -= 32; } + + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field1003 = false; + } else if (var2) { + var4.field1003 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field1003 = false; + var4.method1829(var10, var11, Players.field1170[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + GrandExchangeEvent.Client_plane = var4.plane; + } + } else { - var4 = var8.readCESU8(); // L: 65 - if (var10 == 1) { // L: 66 - var5 = var8.readCESU8(); + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (var8 + GrandExchangeOfferNameComparator.baseX + var4.pathX[0] & 16383) - GrandExchangeOfferNameComparator.baseX; + var11 = (var9 + NPC.baseY + var4.pathY[0] & 16383) - NPC.baseY; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field1003 = false; + } else if (var2) { + var4.field1003 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field1003 = false; + var4.method1829(var10, var11, Players.field1170[var1]); } - } - var7.close(); // L: 68 - } catch (IOException var25) { // L: 70 - var25.printStackTrace(); // L: 71 - } - - if (var4 != null) { // L: 73 - var27 = new File(var4); // L: 74 - if (!var27.exists()) { // L: 75 - var4 = null; // L: 76 - } - } - - if (var4 != null) { // L: 79 - var27 = new File(var4, "test.dat"); // L: 80 - - boolean var28; - try { - RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); // L: 84 - var11 = var15.read(); // L: 85 - var15.seek(0L); // L: 86 - var15.write(var11); // L: 87 - var15.seek(0L); // L: 88 - var15.close(); // L: 89 - var27.delete(); // L: 90 - var28 = true; // L: 91 - } catch (Exception var23) { // L: 93 - var28 = false; // L: 94 - } - - if (!var28) { // L: 97 - var4 = null; // L: 98 - } - } - } - - if (var4 == null && var2 == 0) { // L: 102 - label153: - for (int var16 = 0; var16 < JagexCache.cacheSubPaths.length; ++var16) { // L: 103 - for (int var17 = 0; var17 < ArchiveLoader.cacheParentPaths.length; ++var17) { // L: 104 - File var18 = new File(ArchiveLoader.cacheParentPaths[var17] + JagexCache.cacheSubPaths[var16] + File.separatorChar + var0 + File.separatorChar); // L: 105 - if (var18.exists()) { // L: 106 - File var19 = new File(var18, "test.dat"); // L: 108 - - boolean var29; - try { - RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); // L: 111 - int var13 = var12.read(); // L: 112 - var12.seek(0L); // L: 113 - var12.write(var13); // L: 114 - var12.seek(0L); // L: 115 - var12.close(); // L: 116 - var19.delete(); // L: 117 - var29 = true; // L: 118 - } catch (Exception var22) { // L: 120 - var29 = false; // L: 121 - } - - if (var29) { // L: 124 - var4 = var18.toString(); // L: 125 - var6 = true; // L: 126 - break label153; // L: 127 - } + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + GrandExchangeEvent.Client_plane = var4.plane; } + } } } - - if (var4 == null) { // L: 133 - var4 = JagexCache.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 134 - var6 = true; // L: 135 - } - - File var26; - if (var5 != null) { // L: 137 - var26 = new File(var5); // L: 138 - var27 = new File(var4); // L: 139 - - try { - File[] var33 = var26.listFiles(); // L: 141 - File[] var31 = var33; // L: 143 - - for (var11 = 0; var11 < var31.length; ++var11) { // L: 144 - File var30 = var31[var11]; // L: 145 - File var20 = new File(var27, var30.getName()); // L: 147 - boolean var14 = var30.renameTo(var20); // L: 148 - if (!var14) { // L: 149 - throw new IOException(); - } - } - } catch (Exception var24) { // L: 154 - var24.printStackTrace(); // L: 155 - } - - var6 = true; // L: 157 - } - - if (var6) { // L: 159 - var26 = new File(var4); // L: 160 - var8 = null; // L: 161 - - try { - AccessFile var34 = new AccessFile(SecureRandomCallable.JagexCache_locationFile, "rw", 10000L); // L: 165 - Buffer var32 = new Buffer(500); // L: 166 - var32.writeByte(3); // L: 167 - var32.writeByte(var8 != null ? 1 : 0); // L: 168 - var32.writeCESU8(var26.getPath()); // L: 169 - if (var8 != null) { // L: 170 - var32.writeCESU8(""); - } - - var34.write(var32.array, 0, var32.offset); // L: 171 - var34.close(); // L: 172 - } catch (IOException var21) { // L: 174 - var21.printStackTrace(); // L: 175 - } - } - - return new File(var4); // L: 179 } - @ObfuscatedName("f") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-768574216" + descriptor = "(IIIIIIII)V", + garbageValue = "-1817234" ) - public static String method4251(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != GrandExchangeEvent.Client_plane) { + return; + } - 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 = class125.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 - } + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (var1 == 0) { + var7 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0, var2, var3); + } - var6 = var5 & 15; // L: 23 - if (var6 >= 10) { // L: 24 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); + if (var1 == 1) { + var7 = WorldMapIcon_1.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var7 = WorldMapIcon_1.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var7 = WorldMapIcon_1.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { + var12 = WorldMapIcon_1.scene.getObjectFlags(var0, var2, var3, var7); + int var14 = class78.Entity_unpackID(var7); + int var15 = var12 & 31; + int var16 = var12 >> 6 & 3; + ObjectComposition var13; + if (var1 == 0) { + WorldMapIcon_1.scene.removeBoundaryObject(var0, var2, var3); + var13 = ClanChannel.getObjectDefinition(var14); + if (var13.interactType != 0) { + Client.collisionMaps[var0].method3176(var2, var3, var15, var16, var13.boolean1); } } - } else { - var2.append(var4); // L: 25 - } - } - return var2.toString(); // L: 28 - } + if (var1 == 1) { + WorldMapIcon_1.scene.removeWallDecoration(var0, var2, var3); + } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-2101430297" - ) - static int method4250(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 1017 - var0 -= 1000; // L: 1018 - var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1019 - } else { - var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1021 - } + if (var1 == 2) { + WorldMapIcon_1.scene.removeGameObject(var0, var2, var3); + var13 = ClanChannel.getObjectDefinition(var14); + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { + return; + } - String var4 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1022 - int[] var5 = null; // L: 1023 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1024 - int var6 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1025 - if (var6 > 0) { // L: 1026 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]) { // L: 1027 1028 + if (var13.interactType != 0) { + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); + } + } + + if (var1 == 3) { + WorldMapIcon_1.scene.removeFloorDecoration(var0, var2, var3); + var13 = ClanChannel.getObjectDefinition(var14); + if (var13.interactType == 1) { + Client.collisionMaps[var0].method3200(var2, var3); + } } } - var4 = var4.substring(0, var4.length() - 1); // L: 1030 - } + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var12 = var0 + 1; + } - Object[] var8 = new Object[var4.length() + 1]; // L: 1032 - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1033 - if (var4.charAt(var7 - 1) == 's') { // L: 1034 - var8[var7] = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1035 + Canvas.method120(var0, var12, var2, var3, var4, var5, var6, WorldMapIcon_1.scene, Client.collisionMaps[var0]); } } - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1037 - if (var7 != -1) { // L: 1038 - var8[0] = new Integer(var7); - } else { - var8 = null; // L: 1039 - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 1040 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1041 - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1042 - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1043 - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1044 - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1045 - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1046 - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1047 - var3.onVarTransmit = var8; // L: 1048 - var3.varTransmitTriggers = var5; // L: 1049 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1051 - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1052 - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1053 - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1054 - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1055 - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1056 - var3.onInvTransmit = var8; // L: 1057 - var3.invTransmitTriggers = var5; // L: 1058 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1060 - var3.onStatTransmit = var8; // L: 1061 - var3.statTransmitTriggers = var5; // L: 1062 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1064 - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1065 - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1066 - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1067 - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1068 - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1069 - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1070 - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1071 - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1072 - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1073 - var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1074 - var3.field3082 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1075 - var3.onResize = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1076 - var3.field3075 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1077 - var3.field3076 = var8; - } else if (var0 == 1430) { - var3.field3071 = var8; // L: 1078 - } else { - if (var0 != 1431) { // L: 1079 - return 2; // L: 1080 - } - - var3.field3000 = var8; - } - - var3.hasListener = true; // L: 1081 - return 1; // L: 1082 } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 890873906c..12cb126fac 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,89 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fg") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("gt") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1174607755 - ) - static int field1919; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -2064726811 + intValue = -974244269 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -801377261 + intValue = 755634313 ) @Export("approxDestinationY") public int approxDestinationY; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1579448573 + intValue = 2083846945 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1110365195 + intValue = -1000276989 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { - } // L: 9 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIILfl;B)Z", - garbageValue = "11" + descriptor = "(IIILfy;I)Z", + garbageValue = "-1237332144" ) @Export("hasArrived") - public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "87" - ) - public static boolean method3252() { - try { - if (class233.musicPlayerStatus == 2) { // L: 104 - if (ArchiveLoader.musicTrack == null) { // L: 105 - ArchiveLoader.musicTrack = MusicTrack.readTrack(InvDefinition.musicTrackArchive, class233.musicTrackGroupId, class233.musicTrackFileId); // L: 106 - if (ArchiveLoader.musicTrack == null) { // L: 107 - return false; - } - } - - if (class215.soundCache == null) { // L: 109 - class215.soundCache = new SoundCache(class230.soundEffectsArchive, class233.musicSamplesArchive); - } - - if (class233.midiPcmStream.loadMusicTrack(ArchiveLoader.musicTrack, class233.musicPatchesArchive, class215.soundCache, 22050)) { // L: 110 - class233.midiPcmStream.clearAll(); // L: 111 - class233.midiPcmStream.setPcmStreamVolume(class233.musicTrackVolume); // L: 112 - class233.midiPcmStream.setMusicTrack(ArchiveLoader.musicTrack, GrandExchangeOfferUnitPriceComparator.musicTrackBoolean); // L: 113 - class233.musicPlayerStatus = 0; // L: 114 - ArchiveLoader.musicTrack = null; // L: 115 - class215.soundCache = null; // L: 116 - InvDefinition.musicTrackArchive = null; // L: 117 - return true; // L: 118 - } - } - } catch (Exception var1) { // L: 122 - var1.printStackTrace(); // L: 123 - class233.midiPcmStream.clear(); // L: 124 - class233.musicPlayerStatus = 0; // L: 125 - ArchiveLoader.musicTrack = null; // L: 126 - class215.soundCache = null; // L: 127 - InvDefinition.musicTrackArchive = null; // L: 128 - } - - return false; // L: 130 - } + protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 007f6115e1..98ef0aa55c 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,27 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("oc") +@ObfuscatedName("oa") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("RunException_applet") public static Applet RunException_applet; @ObfuscatedName("v") + @Export("localPlayerName") + public static String localPlayerName; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1440253205 + intValue = 655178051 ) @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("j") + @ObfuscatedName("n") @Export("message") String message; - @ObfuscatedName("o") + @ObfuscatedName("w") @Export("throwable") Throwable throwable; RunException(Throwable var1, String var2) { - this.message = var2; // L: 27 - this.throwable = var1; // L: 28 - } // L: 29 + this.message = var2; + this.throwable = var1; + } } diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index bb06d0a445..b6686d900e 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,82 +3,82 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gw") @Implements("Scene") public class Scene { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("l") + @ObfuscatedName("d") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lhh;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("ab") + @ObfuscatedName("au") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("aq") + @ObfuscatedName("av") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ae") + @ObfuscatedName("as") @Export("Scene_selectedY") public static int Scene_selectedY; @ObfuscatedName("ao") @@ -87,872 +87,872 @@ public class Scene { @ObfuscatedName("aj") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "[[Lgc;" + descriptor = "[[Lgv;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "[Lgc;" + descriptor = "[Lgv;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("am") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("aa") - static final int[] field2336; + @ObfuscatedName("ah") + static final int[] field2324; + @ObfuscatedName("ag") + static final int[] field2325; @ObfuscatedName("ai") - static final int[] field2314; - @ObfuscatedName("av") + static final int[] field2328; + @ObfuscatedName("ad") static final int[] field2338; - @ObfuscatedName("ax") - static final int[] field2339; - @ObfuscatedName("ar") - static final int[] field2340; - @ObfuscatedName("af") - static final int[] field2295; - @ObfuscatedName("bq") - static final int[] field2342; - @ObfuscatedName("be") + @ObfuscatedName("ac") + static final int[] field2294; + @ObfuscatedName("aw") + static final int[] field2327; + @ObfuscatedName("bt") + static final int[] field2278; + @ObfuscatedName("bg") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("ba") + @ObfuscatedName("bw") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("br") + @ObfuscatedName("bm") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("by") + @ObfuscatedName("bu") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bg") + @ObfuscatedName("bj") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("planes") int planes; @ObfuscatedName("v") @Export("xSize") int xSize; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("ySize") int ySize; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[[Lgf;" + descriptor = "[[[Lgq;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("minPlane") int minPlane; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lhh;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("d") - int[][][] field2299; - @ObfuscatedName("bv") + @ObfuscatedName("x") + int[][][] field2295; + @ObfuscatedName("bf") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @Export("tileRotation2D") int[][] tileRotation2D; static { - Scene_isLowDetail = true; // L: 8 - tileUpdateCount = 0; // L: 22 - Scene_plane = 0; // L: 23 - gameObjects = new GameObject[100]; // L: 38 - checkClick = false; // L: 39 - Scene_selectedPlane = 0; // L: 40 - Scene_selectedScreenX = 0; // L: 41 - Scene_selectedScreenY = 0; // L: 42 - Scene_selectedX = -1; // L: 43 - Scene_selectedY = -1; // L: 44 - viewportWalking = false; // L: 45 - Scene_planesCount = 4; // L: 48 - Scene_planeOccluderCounts = new int[Scene_planesCount]; // L: 49 - Scene_planeOccluders = new Occluder[Scene_planesCount][500]; // L: 50 - Scene_currentOccludersCount = 0; // L: 51 - Scene_currentOccluders = new Occluder[500]; // L: 52 - Scene_tilesDeque = new NodeDeque(); // L: 53 - field2336 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field2314 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field2338 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field2339 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field2340 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field2295 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field2342 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 - visibilityMap = new boolean[8][32][51][51]; // L: 86 + Scene_isLowDetail = true; + tileUpdateCount = 0; + Scene_plane = 0; + gameObjects = new GameObject[100]; + checkClick = false; + Scene_selectedPlane = 0; + Scene_selectedScreenX = 0; + Scene_selectedScreenY = 0; + Scene_selectedX = -1; + Scene_selectedY = -1; + viewportWalking = false; + Scene_planesCount = 4; + Scene_planeOccluderCounts = new int[Scene_planesCount]; + Scene_planeOccluders = new Occluder[Scene_planesCount][500]; + Scene_currentOccludersCount = 0; + Scene_currentOccluders = new Occluder[500]; + Scene_tilesDeque = new NodeDeque(); + field2324 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field2325 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field2328 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field2338 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field2294 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field2327 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field2278 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + visibilityMap = new boolean[8][32][51][51]; } public Scene(int var1, int var2, int var3, int[][][] var4) { - this.minPlane = 0; // L: 14 - this.tempGameObjectsCount = 0; // L: 15 - this.tempGameObjects = new GameObject[5000]; // L: 16 - this.tileShape2D = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; // L: 65 - this.tileRotation2D = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; // L: 80 - this.planes = var1; // L: 96 - this.xSize = var2; // L: 97 - this.ySize = var3; // L: 98 - this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field2299 = new int[var1][var2 + 1][var3 + 1]; // L: 100 - this.tileHeights = var4; // L: 101 - this.clear(); // L: 102 - } // L: 103 + this.minPlane = 0; + this.tempGameObjectsCount = 0; + this.tempGameObjects = new GameObject[5000]; + this.tileShape2D = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; + this.tileRotation2D = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; + this.planes = var1; + this.xSize = var2; + this.ySize = var3; + this.tiles = new Tile[var1][var2][var3]; + this.field2295 = new int[var1][var2 + 1][var3 + 1]; + this.tileHeights = var4; + this.clear(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("clear") public void clear() { int var1; int var2; - for (var1 = 0; var1 < this.planes; ++var1) { // L: 106 - for (var2 = 0; var2 < this.xSize; ++var2) { // L: 107 - for (int var3 = 0; var3 < this.ySize; ++var3) { // L: 108 + for (var1 = 0; var1 < this.planes; ++var1) { + for (var2 = 0; var2 < this.xSize; ++var2) { + for (int var3 = 0; var3 < this.ySize; ++var3) { this.tiles[var1][var2][var3] = null; } } } - for (var1 = 0; var1 < Scene_planesCount; ++var1) { // L: 111 - for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { // L: 112 + for (var1 = 0; var1 < Scene_planesCount; ++var1) { + for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { Scene_planeOccluders[var1][var2] = null; } - Scene_planeOccluderCounts[var1] = 0; // L: 113 + Scene_planeOccluderCounts[var1] = 0; } - for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 115 - this.tempGameObjects[var1] = null; // L: 116 + for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { + this.tempGameObjects[var1] = null; } - this.tempGameObjectsCount = 0; // L: 118 + this.tempGameObjectsCount = 0; - for (var1 = 0; var1 < gameObjects.length; ++var1) { // L: 119 + for (var1 = 0; var1 < gameObjects.length; ++var1) { gameObjects[var1] = null; } - } // L: 120 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("init") public void init(int var1) { - this.minPlane = var1; // L: 123 + this.minPlane = var1; - for (int var2 = 0; var2 < this.xSize; ++var2) { // L: 124 - for (int var3 = 0; var3 < this.ySize; ++var3) { // L: 125 - if (this.tiles[var1][var2][var3] == null) { // L: 126 + for (int var2 = 0; var2 < this.xSize; ++var2) { + for (int var3 = 0; var3 < this.ySize; ++var3) { + if (this.tiles[var1][var2][var3] == null) { this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } } } - } // L: 129 + } @ObfuscatedName("v") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { - Tile var3 = this.tiles[0][var1][var2]; // L: 132 + Tile var3 = this.tiles[0][var1][var2]; - for (int var4 = 0; var4 < 3; ++var4) { // L: 133 - Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; // L: 134 - if (var5 != null) { // L: 135 - --var5.plane; // L: 136 + for (int var4 = 0; var4 < 3; ++var4) { + Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; + if (var5 != null) { + --var5.plane; - for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 - GameObject var7 = var5.gameObjects[var6]; // L: 138 - if (FileSystem.method2644(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 + for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { + GameObject var7 = var5.gameObjects[var6]; + if (Frames.method4174(var7.tag) && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 143 + if (this.tiles[0][var1][var2] == null) { this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144 - this.tiles[3][var1][var2] = null; // L: 145 - } // L: 146 + this.tiles[0][var1][var2].linkedBelowTile = var3; + this.tiles[3][var1][var2] = null; + } - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 165 - if (var5 != null) { // L: 166 - this.tiles[var1][var2][var3].minPlane = var4; // L: 167 + Tile var5 = this.tiles[var1][var2][var3]; + if (var5 != null) { + this.tiles[var1][var2][var3].minPlane = var4; } - } // L: 168 + } - @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: 171 - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172 + if (var4 == 0) { + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); - for (var22 = var1; var22 >= 0; --var22) { // L: 173 + for (var22 = var1; var22 >= 0; --var22) { 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: 174 - } else if (var4 != 1) { // L: 177 - SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183 + this.tiles[var1][var2][var3].paint = var21; + } else if (var4 != 1) { + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); - for (var22 = var1; var22 >= 0; --var22) { // L: 184 + for (var22 = var1; var22 >= 0; --var22) { 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: 185 + this.tiles[var1][var2][var3].model = var23; } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178 + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); - for (var22 = var1; var22 >= 0; --var22) { // L: 179 + for (var22 = var1; var22 >= 0; --var22) { 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: 180 + this.tiles[var1][var2][var3].paint = var21; } - } // L: 175 181 186 + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIILgr;JI)V" + descriptor = "(IIIILgy;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: 189 - FloorDecoration var9 = new FloorDecoration(); // L: 190 - var9.renderable = var5; // L: 191 - var9.x = var2 * 128 + 64; // L: 192 - var9.y = var3 * 128 + 64; // L: 193 - var9.tileHeight = var4; // L: 194 - var9.tag = var6; // L: 195 - var9.flags = var8; // L: 196 - if (this.tiles[var1][var2][var3] == null) { // L: 197 + if (var5 != null) { + FloorDecoration var9 = new FloorDecoration(); + var9.renderable = var5; + var9.x = var2 * 128 + 64; + var9.y = var3 * 128 + 64; + var9.tileHeight = var4; + var9.tag = var6; + var9.flags = var8; + if (this.tiles[var1][var2][var3] == null) { this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198 + this.tiles[var1][var2][var3].floorDecoration = var9; } - } // L: 199 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIILgr;JLgr;Lgr;)V" + descriptor = "(IIIILgy;JLgy;Lgy;)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: 202 - var10.first = var5; // L: 203 - var10.x = var2 * 128 + 64; // L: 204 - var10.y = var3 * 128 + 64; // L: 205 - var10.tileHeight = var4; // L: 206 - var10.tag = var6; // L: 207 - var10.second = var8; // L: 208 - var10.third = var9; // L: 209 - int var11 = 0; // L: 210 - Tile var12 = this.tiles[var1][var2][var3]; // L: 211 - if (var12 != null) { // L: 212 - for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213 - if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 214 - Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215 - var14.calculateBoundsCylinder(); // L: 216 - if (var14.height > var11) { // L: 217 + ItemLayer var10 = new ItemLayer(); + var10.first = var5; + var10.x = var2 * 128 + 64; + var10.y = var3 * 128 + 64; + var10.tileHeight = var4; + var10.tag = var6; + var10.second = var8; + var10.third = var9; + int var11 = 0; + Tile var12 = this.tiles[var1][var2][var3]; + if (var12 != null) { + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { + Model var14 = (Model)var12.gameObjects[var13].renderable; + var14.calculateBoundsCylinder(); + if (var14.height > var11) { var11 = var14.height; } } } } - var10.height = var11; // L: 221 + var10.height = var11; if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].itemLayer = var10; // L: 223 - } // L: 224 + this.tiles[var1][var2][var3].itemLayer = var10; + } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIILgr;Lgr;IIJI)V" + descriptor = "(IIIILgy;Lgy;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: 227 - BoundaryObject var12 = new BoundaryObject(); // L: 228 - var12.tag = var9; // L: 229 - var12.flags = var11; // L: 230 - var12.x = var2 * 128 + 64; // L: 231 - var12.y = var3 * 128 + 64; // L: 232 - var12.tileHeight = var4; // L: 233 - var12.renderable1 = var5; // L: 234 - var12.renderable2 = var6; // L: 235 - var12.orientationA = var7; // L: 236 - var12.orientationB = var8; // L: 237 + if (var5 != null || var6 != null) { + BoundaryObject var12 = new BoundaryObject(); + var12.tag = var9; + var12.flags = var11; + var12.x = var2 * 128 + 64; + var12.y = var3 * 128 + 64; + var12.tileHeight = var4; + var12.renderable1 = var5; + var12.renderable2 = var6; + var12.orientationA = var7; + var12.orientationB = var8; for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238 + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); } } - this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239 - } - } // L: 240 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIIILgr;Lgr;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: 243 - WallDecoration var14 = new WallDecoration(); // L: 244 - var14.tag = var11; // L: 245 - var14.flags = var13; // L: 246 - var14.x = var2 * 128 + 64; // L: 247 - var14.y = var3 * 128 + 64; // L: 248 - var14.tileHeight = var4; // L: 249 - var14.renderable1 = var5; // L: 250 - var14.renderable2 = var6; // L: 251 - var14.orientation = var7; // L: 252 - var14.orientation2 = var8; // L: 253 - var14.xOffset = var9; // L: 254 - var14.yOffset = var10; // L: 255 - - for (int var15 = var1; var15 >= 0; --var15) { - if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256 - } - } - - this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257 - } - } // L: 258 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIIIIILgr;IJI)Z" - ) - public boolean method4046(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { - if (var7 == null) { // L: 261 - return true; - } else { - int var12 = var5 * 64 + var2 * 128; // L: 262 - int var13 = var6 * 64 + var3 * 128; // L: 263 - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264 + this.tiles[var1][var2][var3].boundaryObject = var12; } } - @ObfuscatedName("b") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIIILgr;IJZ)Z" + descriptor = "(IIIILgy;Lgy;IIIIJI)V" + ) + @Export("newWallDecoration") + public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { + if (var5 != null) { + WallDecoration var14 = new WallDecoration(); + var14.tag = var11; + var14.flags = var13; + var14.x = var2 * 128 + 64; + var14.y = var3 * 128 + 64; + var14.tileHeight = var4; + var14.renderable1 = var5; + var14.renderable2 = var6; + var14.orientation = var7; + var14.orientation2 = var8; + var14.xOffset = var9; + var14.yOffset = var10; + + for (int var15 = var1; var15 >= 0; --var15) { + if (this.tiles[var15][var2][var3] == null) { + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + } + } + + this.tiles[var1][var2][var3].wallDecoration = var14; + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIIIIILgy;IJI)Z" + ) + public boolean method3984(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { + return true; + } else { + int var12 = var5 * 64 + var2 * 128; + int var13 = var6 * 64 + var3 * 128; + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIIILgy;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: 268 + if (var6 == null) { return true; } else { - int var11 = var2 - var5; // L: 269 - int var12 = var3 - var5; // L: 270 - int var13 = var5 + var2; // L: 271 - int var14 = var3 + var5; // L: 272 - if (var10) { // L: 273 - if (var7 > 640 && var7 < 1408) { // L: 274 + int var11 = var2 - var5; + int var12 = var3 - var5; + int var13 = var5 + var2; + int var14 = var3 + var5; + if (var10) { + if (var7 > 640 && var7 < 1408) { var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 275 + if (var7 > 1152 && var7 < 1920) { var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 276 + if (var7 > 1664 || var7 < 384) { var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 277 + if (var7 > 128 && var7 < 896) { var11 -= 128; } } - var11 /= 128; // L: 279 - var12 /= 128; // L: 280 - var13 /= 128; // L: 281 - var14 /= 128; // L: 282 - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283 + var11 /= 128; + var12 /= 128; + var13 /= 128; + var14 /= 128; + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); } } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIIILgr;IJIIII)Z" + descriptor = "(IIIIILgy;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: 287 288 + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIIIIIILgr;IZJI)Z" + descriptor = "(IIIIIIIILgy;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: 292 - for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293 - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294 + for (int var15 = var2; var15 < var2 + var4; ++var15) { + for (var16 = var3; var16 < var3 + var5; ++var16) { + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 295 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296 + Tile var23 = this.tiles[var1][var15][var16]; + if (var23 != null && var23.gameObjectsCount >= 5) { return false; } } } - GameObject var21 = new GameObject(); // L: 299 - var21.tag = var12; // L: 300 - var21.flags = var14; // L: 301 - var21.plane = var1; // L: 302 - var21.centerX = var6; // L: 303 - var21.centerY = var7; // L: 304 - var21.height = var8; // L: 305 - var21.renderable = var9; // L: 306 - var21.orientation = var10; // L: 307 - var21.startX = var2; // L: 308 - var21.startY = var3; // L: 309 - var21.endX = var2 + var4 - 1; // L: 310 - var21.endY = var3 + var5 - 1; // L: 311 + GameObject var21 = new GameObject(); + var21.tag = var12; + var21.flags = var14; + var21.plane = var1; + var21.centerX = var6; + var21.centerY = var7; + var21.height = var8; + var21.renderable = var9; + var21.orientation = var10; + var21.startX = var2; + var21.startY = var3; + var21.endX = var2 + var4 - 1; + var21.endY = var3 + var5 - 1; - for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312 - for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313 - int var18 = 0; // L: 314 - if (var16 > var2) { // L: 315 + for (var16 = var2; var16 < var2 + var4; ++var16) { + for (int var17 = var3; var17 < var3 + var5; ++var17) { + int var18 = 0; + if (var16 > var2) { ++var18; } - if (var16 < var2 + var4 - 1) { // L: 316 + if (var16 < var2 + var4 - 1) { var18 += 4; } - if (var17 > var3) { // L: 317 + if (var17 > var3) { var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 318 + if (var17 < var3 + var5 - 1) { 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: 319 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); } } - Tile var22 = this.tiles[var1][var16][var17]; // L: 320 - var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321 - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322 - var22.gameObjectsEdgeMask |= var18; // L: 324 - ++var22.gameObjectsCount; // L: 325 + Tile var22 = this.tiles[var1][var16][var17]; + var22.gameObjects[var22.gameObjectsCount] = var21; + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; + var22.gameObjectsEdgeMask |= var18; + ++var22.gameObjectsCount; } } - if (var11) { // L: 328 + if (var11) { this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 329 + return true; } - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 - GameObject var2 = this.tempGameObjects[var1]; // L: 334 - this.removeGameObject(var2); // L: 335 - this.tempGameObjects[var1] = null; // L: 336 + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { + GameObject var2 = this.tempGameObjects[var1]; + this.removeGameObject(var2); + this.tempGameObjects[var1] = null; } - this.tempGameObjectsCount = 0; // L: 338 - } // L: 339 + this.tempGameObjectsCount = 0; + } - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lhf;)V" + descriptor = "(Lhh;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342 - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343 - Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344 - if (var4 != null) { // L: 345 + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { + Tile var4 = this.tiles[var1.plane][var2][var3]; + if (var4 != null) { int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346 - if (var4.gameObjects[var5] == var1) { // L: 347 - --var4.gameObjectsCount; // L: 348 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + if (var4.gameObjects[var5] == var1) { + --var4.gameObjectsCount; - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349 - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350 - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351 + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 353 + var4.gameObjects[var4.gameObjectsCount] = null; break; } } - var4.gameObjectsEdgeMask = 0; // L: 357 + var4.gameObjectsEdgeMask = 0; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; } } } } - } // L: 365 - - @ObfuscatedName("x") - public void method4204(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 368 - if (var5 != null) { // L: 369 - WallDecoration var6 = var5.wallDecoration; // L: 370 - if (var6 != null) { // L: 371 - var6.xOffset = var4 * var6.xOffset / 16; // L: 372 - var6.yOffset = var4 * var6.yOffset / 16; // L: 373 - } - } - } // L: 374 + } @ObfuscatedName("u") + public void method3990(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; + if (var5 != null) { + WallDecoration var6 = var5.wallDecoration; + if (var6 != null) { + var6.xOffset = var4 * var6.xOffset / 16; + var6.yOffset = var4 * var6.yOffset / 16; + } + } + } + + @ObfuscatedName("e") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 377 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.boundaryObject = null; // L: 379 + var4.boundaryObject = null; } - } // L: 378 380 + } - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 383 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.wallDecoration = null; // L: 385 + var4.wallDecoration = null; } - } // L: 384 386 + } - @ObfuscatedName("s") + @ObfuscatedName("i") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 389 - if (var4 != null) { // L: 390 - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391 - GameObject var6 = var4.gameObjects[var5]; // L: 392 - if (FileSystem.method2644(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 - this.removeGameObject(var6); // L: 394 - return; // L: 395 + Tile var4 = this.tiles[var1][var2][var3]; + if (var4 != null) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (Frames.method4174(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + this.removeGameObject(var6); + return; } } } - } // L: 398 + } - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 401 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.floorDecoration = null; // L: 403 + var4.floorDecoration = null; } - } // L: 402 404 + } - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 407 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.itemLayer = null; // L: 409 + var4.itemLayer = null; } - } // L: 408 410 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(III)Lhr;" - ) - public BoundaryObject method4058(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 413 - return var4 == null ? null : var4.boundaryObject; // L: 414 415 } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhd;" + descriptor = "(III)Lhs;" ) - public WallDecoration method4059(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 419 - return var4 == null ? null : var4.wallDecoration; // L: 420 421 + public BoundaryObject method4060(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; + return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)Lhf;" + descriptor = "(III)Lha;" ) - public GameObject method4094(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 425 - if (var4 == null) { // L: 426 + public WallDecoration method3997(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; + return var4 == null ? null : var4.wallDecoration; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(III)Lhh;" + ) + public GameObject method4043(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; + if (var4 == null) { return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 - GameObject var6 = var4.gameObjects[var5]; // L: 428 - if (FileSystem.method2644(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (Frames.method4174(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6; } } - return null; // L: 431 + return null; } } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(III)Lgq;" + descriptor = "(III)Lgn;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 435 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 441 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 447 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 453 - if (var4 == null) { // L: 454 + Tile var4 = this.tiles[var1][var2][var3]; + if (var4 == null) { return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 - GameObject var6 = var4.gameObjects[var5]; // L: 456 - if (FileSystem.method2644(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (Frames.method4174(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } - return 0L; // L: 459 + return 0L; } } - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 463 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 469 - if (var6 == null) { // L: 470 + Tile var6 = this.tiles[var1][var2][var3]; + if (var6 == null) { return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474 - if (var6.gameObjects[var7].tag == var4) { // L: 475 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { + if (var6.gameObjects[var7].tag == var4) { return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 477 + return -1; } } - @ObfuscatedName("az") - public void method4067(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481 - for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482 - for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483 - Tile var7 = this.tiles[var4][var5][var6]; // L: 484 - if (var7 != null) { // L: 485 - BoundaryObject var8 = var7.boundaryObject; // L: 486 + @ObfuscatedName("aa") + public void method4005(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { + for (int var5 = 0; var5 < this.xSize; ++var5) { + for (int var6 = 0; var6 < this.ySize; ++var6) { + Tile var7 = this.tiles[var4][var5][var6]; + if (var7 != null) { + BoundaryObject var8 = var7.boundaryObject; ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487 - ModelData var9 = (ModelData)var8.renderable1; // L: 488 - this.method4238(var9, var4, var5, var6, 1, 1); // L: 489 - if (var8.renderable2 instanceof ModelData) { // L: 490 - var10 = (ModelData)var8.renderable2; // L: 491 - this.method4238(var10, var4, var5, var6, 1, 1); // L: 492 - ModelData.method3885(var9, var10, 0, 0, 0, false); // L: 493 - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 + if (var8 != null && var8.renderable1 instanceof ModelData) { + ModelData var9 = (ModelData)var8.renderable1; + this.method4007(var9, var4, var5, var6, 1, 1); + if (var8.renderable2 instanceof ModelData) { + var10 = (ModelData)var8.renderable2; + this.method4007(var10, var4, var5, var6, 1, 1); + ModelData.method3812(var9, var10, 0, 0, 0, false); + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496 + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498 - GameObject var14 = var7.gameObjects[var12]; // L: 499 - if (var14 != null && var14.renderable instanceof ModelData) { // L: 500 - ModelData var11 = (ModelData)var14.renderable; // L: 501 - this.method4238(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502 - var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { + GameObject var14 = var7.gameObjects[var12]; + if (var14 != null && var14.renderable instanceof ModelData) { + ModelData var11 = (ModelData)var14.renderable; + this.method4007(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } - FloorDecoration var13 = var7.floorDecoration; // L: 506 - if (var13 != null && var13.renderable instanceof ModelData) { // L: 507 - var10 = (ModelData)var13.renderable; // L: 508 - this.method4068(var10, var4, var5, var6); // L: 509 - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 + FloorDecoration var13 = var7.floorDecoration; + if (var13 != null && var13.renderable instanceof ModelData) { + var10 = (ModelData)var13.renderable; + this.method4006(var10, var4, var5, var6); + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } } } } - } // L: 516 + } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lga;III)V" + descriptor = "(Lgz;III)V" ) - void method4068(ModelData var1, int var2, int var3, int var4) { + void method4006(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { // L: 519 - var5 = this.tiles[var2][var3 + 1][var4]; // L: 520 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 522 - ModelData.method3885(var1, var6, 128, 0, 0, true); // L: 523 + if (var3 < this.xSize) { + var5 = this.tiles[var2][var3 + 1][var4]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 128, 0, 0, true); } } - if (var4 < this.xSize) { // L: 526 - var5 = this.tiles[var2][var3][var4 + 1]; // L: 527 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 529 - ModelData.method3885(var1, var6, 0, 0, 128, true); // L: 530 + if (var4 < this.xSize) { + var5 = this.tiles[var2][var3][var4 + 1]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 0, 0, 128, true); } } - if (var3 < this.xSize && var4 < this.ySize) { // L: 533 - var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 535 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 536 - ModelData.method3885(var1, var6, 128, 0, 128, true); // L: 537 + if (var3 < this.xSize && var4 < this.ySize) { + var5 = this.tiles[var2][var3 + 1][var4 + 1]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 128, 0, 128, true); } } - if (var3 < this.xSize && var4 > 0) { // L: 540 - var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 542 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 543 - ModelData.method3885(var1, var6, 128, 0, -128, true); // L: 544 + if (var3 < this.xSize && var4 > 0) { + var5 = this.tiles[var2][var3 + 1][var4 - 1]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 128, 0, -128, true); } } - } // L: 547 + } - @ObfuscatedName("ag") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lga;IIIII)V" + descriptor = "(Lgz;IIIII)V" ) - void method4238(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 550 - int var8 = var3; // L: 551 - int var9 = var3 + var5; // L: 552 - int var10 = var4 - 1; // L: 553 - int var11 = var4 + var6; // L: 554 + void method4007(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; + int var8 = var3; + int var9 = var3 + var5; + int var10 = var4 - 1; + int var11 = var4 + var6; - for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555 - if (var12 != this.planes) { // L: 556 - for (int var13 = var8; var13 <= var9; ++var13) { // L: 557 - if (var13 >= 0 && var13 < this.xSize) { // L: 558 - for (int var14 = var10; var14 <= var11; ++var14) { // L: 559 - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561 - Tile var15 = this.tiles[var12][var13][var14]; // L: 562 - if (var15 != null) { // L: 563 - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564 - BoundaryObject var17 = var15.boundaryObject; // L: 565 - if (var17 != null) { // L: 566 + for (int var12 = var2; var12 <= var2 + 1; ++var12) { + if (var12 != this.planes) { + for (int var13 = var8; var13 <= var9; ++var13) { + if (var13 >= 0 && var13 < this.xSize) { + for (int var14 = var10; var14 <= var11; ++var14) { + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { + Tile var15 = this.tiles[var12][var13][var14]; + if (var15 != null) { + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; + BoundaryObject var17 = var15.boundaryObject; + if (var17 != null) { ModelData var18; - if (var17.renderable1 instanceof ModelData) { // L: 567 - var18 = (ModelData)var17.renderable1; // L: 568 - ModelData.method3885(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 + if (var17.renderable1 instanceof ModelData) { + var18 = (ModelData)var17.renderable1; + ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } - if (var17.renderable2 instanceof ModelData) { // L: 571 - var18 = (ModelData)var17.renderable2; // L: 572 - ModelData.method3885(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 + if (var17.renderable2 instanceof ModelData) { + var18 = (ModelData)var17.renderable2; + ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576 - GameObject var19 = var15.gameObjects[var23]; // L: 577 - if (var19 != null && var19.renderable instanceof ModelData) { // L: 578 - ModelData var20 = (ModelData)var19.renderable; // L: 579 - int var21 = var19.endX - var19.startX + 1; // L: 580 - int var22 = var19.endY - var19.startY + 1; // L: 581 - ModelData.method3885(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { + GameObject var19 = var15.gameObjects[var23]; + if (var19 != null && var19.renderable instanceof ModelData) { + ModelData var20 = (ModelData)var19.renderable; + int var21 = var19.endX - var19.startX + 1; + int var22 = var19.endY - var19.startY + 1; + ModelData.method3812(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -961,179 +961,179 @@ public class Scene { } } - --var8; // L: 587 - var7 = false; // L: 588 + --var8; + var7 = false; } } - } // L: 590 + } - @ObfuscatedName("ab") + @ObfuscatedName("au") @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: 593 - if (var7 != null) { // L: 594 - SceneTilePaint var8 = var7.paint; // L: 595 + Tile var7 = this.tiles[var4][var5][var6]; + if (var7 != null) { + SceneTilePaint var8 = var7.paint; int var10; - if (var8 != null) { // L: 596 - int var18 = var8.rgb; // L: 597 - if (var18 != 0) { // L: 598 - for (var10 = 0; var10 < 4; ++var10) { // L: 599 - var1[var2] = var18; // L: 600 - var1[var2 + 1] = var18; // L: 601 - var1[var2 + 2] = var18; // L: 602 - var1[var2 + 3] = var18; // L: 603 - var2 += var3; // L: 604 + if (var8 != null) { + int var18 = var8.rgb; + if (var18 != 0) { + for (var10 = 0; var10 < 4; ++var10) { + var1[var2] = var18; + var1[var2 + 1] = var18; + var1[var2 + 2] = var18; + var1[var2 + 3] = var18; + var2 += var3; } } } else { - SceneTileModel var9 = var7.model; // L: 608 - if (var9 != null) { // L: 609 - var10 = var9.shape; // L: 610 - int var11 = var9.rotation; // L: 611 - int var12 = var9.underlayRgb; // L: 612 - int var13 = var9.overlayRgb; // L: 613 - int[] var14 = this.tileShape2D[var10]; // L: 614 - int[] var15 = this.tileRotation2D[var11]; // L: 615 - int var16 = 0; // L: 616 + SceneTileModel var9 = var7.model; + if (var9 != null) { + var10 = var9.shape; + int var11 = var9.rotation; + int var12 = var9.underlayRgb; + int var13 = var9.overlayRgb; + int[] var14 = this.tileShape2D[var10]; + int[] var15 = this.tileRotation2D[var11]; + int var16 = 0; int var17; - if (var12 != 0) { // L: 617 - for (var17 = 0; var17 < 4; ++var17) { // L: 618 - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619 - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620 - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621 - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622 - var2 += var3; // L: 623 + if (var12 != 0) { + for (var17 = 0; var17 < 4; ++var17) { + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; + var2 += var3; } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 627 - if (var14[var15[var16++]] != 0) { // L: 628 + for (var17 = 0; var17 < 4; ++var17) { + if (var14[var15[var16++]] != 0) { var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 629 + if (var14[var15[var16++]] != 0) { var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 630 + if (var14[var15[var16++]] != 0) { var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 631 + if (var14[var15[var16++]] != 0) { var1[var2 + 3] = var13; } - var2 += var3; // L: 632 + var2 += var3; } } } } } - } // L: 606 635 + } @ObfuscatedName("ao") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { // L: 714 - checkClick = true; // L: 715 - viewportWalking = var4; // L: 716 - Scene_selectedPlane = var1; // L: 717 - Scene_selectedScreenX = var2; // L: 718 - Scene_selectedScreenY = var3; // L: 719 - Scene_selectedX = -1; // L: 720 - Scene_selectedY = -1; // L: 721 + if (!shouldSendWalk() || var4) { + checkClick = true; + viewportWalking = var4; + Scene_selectedPlane = var1; + Scene_selectedScreenX = var2; + Scene_selectedScreenY = var3; + Scene_selectedX = -1; + Scene_selectedY = -1; } - } // L: 722 + } - @ObfuscatedName("an") + @ObfuscatedName("az") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 725 - } // L: 726 + viewportWalking = true; + } - @ObfuscatedName("ac") + @ObfuscatedName("at") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 738 + if (var1 < 0) { var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 739 + } else if (var1 >= this.xSize * 128) { var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 740 + if (var3 < 0) { var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 741 + } else if (var3 >= this.ySize * 128) { var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 742 + if (var4 < 128) { var4 = 128; - } else if (var4 > 383) { // L: 743 + } else if (var4 > 383) { var4 = 383; } - ++Scene_drawnCount; // L: 744 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748 - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749 - Scene_cameraX = var1; // L: 750 - Scene_cameraY = var2; // L: 751 - Scene_cameraZ = var3; // L: 752 - Scene_cameraXTile = var1 / 128; // L: 753 - Scene_cameraYTile = var3 / 128; // L: 754 - Scene_plane = var6; // L: 755 - Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756 - if (Scene_cameraXTileMin < 0) { // L: 757 + ++Scene_drawnCount; + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; + Scene_cameraX = var1; + Scene_cameraY = var2; + Scene_cameraZ = var3; + Scene_cameraXTile = var1 / 128; + Scene_cameraYTile = var3 / 128; + Scene_plane = var6; + Scene_cameraXTileMin = Scene_cameraXTile - 25; + if (Scene_cameraXTileMin < 0) { Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758 - if (Scene_cameraYTileMin < 0) { // L: 759 + Scene_cameraYTileMin = Scene_cameraYTile - 25; + if (Scene_cameraYTileMin < 0) { Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760 - if (Scene_cameraXTileMax > this.xSize) { // L: 761 + Scene_cameraXTileMax = Scene_cameraXTile + 25; + if (Scene_cameraXTileMax > this.xSize) { Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762 - if (Scene_cameraYTileMax > this.ySize) { // L: 763 + Scene_cameraYTileMax = Scene_cameraYTile + 25; + if (Scene_cameraYTileMax > this.ySize) { Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 764 - tileUpdateCount = 0; // L: 765 + this.occlude(); + tileUpdateCount = 0; int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766 - var8 = this.tiles[var7]; // L: 767 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 768 - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 769 - Tile var16 = var8[var9][var10]; // L: 770 - if (var16 != null) { // L: 771 - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772 - var16.drawPrimary = true; // L: 778 - var16.drawSecondary = true; // L: 779 - if (var16.gameObjectsCount > 0) { // L: 780 + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { + Tile var16 = var8[var9][var10]; + if (var16 != null) { + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { + var16.drawPrimary = true; + var16.drawSecondary = true; + if (var16.gameObjectsCount > 0) { var16.drawGameObjects = true; } else { - var16.drawGameObjects = false; // L: 781 + var16.drawGameObjects = false; } - ++tileUpdateCount; // L: 782 + ++tileUpdateCount; } else { - var16.drawPrimary = false; // L: 773 - var16.drawSecondary = false; // L: 774 - var16.drawGameObjectEdges = 0; // L: 775 + var16.drawPrimary = false; + var16.drawSecondary = false; + var16.drawGameObjectEdges = 0; } } } @@ -1145,118 +1145,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788 - var8 = this.tiles[var7]; // L: 789 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; - for (var9 = -25; var9 <= 0; ++var9) { // L: 790 - var10 = var9 + Scene_cameraXTile; // L: 791 - var11 = Scene_cameraXTile - var9; // L: 792 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 793 - for (var12 = -25; var12 <= 0; ++var12) { // L: 794 - var13 = var12 + Scene_cameraYTile; // L: 795 - var14 = Scene_cameraYTile - var12; // L: 796 - if (var10 >= Scene_cameraXTileMin) { // L: 797 - if (var13 >= Scene_cameraYTileMin) { // L: 798 - var15 = var8[var10][var13]; // L: 799 - if (var15 != null && var15.drawPrimary) { // L: 800 + for (var9 = -25; var9 <= 0; ++var9) { + var10 = var9 + Scene_cameraXTile; + var11 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { + for (var12 = -25; var12 <= 0; ++var12) { + var13 = var12 + Scene_cameraYTile; + var14 = Scene_cameraYTile - var12; + if (var10 >= Scene_cameraXTileMin) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var10][var13]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 802 - var15 = var8[var10][var14]; // L: 803 - if (var15 != null && var15.drawPrimary) { // L: 804 + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var10][var14]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { // L: 807 - if (var13 >= Scene_cameraYTileMin) { // L: 808 - var15 = var8[var11][var13]; // L: 809 - if (var15 != null && var15.drawPrimary) { // L: 810 + if (var11 < Scene_cameraXTileMax) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var11][var13]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 812 - var15 = var8[var11][var14]; // L: 813 - if (var15 != null && var15.drawPrimary) { // L: 814 + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var11][var14]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { // L: 817 - checkClick = false; // L: 818 - return; // L: 819 + if (tileUpdateCount == 0) { + checkClick = false; + return; } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825 - var8 = this.tiles[var7]; // L: 826 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; - for (var9 = -25; var9 <= 0; ++var9) { // L: 827 - var10 = var9 + Scene_cameraXTile; // L: 828 - var11 = Scene_cameraXTile - var9; // L: 829 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 830 - for (var12 = -25; var12 <= 0; ++var12) { // L: 831 - var13 = var12 + Scene_cameraYTile; // L: 832 - var14 = Scene_cameraYTile - var12; // L: 833 - if (var10 >= Scene_cameraXTileMin) { // L: 834 - if (var13 >= Scene_cameraYTileMin) { // L: 835 - var15 = var8[var10][var13]; // L: 836 - if (var15 != null && var15.drawPrimary) { // L: 837 + for (var9 = -25; var9 <= 0; ++var9) { + var10 = var9 + Scene_cameraXTile; + var11 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { + for (var12 = -25; var12 <= 0; ++var12) { + var13 = var12 + Scene_cameraYTile; + var14 = Scene_cameraYTile - var12; + if (var10 >= Scene_cameraXTileMin) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var10][var13]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { // L: 839 - var15 = var8[var10][var14]; // L: 840 - if (var15 != null && var15.drawPrimary) { // L: 841 + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var10][var14]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, false); } } } - if (var11 < Scene_cameraXTileMax) { // L: 844 - if (var13 >= Scene_cameraYTileMin) { // L: 845 - var15 = var8[var11][var13]; // L: 846 - if (var15 != null && var15.drawPrimary) { // L: 847 + if (var11 < Scene_cameraXTileMax) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var11][var13]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { // L: 849 - var15 = var8[var11][var14]; // L: 850 - if (var15 != null && var15.drawPrimary) { // L: 851 + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var11][var14]; + if (var15 != null && var15.drawPrimary) { this.drawTile(var15, false); } } } - if (tileUpdateCount == 0) { // L: 854 - checkClick = false; // L: 855 - return; // L: 856 + if (tileUpdateCount == 0) { + checkClick = false; + return; } } } } } - checkClick = false; // L: 862 - } // L: 863 + checkClick = false; + } - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lgf;Z)V" + descriptor = "(Lgq;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 866 + Scene_tilesDeque.addFirst(var1); while (true) { Tile var3; @@ -1288,227 +1288,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868 - if (var3 == null) { // L: 869 + var3 = (Tile)Scene_tilesDeque.removeLast(); + if (var3 == null) { return; } - } while(!var3.drawSecondary); // L: 870 + } while(!var3.drawSecondary); - var4 = var3.x; // L: 871 - var5 = var3.y; // L: 872 - var6 = var3.plane; // L: 873 - var7 = var3.originalPlane; // L: 874 - var8 = this.tiles[var6]; // L: 875 - if (!var3.drawPrimary) { // L: 876 + var4 = var3.x; + var5 = var3.y; + var6 = var3.plane; + var7 = var3.originalPlane; + var8 = this.tiles[var6]; + if (!var3.drawPrimary) { break; } - if (var2) { // L: 877 - if (var6 > 0) { // L: 878 - var9 = this.tiles[var6 - 1][var4][var5]; // L: 879 - if (var9 != null && var9.drawSecondary) { // L: 880 + if (var2) { + if (var6 > 0) { + var9 = this.tiles[var6 - 1][var4][var5]; + if (var9 != null && var9.drawSecondary) { continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882 - var9 = var8[var4 - 1][var5]; // L: 883 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884 + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { + var9 = var8[var4 - 1][var5]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886 - var9 = var8[var4 + 1][var5]; // L: 887 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888 + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { + var9 = var8[var4 + 1][var5]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890 - var9 = var8[var4][var5 - 1]; // L: 891 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892 + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { + var9 = var8[var4][var5 - 1]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894 - var9 = var8[var4][var5 + 1]; // L: 895 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896 + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { + var9 = var8[var4][var5 + 1]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { continue; } } } else { - var2 = true; // L: 899 + var2 = true; } - var3.drawPrimary = false; // L: 900 - if (var3.linkedBelowTile != null) { // L: 901 - var9 = var3.linkedBelowTile; // L: 902 - if (var9.paint != null) { // L: 903 - if (!this.method4084(0, var4, var5)) { // L: 904 + var3.drawPrimary = false; + if (var3.linkedBelowTile != null) { + var9 = var3.linkedBelowTile; + if (var9.paint != null) { + if (!this.method4022(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method4084(0, var4, var5)) { // L: 906 907 + } else if (var9.model != null && !this.method4022(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 909 - if (var10 != null) { // L: 910 + var10 = var9.boundaryObject; + if (var10 != null) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911 - var12 = var9.gameObjects[var11]; // L: 912 - if (var12 != null) { // L: 913 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { + var12 = var9.gameObjects[var11]; + if (var12 != null) { var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; // L: 916 - if (var3.paint != null) { // L: 917 - if (!this.method4084(var7, var4, var5)) { // L: 918 - var20 = true; // L: 919 - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 + var20 = false; + if (var3.paint != null) { + if (!this.method4022(var7, var4, var5)) { + var20 = true; + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method4084(var7, var4, var5)) { // L: 923 924 - var20 = true; // L: 925 - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926 + } else if (var3.model != null && !this.method4022(var7, var4, var5)) { + var20 = true; + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var21 = 0; // L: 929 - var11 = 0; // L: 930 - BoundaryObject var31 = var3.boundaryObject; // L: 931 - WallDecoration var13 = var3.wallDecoration; // L: 932 - if (var31 != null || var13 != null) { // L: 933 - if (var4 == Scene_cameraXTile) { // L: 934 + var21 = 0; + var11 = 0; + BoundaryObject var31 = var3.boundaryObject; + WallDecoration var13 = var3.wallDecoration; + if (var31 != null || var13 != null) { + if (var4 == Scene_cameraXTile) { ++var21; - } else if (Scene_cameraXTile < var4) { // L: 935 + } else if (Scene_cameraXTile < var4) { var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 936 + if (var5 == Scene_cameraYTile) { var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 937 + } else if (Scene_cameraYTile > var5) { var21 += 6; } - var11 = field2336[var21]; // L: 938 - var3.field2256 = field2338[var21]; // L: 939 + var11 = field2324[var21]; + var3.field2243 = field2328[var21]; } - if (var31 != null) { // L: 941 - if ((var31.orientationA & field2314[var21]) != 0) { // L: 942 - if (var31.orientationA == 16) { // L: 943 - var3.drawGameObjectEdges = 3; // L: 944 - var3.field2247 = field2339[var21]; // L: 945 - var3.field2255 = 3 - var3.field2247; // L: 946 - } else if (var31.orientationA == 32) { // L: 948 - var3.drawGameObjectEdges = 6; // L: 949 - var3.field2247 = field2340[var21]; // L: 950 - var3.field2255 = 6 - var3.field2247; // L: 951 - } else if (var31.orientationA == 64) { // L: 953 - var3.drawGameObjectEdges = 12; // L: 954 - var3.field2247 = field2295[var21]; // L: 955 - var3.field2255 = 12 - var3.field2247; // L: 956 + if (var31 != null) { + if ((var31.orientationA & field2325[var21]) != 0) { + if (var31.orientationA == 16) { + var3.drawGameObjectEdges = 3; + var3.field2222 = field2338[var21]; + var3.field2227 = 3 - var3.field2222; + } else if (var31.orientationA == 32) { + var3.drawGameObjectEdges = 6; + var3.field2222 = field2294[var21]; + var3.field2227 = 6 - var3.field2222; + } else if (var31.orientationA == 64) { + var3.drawGameObjectEdges = 12; + var3.field2222 = field2327[var21]; + var3.field2227 = 12 - var3.field2222; } else { - var3.drawGameObjectEdges = 9; // L: 959 - var3.field2247 = field2342[var21]; // L: 960 - var3.field2255 = 9 - var3.field2247; // L: 961 + var3.drawGameObjectEdges = 9; + var3.field2222 = field2278[var21]; + var3.field2227 = 9 - var3.field2222; } } else { - var3.drawGameObjectEdges = 0; // L: 964 + var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method4073(var7, var4, var5, var31.orientationA)) { // L: 965 + if ((var31.orientationA & var11) != 0 && !this.method4023(var7, var4, var5, var31.orientationA)) { var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method4073(var7, var4, var5, var31.orientationB)) { // L: 966 + if ((var31.orientationB & var11) != 0 && !this.method4023(var7, var4, var5, var31.orientationB)) { var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method4086(var7, var4, var5, var13.renderable1.height)) { // L: 968 - if ((var13.orientation & var11) != 0) { // L: 969 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970 - } else if (var13.orientation == 256) { // L: 972 - var14 = var13.x - Scene_cameraX; // L: 973 - var15 = var13.tileHeight - Scene_cameraY; // L: 974 - var16 = var13.y - Scene_cameraZ; // L: 975 - var17 = var13.orientation2; // L: 976 - if (var17 != 1 && var17 != 2) { // L: 978 - var18 = var14; // L: 979 + if (var13 != null && !this.method4024(var7, var4, var5, var13.renderable1.height)) { + if ((var13.orientation & var11) != 0) { + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); + } else if (var13.orientation == 256) { + var14 = var13.x - Scene_cameraX; + var15 = var13.tileHeight - Scene_cameraY; + var16 = var13.y - Scene_cameraZ; + var17 = var13.orientation2; + if (var17 != 1 && var17 != 2) { + var18 = var14; } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 981 - var19 = var16; // L: 982 + if (var17 != 2 && var17 != 3) { + var19 = var16; } else { var19 = -var16; } - if (var19 < var18) { // L: 983 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984 - } else if (var13.renderable2 != null) { // L: 986 - var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987 + if (var19 < var18) { + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); + } else if (var13.renderable2 != null) { + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); } } } - if (var20) { // L: 991 - FloorDecoration var22 = var3.floorDecoration; // L: 992 - if (var22 != null) { // L: 993 + if (var20) { + FloorDecoration var22 = var3.floorDecoration; + if (var22 != null) { var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; // L: 994 - if (var23 != null && var23.height == 0) { // L: 995 - if (var23.second != null) { // L: 996 + ItemLayer var23 = var3.itemLayer; + if (var23 != null && var23.height == 0) { + if (var23.second != null) { var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { // L: 997 + if (var23.third != null) { var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { // L: 998 + if (var23.first != null) { var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; // L: 1001 - if (var14 != 0) { // L: 1002 - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003 - var36 = var8[var4 + 1][var5]; // L: 1004 - if (var36 != null && var36.drawSecondary) { // L: 1005 + var14 = var3.gameObjectsEdgeMask; + if (var14 != 0) { + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { + var36 = var8[var4 + 1][var5]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007 - var36 = var8[var4][var5 + 1]; // L: 1008 - if (var36 != null && var36.drawSecondary) { // L: 1009 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { + var36 = var8[var4][var5 + 1]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011 - var36 = var8[var4 - 1][var5]; // L: 1012 - if (var36 != null && var36.drawSecondary) { // L: 1013 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { + var36 = var8[var4 - 1][var5]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015 - var36 = var8[var4][var5 - 1]; // L: 1016 - if (var36 != null && var36.drawSecondary) { // L: 1017 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { + var36 = var8[var4][var5 - 1]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } @@ -1516,372 +1516,372 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1021 - var20 = true; // L: 1022 + if (var3.drawGameObjectEdges != 0) { + var20 = true; - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2247) { // L: 1024 - var20 = false; // L: 1025 - break; // L: 1026 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2222) { + var20 = false; + break; } } - if (var20) { // L: 1029 - var10 = var3.boundaryObject; // L: 1030 - if (!this.method4073(var7, var4, var5, var10.orientationA)) { // L: 1031 + if (var20) { + var10 = var3.boundaryObject; + if (!this.method4023(var7, var4, var5, var10.orientationA)) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1032 + var3.drawGameObjectEdges = 0; } } - if (!var3.drawGameObjects) { // L: 1035 + if (!var3.drawGameObjects) { break; } try { - int var34 = var3.gameObjectsCount; // L: 1037 - var3.drawGameObjects = false; // L: 1038 - var21 = 0; // L: 1039 + int var34 = var3.gameObjectsCount; + var3.drawGameObjects = false; + var21 = 0; label563: - for (var11 = 0; var11 < var34; ++var11) { // L: 1040 - var12 = var3.gameObjects[var11]; // L: 1041 - if (var12.lastDrawn != Scene_drawnCount) { // L: 1042 - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043 - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044 - var36 = var8[var24][var14]; // L: 1045 - if (var36.drawPrimary) { // L: 1046 - var3.drawGameObjects = true; // L: 1047 - continue label563; // L: 1048 + for (var11 = 0; var11 < var34; ++var11) { + var12 = var3.gameObjects[var11]; + if (var12.lastDrawn != Scene_drawnCount) { + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { + var36 = var8[var24][var14]; + if (var36.drawPrimary) { + var3.drawGameObjects = true; + continue label563; } - if (var36.drawGameObjectEdges != 0) { // L: 1050 - var16 = 0; // L: 1051 - if (var24 > var12.startX) { // L: 1052 + if (var36.drawGameObjectEdges != 0) { + var16 = 0; + if (var24 > var12.startX) { ++var16; } - if (var24 < var12.endX) { // L: 1053 + if (var24 < var12.endX) { var16 += 4; } - if (var14 > var12.startY) { // L: 1054 + if (var14 > var12.startY) { var16 += 8; } - if (var14 < var12.endY) { // L: 1055 + if (var14 < var12.endY) { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2255) { // L: 1056 - var3.drawGameObjects = true; // L: 1057 - continue label563; // L: 1058 + if ((var16 & var36.drawGameObjectEdges) == var3.field2227) { + var3.drawGameObjects = true; + continue label563; } } } } - gameObjects[var21++] = var12; // L: 1063 - var24 = Scene_cameraXTile - var12.startX; // L: 1064 - var14 = var12.endX - Scene_cameraXTile; // L: 1065 - if (var14 > var24) { // L: 1066 + gameObjects[var21++] = var12; + var24 = Scene_cameraXTile - var12.startX; + var14 = var12.endX - Scene_cameraXTile; + if (var14 > var24) { var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1067 - var16 = var12.endY - Scene_cameraYTile; // L: 1068 - if (var16 > var15) { // L: 1069 - var12.field2552 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; + var16 = var12.endY - Scene_cameraYTile; + if (var16 > var15) { + var12.field2541 = var24 + var16; } else { - var12.field2552 = var24 + var15; // L: 1070 + var12.field2541 = var24 + var15; } } } - while (var21 > 0) { // L: 1073 - var11 = -50; // L: 1074 - var25 = -1; // L: 1075 + while (var21 > 0) { + var11 = -50; + var25 = -1; - for (var24 = 0; var24 < var21; ++var24) { // L: 1076 - GameObject var35 = gameObjects[var24]; // L: 1077 - if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 - if (var35.field2552 > var11) { // L: 1079 - var11 = var35.field2552; // L: 1080 - var25 = var24; // L: 1081 - } else if (var11 == var35.field2552) { // L: 1083 - var15 = var35.centerX - Scene_cameraX; // L: 1084 - var16 = var35.centerY - Scene_cameraZ; // L: 1085 - var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086 - var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087 - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088 + for (var24 = 0; var24 < var21; ++var24) { + GameObject var35 = gameObjects[var24]; + if (var35.lastDrawn != Scene_drawnCount) { + if (var35.field2541 > var11) { + var11 = var35.field2541; + var25 = var24; + } else if (var11 == var35.field2541) { + var15 = var35.centerX - Scene_cameraX; + var16 = var35.centerY - Scene_cameraZ; + var17 = gameObjects[var25].centerX - Scene_cameraX; + var18 = gameObjects[var25].centerY - Scene_cameraZ; + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { var25 = var24; } } } } - if (var25 == -1) { // L: 1092 + if (var25 == -1) { break; } - GameObject var33 = gameObjects[var25]; // L: 1093 - var33.lastDrawn = Scene_drawnCount; // L: 1094 - if (!this.method4087(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095 - var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096 + GameObject var33 = gameObjects[var25]; + var33.lastDrawn = Scene_drawnCount; + if (!this.method4096(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { + var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098 - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099 - Tile var26 = var8[var14][var15]; // L: 1100 - if (var26.drawGameObjectEdges != 0) { // L: 1101 + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { + Tile var26 = var8[var14][var15]; + if (var26.drawGameObjectEdges != 0) { Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1106 + if (!var3.drawGameObjects) { break; } - } catch (Exception var28) { // L: 1108 - var3.drawGameObjects = false; // L: 1109 + } catch (Exception var28) { + var3.drawGameObjects = false; break; } } - } while(!var3.drawSecondary); // L: 1112 - } while(var3.drawGameObjectEdges != 0); // L: 1113 + } while(!var3.drawSecondary); + } while(var3.drawGameObjectEdges != 0); - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { break; } - var9 = var8[var4 - 1][var5]; // L: 1115 - } while(var9 != null && var9.drawSecondary); // L: 1116 + var9 = var8[var4 - 1][var5]; + } while(var9 != null && var9.drawSecondary); - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { break; } - var9 = var8[var4 + 1][var5]; // L: 1119 - } while(var9 != null && var9.drawSecondary); // L: 1120 + var9 = var8[var4 + 1][var5]; + } while(var9 != null && var9.drawSecondary); - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { break; } - var9 = var8[var4][var5 - 1]; // L: 1123 - } while(var9 != null && var9.drawSecondary); // L: 1124 + var9 = var8[var4][var5 - 1]; + } while(var9 != null && var9.drawSecondary); - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { break; } - var9 = var8[var4][var5 + 1]; // L: 1127 - } while(var9 != null && var9.drawSecondary); // L: 1128 + var9 = var8[var4][var5 + 1]; + } while(var9 != null && var9.drawSecondary); - var3.drawSecondary = false; // L: 1130 - --tileUpdateCount; // L: 1131 - ItemLayer var32 = var3.itemLayer; // L: 1132 - if (var32 != null && var32.height != 0) { // L: 1133 - if (var32.second != null) { // L: 1134 + var3.drawSecondary = false; + --tileUpdateCount; + ItemLayer var32 = var3.itemLayer; + if (var32 != null && var32.height != 0) { + if (var32.second != null) { var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1135 + if (var32.third != null) { var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1136 + if (var32.first != null) { var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field2256 != 0) { // L: 1138 - WallDecoration var29 = var3.wallDecoration; // L: 1139 - if (var29 != null && !this.method4086(var7, var4, var5, var29.renderable1.height)) { // L: 1140 - if ((var29.orientation & var3.field2256) != 0) { // L: 1141 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142 - } else if (var29.orientation == 256) { // L: 1144 - var11 = var29.x - Scene_cameraX; // L: 1145 - var25 = var29.tileHeight - Scene_cameraY; // L: 1146 - var24 = var29.y - Scene_cameraZ; // L: 1147 - var14 = var29.orientation2; // L: 1148 - if (var14 != 1 && var14 != 2) { // L: 1150 - var15 = var11; // L: 1151 + if (var3.field2243 != 0) { + WallDecoration var29 = var3.wallDecoration; + if (var29 != null && !this.method4024(var7, var4, var5, var29.renderable1.height)) { + if ((var29.orientation & var3.field2243) != 0) { + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); + } else if (var29.orientation == 256) { + var11 = var29.x - Scene_cameraX; + var25 = var29.tileHeight - Scene_cameraY; + var24 = var29.y - Scene_cameraZ; + var14 = var29.orientation2; + if (var14 != 1 && var14 != 2) { + var15 = var11; } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1153 - var16 = var24; // L: 1154 + if (var14 != 2 && var14 != 3) { + var16 = var24; } else { var16 = -var24; } - if (var16 >= var15) { // L: 1155 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156 - } else if (var29.renderable2 != null) { // L: 1158 - var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159 + if (var16 >= var15) { + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); + } else if (var29.renderable2 != null) { + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); } } } - BoundaryObject var27 = var3.boundaryObject; // L: 1163 - if (var27 != null) { // L: 1164 - if ((var27.orientationB & var3.field2256) != 0 && !this.method4073(var7, var4, var5, var27.orientationB)) { // L: 1165 + BoundaryObject var27 = var3.boundaryObject; + if (var27 != null) { + if ((var27.orientationB & var3.field2243) != 0 && !this.method4023(var7, var4, var5, var27.orientationB)) { var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2256) != 0 && !this.method4073(var7, var4, var5, var27.orientationA)) { // L: 1166 + if ((var27.orientationA & var3.field2243) != 0 && !this.method4023(var7, var4, var5, var27.orientationA)) { var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { // L: 1169 - var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170 - if (var30 != null && var30.drawSecondary) { // L: 1171 + if (var6 < this.planes - 1) { + var30 = this.tiles[var6 + 1][var4][var5]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { // L: 1173 - var30 = var8[var4 + 1][var5]; // L: 1174 - if (var30 != null && var30.drawSecondary) { // L: 1175 + if (var4 < Scene_cameraXTile) { + var30 = var8[var4 + 1][var5]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { // L: 1177 - var30 = var8[var4][var5 + 1]; // L: 1178 - if (var30 != null && var30.drawSecondary) { // L: 1179 + if (var5 < Scene_cameraYTile) { + var30 = var8[var4][var5 + 1]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { // L: 1181 - var30 = var8[var4 - 1][var5]; // L: 1182 - if (var30 != null && var30.drawSecondary) { // L: 1183 + if (var4 > Scene_cameraXTile) { + var30 = var8[var4 - 1][var5]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { // L: 1185 - var30 = var8[var4][var5 - 1]; // L: 1186 - if (var30 != null && var30.drawSecondary) { // L: 1187 + if (var5 > Scene_cameraYTile) { + var30 = var8[var4][var5 - 1]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } } } - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lhp;IIIIIII)V" + descriptor = "(Lhe;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: 1195 + int var10 = var9 = (var7 << 7) - Scene_cameraX; int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; int var13; - int var14 = var13 = var10 + 128; // L: 1199 + int var14 = var13 = var10 + 128; int var15; - int var16 = var15 = var12 + 128; // L: 1201 - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202 - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203 - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204 - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205 - int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206 - var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207 - var10 = var21; // L: 1208 - var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209 - var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210 - var17 = var21; // L: 1211 - if (var12 >= 50) { // L: 1212 - var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213 - var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214 - var14 = var21; // L: 1215 - var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216 - var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217 - var18 = var21; // L: 1218 - if (var11 >= 50) { // L: 1219 - var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220 - var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221 - var13 = var21; // L: 1222 - var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223 - var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224 - var19 = var21; // L: 1225 - if (var16 >= 50) { // L: 1226 - var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227 - var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228 - var9 = var21; // L: 1229 - var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230 - var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231 - if (var15 >= 50) { // L: 1233 - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234 - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235 - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236 - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237 - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238 - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239 - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240 - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242 + int var16 = var15 = var12 + 128; + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; + int var21 = var10 * var6 + var5 * var12 >> 16; + var12 = var12 * var6 - var5 * var10 >> 16; + var10 = var21; + var21 = var17 * var4 - var3 * var12 >> 16; + var12 = var3 * var17 + var12 * var4 >> 16; + var17 = var21; + if (var12 >= 50) { + var21 = var14 * var6 + var5 * var11 >> 16; + var11 = var11 * var6 - var5 * var14 >> 16; + var14 = var21; + var21 = var18 * var4 - var3 * var11 >> 16; + var11 = var3 * var18 + var11 * var4 >> 16; + var18 = var21; + if (var11 >= 50) { + var21 = var13 * var6 + var5 * var16 >> 16; + var16 = var16 * var6 - var5 * var13 >> 16; + var13 = var21; + var21 = var19 * var4 - var3 * var16 >> 16; + var16 = var3 * var19 + var16 * var4 >> 16; + var19 = var21; + if (var16 >= 50) { + var21 = var9 * var6 + var5 * var15 >> 16; + var15 = var15 * var6 - var5 * var9 >> 16; + var9 = var21; + var21 = var20 * var4 - var3 * var15 >> 16; + var15 = var3 * var20 + var15 * var4 >> 16; + if (var15 >= 50) { + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; + Rasterizer3D.Rasterizer3D_alpha = 0; int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 - Rasterizer3D.field2262 = false; // L: 1244 - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245 - Rasterizer3D.field2262 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { + Rasterizer3D.field2251 = false; + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field2251 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246 - Scene_selectedX = var7; // L: 1247 - Scene_selectedY = var8; // L: 1248 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { + Scene_selectedX = var7; + Scene_selectedY = var8; } - if (var1.texture == -1) { // L: 1250 - if (var1.neColor != 12345678) { // L: 1251 - Rasterizer3D.method3960(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { + if (var1.neColor != 12345678) { + Rasterizer3D.method3905(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1253 - if (var1.isFlat) { // L: 1254 + } else if (!Scene_isLowDetail) { + if (var1.isFlat) { Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255 + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 - Rasterizer3D.method3960(var27, var29, var25, var26, var28, var24, method4113(var30, var1.neColor), method4113(var30, var1.nwColor), method4113(var30, var1.seColor)); // L: 1259 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); + Rasterizer3D.method3905(var27, var29, var25, var26, var28, var24, method4019(var30, var1.neColor), method4019(var30, var1.nwColor), method4019(var30, var1.seColor)); } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 - Rasterizer3D.field2262 = false; // L: 1263 - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264 - Rasterizer3D.field2262 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { + Rasterizer3D.field2251 = false; + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field2251 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265 - Scene_selectedX = var7; // L: 1266 - Scene_selectedY = var8; // L: 1267 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { + Scene_selectedX = var7; + Scene_selectedY = var8; } - if (var1.texture == -1) { // L: 1269 - if (var1.swColor != 12345678) { // L: 1270 - Rasterizer3D.method3960(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { + if (var1.swColor != 12345678) { + Rasterizer3D.method3905(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { // L: 1272 - Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273 + } else if (!Scene_isLowDetail) { + Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 - Rasterizer3D.method3960(var23, var25, var29, var22, var24, var28, method4113(var30, var1.swColor), method4113(var30, var1.seColor), method4113(var30, var1.nwColor)); // L: 1277 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); + Rasterizer3D.method3905(var23, var25, var29, var22, var24, var28, method4019(var30, var1.swColor), method4019(var30, var1.seColor), method4019(var30, var1.nwColor)); } } @@ -1889,566 +1889,566 @@ public class Scene { } } } - } // L: 1280 + } @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lgo;IIIIII)V" + descriptor = "(Lgt;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; // L: 1283 + int var8 = var1.vertexX.length; int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { // L: 1284 - var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285 - var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286 - var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287 - var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288 - var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289 - var10 = var13; // L: 1290 - var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291 - var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292 - if (var12 < 50) { // L: 1294 + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.vertexX[var9] - Scene_cameraX; + var11 = var1.vertexY[var9] - Scene_cameraY; + var12 = var1.vertexZ[var9] - Scene_cameraZ; + var13 = var12 * var4 + var5 * var10 >> 16; + var12 = var5 * var12 - var10 * var4 >> 16; + var10 = var13; + var13 = var3 * var11 - var12 * var2 >> 16; + var12 = var11 * var2 + var3 * var12 >> 16; + if (var12 < 50) { return; } - if (var1.triangleTextureId != null) { // L: 1295 - SceneTileModel.field2413[var9] = var10; // L: 1296 - SceneTileModel.field2414[var9] = var13; // L: 1297 - SceneTileModel.field2404[var9] = var12; // L: 1298 + if (var1.triangleTextureId != null) { + SceneTileModel.field2398[var9] = var10; + SceneTileModel.field2399[var9] = var13; + SceneTileModel.field2400[var9] = var12; } - SceneTileModel.field2410[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 - SceneTileModel.field2412[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 + SceneTileModel.field2396[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + SceneTileModel.field2384[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 - var8 = var1.faceX.length; // L: 1304 + Rasterizer3D.Rasterizer3D_alpha = 0; + var8 = var1.faceX.length; - for (var9 = 0; var9 < var8; ++var9) { // L: 1305 - var10 = var1.faceX[var9]; // L: 1306 - var11 = var1.faceY[var9]; // L: 1307 - var12 = var1.faceZ[var9]; // L: 1308 - var13 = SceneTileModel.field2410[var10]; // L: 1309 - int var14 = SceneTileModel.field2410[var11]; // L: 1310 - int var15 = SceneTileModel.field2410[var12]; // L: 1311 - int var16 = SceneTileModel.field2412[var10]; // L: 1312 - int var17 = SceneTileModel.field2412[var11]; // L: 1313 - int var18 = SceneTileModel.field2412[var12]; // L: 1314 - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 - Rasterizer3D.field2262 = false; // L: 1316 - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317 - Rasterizer3D.field2262 = true; + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.faceX[var9]; + var11 = var1.faceY[var9]; + var12 = var1.faceZ[var9]; + var13 = SceneTileModel.field2396[var10]; + int var14 = SceneTileModel.field2396[var11]; + int var15 = SceneTileModel.field2396[var12]; + int var16 = SceneTileModel.field2384[var10]; + int var17 = SceneTileModel.field2384[var11]; + int var18 = SceneTileModel.field2384[var12]; + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { + Rasterizer3D.field2251 = false; + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field2251 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318 - Scene_selectedX = var6; // L: 1319 - Scene_selectedY = var7; // L: 1320 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { + Scene_selectedX = var6; + Scene_selectedY = var7; } - if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322 - if (!Scene_isLowDetail) { // L: 1326 - if (var1.isFlat) { // L: 1327 - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2413[0], SceneTileModel.field2413[1], SceneTileModel.field2413[3], SceneTileModel.field2414[0], SceneTileModel.field2414[1], SceneTileModel.field2414[3], SceneTileModel.field2404[0], SceneTileModel.field2404[1], SceneTileModel.field2404[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { + if (!Scene_isLowDetail) { + if (var1.isFlat) { + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2398[0], SceneTileModel.field2398[1], SceneTileModel.field2398[3], SceneTileModel.field2399[0], SceneTileModel.field2399[1], SceneTileModel.field2399[3], SceneTileModel.field2400[0], SceneTileModel.field2400[1], SceneTileModel.field2400[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2413[var10], SceneTileModel.field2413[var11], SceneTileModel.field2413[var12], SceneTileModel.field2414[var10], SceneTileModel.field2414[var11], SceneTileModel.field2414[var12], SceneTileModel.field2404[var10], SceneTileModel.field2404[var11], SceneTileModel.field2404[var12], var1.triangleTextureId[var9]); // L: 1328 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2398[var10], SceneTileModel.field2398[var11], SceneTileModel.field2398[var12], SceneTileModel.field2399[var10], SceneTileModel.field2399[var11], SceneTileModel.field2399[var12], SceneTileModel.field2400[var10], SceneTileModel.field2400[var11], SceneTileModel.field2400[var12], var1.triangleTextureId[var9]); } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 - Rasterizer3D.method3960(var16, var17, var18, var13, var14, var15, method4113(var19, var1.triangleColorA[var9]), method4113(var19, var1.triangleColorB[var9]), method4113(var19, var1.triangleColorC[var9])); // L: 1332 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); + Rasterizer3D.method3905(var16, var17, var18, var13, var14, var15, method4019(var19, var1.triangleColorA[var9]), method4019(var19, var1.triangleColorB[var9]), method4019(var19, var1.triangleColorC[var9])); } - } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 - Rasterizer3D.method3960(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { + Rasterizer3D.method3905(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1337 + } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 - Scene_currentOccludersCount = 0; // L: 1366 + int var1 = Scene_planeOccluderCounts[Scene_plane]; + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; + Scene_currentOccludersCount = 0; - for (int var3 = 0; var3 < var1; ++var3) { // L: 1367 - Occluder var4 = var2[var3]; // L: 1368 + for (int var3 = 0; var3 < var1; ++var3) { + Occluder var4 = var2[var3]; int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { // L: 1369 - var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370 - if (var5 >= 0 && var5 <= 50) { // L: 1371 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372 - if (var6 < 0) { // L: 1373 + if (var4.type == 1) { + var5 = var4.minTileX - Scene_cameraXTile + 25; + if (var5 >= 0 && var5 <= 50) { + var6 = var4.minTileY - Scene_cameraYTile + 25; + if (var6 < 0) { var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374 - if (var7 > 50) { // L: 1375 + var7 = var4.maxTileY - Scene_cameraYTile + 25; + if (var7 > 50) { var7 = 50; } - var13 = false; // L: 1376 + var13 = false; - while (var6 <= var7) { // L: 1377 - if (visibleTiles[var5][var6++]) { // L: 1378 - var13 = true; // L: 1379 + while (var6 <= var7) { + if (visibleTiles[var5][var6++]) { + var13 = true; break; } } - if (var13) { // L: 1383 - var9 = Scene_cameraX - var4.minX; // L: 1384 - if (var9 > 32) { // L: 1385 - var4.field2378 = 1; + if (var13) { + var9 = Scene_cameraX - var4.minX; + if (var9 > 32) { + var4.field2365 = 1; } else { - if (var9 >= -32) { // L: 1386 + if (var9 >= -32) { continue; } - var4.field2378 = 2; // L: 1387 - var9 = -var9; // L: 1388 + var4.field2365 = 2; + var9 = -var9; } - var4.field2383 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 - var4.field2382 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 - var4.field2385 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 - var4.field2384 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 + var4.field2368 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field2370 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field2359 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2371 = (var4.maxY - Scene_cameraY << 8) / var9; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } - } else if (var4.type == 2) { // L: 1398 - var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399 - if (var5 >= 0 && var5 <= 50) { // L: 1400 - var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401 - if (var6 < 0) { // L: 1402 + } else if (var4.type == 2) { + var5 = var4.minTileY - Scene_cameraYTile + 25; + if (var5 >= 0 && var5 <= 50) { + var6 = var4.minTileX - Scene_cameraXTile + 25; + if (var6 < 0) { var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403 - if (var7 > 50) { // L: 1404 + var7 = var4.maxTileX - Scene_cameraXTile + 25; + if (var7 > 50) { var7 = 50; } - var13 = false; // L: 1405 + var13 = false; - while (var6 <= var7) { // L: 1406 - if (visibleTiles[var6++][var5]) { // L: 1407 - var13 = true; // L: 1408 + while (var6 <= var7) { + if (visibleTiles[var6++][var5]) { + var13 = true; break; } } - if (var13) { // L: 1412 - var9 = Scene_cameraZ - var4.minZ; // L: 1413 - if (var9 > 32) { // L: 1414 - var4.field2378 = 3; + if (var13) { + var9 = Scene_cameraZ - var4.minZ; + if (var9 > 32) { + var4.field2365 = 3; } else { - if (var9 >= -32) { // L: 1415 + if (var9 >= -32) { continue; } - var4.field2378 = 4; // L: 1416 - var9 = -var9; // L: 1417 + var4.field2365 = 4; + var9 = -var9; } - var4.field2370 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 - var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 - var4.field2385 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 - var4.field2384 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 + var4.field2366 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field2367 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field2359 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2371 = (var4.maxY - Scene_cameraY << 8) / var9; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } - } else if (var4.type == 4) { // L: 1427 - var5 = var4.minY - Scene_cameraY; // L: 1428 - if (var5 > 128) { // L: 1429 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430 - if (var6 < 0) { // L: 1431 + } else if (var4.type == 4) { + var5 = var4.minY - Scene_cameraY; + if (var5 > 128) { + var6 = var4.minTileY - Scene_cameraYTile + 25; + if (var6 < 0) { var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432 - if (var7 > 50) { // L: 1433 + var7 = var4.maxTileY - Scene_cameraYTile + 25; + if (var7 > 50) { var7 = 50; } - if (var6 <= var7) { // L: 1434 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435 - if (var8 < 0) { // L: 1436 + if (var6 <= var7) { + int var8 = var4.minTileX - Scene_cameraXTile + 25; + if (var8 < 0) { var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437 - if (var9 > 50) { // L: 1438 + var9 = var4.maxTileX - Scene_cameraXTile + 25; + if (var9 > 50) { var9 = 50; } - boolean var10 = false; // L: 1439 + boolean var10 = false; - label150: - for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440 - for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441 - if (visibleTiles[var11][var12]) { // L: 1442 - var10 = true; // L: 1443 - break label150; + label149: + for (int var11 = var8; var11 <= var9; ++var11) { + for (int var12 = var6; var12 <= var7; ++var12) { + if (visibleTiles[var11][var12]) { + var10 = true; + break label149; } } } - if (var10) { // L: 1448 - var4.field2378 = 5; // L: 1449 - var4.field2370 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 - var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 - var4.field2383 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 - var4.field2382 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 + if (var10) { + var4.field2365 = 5; + var4.field2366 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field2367 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field2368 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field2370 = (var4.maxZ - Scene_cameraZ << 8) / var5; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } } } } - } // L: 1458 + } - @ObfuscatedName("av") - boolean method4084(int var1, int var2, int var3) { - int var4 = this.field2299[var1][var2][var3]; // L: 1461 - if (var4 == -Scene_drawnCount) { // L: 1462 + @ObfuscatedName("ai") + boolean method4022(int var1, int var2, int var3) { + int var4 = this.field2295[var1][var2][var3]; + if (var4 == -Scene_drawnCount) { return false; - } else if (var4 == Scene_drawnCount) { // L: 1463 + } else if (var4 == Scene_drawnCount) { return true; } else { - int var5 = var2 << 7; // L: 1464 - int var6 = var3 << 7; // L: 1465 - if (this.method4088(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4088(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 - this.field2299[var1][var2][var3] = Scene_drawnCount; // L: 1467 - return true; // L: 1468 + int var5 = var2 << 7; + int var6 = var3 << 7; + if (this.method4026(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4026(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field2295[var1][var2][var3] = Scene_drawnCount; + return true; } else { - this.field2299[var1][var2][var3] = -Scene_drawnCount; // L: 1471 - return false; // L: 1472 - } - } - } - - @ObfuscatedName("ax") - boolean method4073(int var1, int var2, int var3, int var4) { - if (!this.method4084(var1, var2, var3)) { // L: 1477 - return false; - } else { - int var5 = var2 << 7; // L: 1478 - int var6 = var3 << 7; // L: 1479 - int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1480 - int var8 = var7 - 120; // L: 1481 - int var9 = var7 - 230; // L: 1482 - int var10 = var7 - 238; // L: 1483 - if (var4 < 16) { // L: 1484 - if (var4 == 1) { // L: 1485 - if (var5 > Scene_cameraX) { // L: 1486 - if (!this.method4088(var5, var7, var6)) { // L: 1487 - return false; - } - - if (!this.method4088(var5, var7, var6 + 128)) { // L: 1488 - return false; - } - } - - if (var1 > 0) { // L: 1490 - if (!this.method4088(var5, var8, var6)) { // L: 1491 - return false; - } - - if (!this.method4088(var5, var8, var6 + 128)) { // L: 1492 - return false; - } - } - - if (!this.method4088(var5, var9, var6)) { // L: 1494 - return false; - } - - if (!this.method4088(var5, var9, var6 + 128)) { // L: 1495 - return false; - } - - return true; // L: 1496 - } - - if (var4 == 2) { // L: 1498 - if (var6 < Scene_cameraZ) { // L: 1499 - if (!this.method4088(var5, var7, var6 + 128)) { // L: 1500 - return false; - } - - if (!this.method4088(var5 + 128, var7, var6 + 128)) { // L: 1501 - return false; - } - } - - if (var1 > 0) { // L: 1503 - if (!this.method4088(var5, var8, var6 + 128)) { // L: 1504 - return false; - } - - if (!this.method4088(var5 + 128, var8, var6 + 128)) { // L: 1505 - return false; - } - } - - if (!this.method4088(var5, var9, var6 + 128)) { // L: 1507 - return false; - } - - if (!this.method4088(var5 + 128, var9, var6 + 128)) { // L: 1508 - return false; - } - - return true; // L: 1509 - } - - if (var4 == 4) { // L: 1511 - if (var5 < Scene_cameraX) { // L: 1512 - if (!this.method4088(var5 + 128, var7, var6)) { // L: 1513 - return false; - } - - if (!this.method4088(var5 + 128, var7, var6 + 128)) { // L: 1514 - return false; - } - } - - if (var1 > 0) { // L: 1516 - if (!this.method4088(var5 + 128, var8, var6)) { // L: 1517 - return false; - } - - if (!this.method4088(var5 + 128, var8, var6 + 128)) { // L: 1518 - return false; - } - } - - if (!this.method4088(var5 + 128, var9, var6)) { // L: 1520 - return false; - } - - if (!this.method4088(var5 + 128, var9, var6 + 128)) { // L: 1521 - return false; - } - - return true; // L: 1522 - } - - if (var4 == 8) { // L: 1524 - if (var6 > Scene_cameraZ) { // L: 1525 - if (!this.method4088(var5, var7, var6)) { // L: 1526 - return false; - } - - if (!this.method4088(var5 + 128, var7, var6)) { // L: 1527 - return false; - } - } - - if (var1 > 0) { // L: 1529 - if (!this.method4088(var5, var8, var6)) { // L: 1530 - return false; - } - - if (!this.method4088(var5 + 128, var8, var6)) { // L: 1531 - return false; - } - } - - if (!this.method4088(var5, var9, var6)) { // L: 1533 - return false; - } - - if (!this.method4088(var5 + 128, var9, var6)) { // L: 1534 - return false; - } - - return true; // L: 1535 - } - } - - if (!this.method4088(var5 + 64, var10, var6 + 64)) { // L: 1538 + this.field2295[var1][var2][var3] = -Scene_drawnCount; return false; - } else if (var4 == 16) { // L: 1539 - return this.method4088(var5, var9, var6 + 128); // L: 1540 - } else if (var4 == 32) { // L: 1543 - return this.method4088(var5 + 128, var9, var6 + 128); // L: 1544 - } else if (var4 == 64) { // L: 1547 - return this.method4088(var5 + 128, var9, var6); // L: 1548 - } else if (var4 == 128) { // L: 1551 - return this.method4088(var5, var9, var6); // L: 1552 - } else { - return true; // L: 1555 } } } - @ObfuscatedName("ar") - boolean method4086(int var1, int var2, int var3, int var4) { - if (!this.method4084(var1, var2, var3)) { // L: 1559 + @ObfuscatedName("ad") + boolean method4023(int var1, int var2, int var3, int var4) { + if (!this.method4022(var1, var2, var3)) { return false; } else { - int var5 = var2 << 7; // L: 1560 - int var6 = var3 << 7; // L: 1561 - return this.method4088(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4088(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 + int var5 = var2 << 7; + int var6 = var3 << 7; + int var7 = this.tileHeights[var1][var2][var3] - 1; + int var8 = var7 - 120; + int var9 = var7 - 230; + int var10 = var7 - 238; + if (var4 < 16) { + if (var4 == 1) { + if (var5 > Scene_cameraX) { + if (!this.method4026(var5, var7, var6)) { + return false; + } + + if (!this.method4026(var5, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method4026(var5, var8, var6)) { + return false; + } + + if (!this.method4026(var5, var8, var6 + 128)) { + return false; + } + } + + if (!this.method4026(var5, var9, var6)) { + return false; + } + + if (!this.method4026(var5, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 2) { + if (var6 < Scene_cameraZ) { + if (!this.method4026(var5, var7, var6 + 128)) { + return false; + } + + if (!this.method4026(var5 + 128, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method4026(var5, var8, var6 + 128)) { + return false; + } + + if (!this.method4026(var5 + 128, var8, var6 + 128)) { + return false; + } + } + + if (!this.method4026(var5, var9, var6 + 128)) { + return false; + } + + if (!this.method4026(var5 + 128, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 4) { + if (var5 < Scene_cameraX) { + if (!this.method4026(var5 + 128, var7, var6)) { + return false; + } + + if (!this.method4026(var5 + 128, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method4026(var5 + 128, var8, var6)) { + return false; + } + + if (!this.method4026(var5 + 128, var8, var6 + 128)) { + return false; + } + } + + if (!this.method4026(var5 + 128, var9, var6)) { + return false; + } + + if (!this.method4026(var5 + 128, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 8) { + if (var6 > Scene_cameraZ) { + if (!this.method4026(var5, var7, var6)) { + return false; + } + + if (!this.method4026(var5 + 128, var7, var6)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method4026(var5, var8, var6)) { + return false; + } + + if (!this.method4026(var5 + 128, var8, var6)) { + return false; + } + } + + if (!this.method4026(var5, var9, var6)) { + return false; + } + + if (!this.method4026(var5 + 128, var9, var6)) { + return false; + } + + return true; + } + } + + if (!this.method4026(var5 + 64, var10, var6 + 64)) { + return false; + } else if (var4 == 16) { + return this.method4026(var5, var9, var6 + 128); + } else if (var4 == 32) { + return this.method4026(var5 + 128, var9, var6 + 128); + } else if (var4 == 64) { + return this.method4026(var5 + 128, var9, var6); + } else if (var4 == 128) { + return this.method4026(var5, var9, var6); + } else { + return true; + } } } - @ObfuscatedName("af") - boolean method4087(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("ac") + boolean method4024(int var1, int var2, int var3, int var4) { + if (!this.method4022(var1, var2, var3)) { + return false; + } else { + int var5 = var2 << 7; + int var6 = var3 << 7; + return this.method4026(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4026(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + } + } + + @ObfuscatedName("aw") + boolean method4096(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1567 - if (!this.method4084(var1, var2, var4)) { // L: 1568 + if (var3 == var2 && var5 == var4) { + if (!this.method4022(var1, var2, var4)) { return false; } else { - var7 = var2 << 7; // L: 1569 - var8 = var4 << 7; // L: 1570 - return this.method4088(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4088(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4088(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4088(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 + var7 = var2 << 7; + var8 = var4 << 7; + return this.method4026(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4026(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4026(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4026(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { - for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 - for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 - if (this.field2299[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 + for (var7 = var2; var7 <= var3; ++var7) { + for (var8 = var4; var8 <= var5; ++var8) { + if (this.field2295[var1][var7][var8] == -Scene_drawnCount) { return false; } } } - var7 = (var2 << 7) + 1; // L: 1579 - var8 = (var4 << 7) + 2; // L: 1580 - int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 - if (!this.method4088(var7, var9, var8)) { // L: 1582 + var7 = (var2 << 7) + 1; + var8 = (var4 << 7) + 2; + int var9 = this.tileHeights[var1][var2][var4] - var6; + if (!this.method4026(var7, var9, var8)) { return false; } else { - int var10 = (var3 << 7) - 1; // L: 1583 - if (!this.method4088(var10, var9, var8)) { // L: 1584 + int var10 = (var3 << 7) - 1; + if (!this.method4026(var10, var9, var8)) { return false; } else { - int var11 = (var5 << 7) - 1; // L: 1585 - if (!this.method4088(var7, var9, var11)) { // L: 1586 + int var11 = (var5 << 7) - 1; + if (!this.method4026(var7, var9, var11)) { return false; - } else if (!this.method4088(var10, var9, var11)) { // L: 1587 + } else if (!this.method4026(var10, var9, var11)) { return false; } else { - return true; // L: 1588 + return true; } } } } } - @ObfuscatedName("bq") - boolean method4088(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 - Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 + @ObfuscatedName("bt") + boolean method4026(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { + Occluder var5 = Scene_currentOccluders[var4]; int var6; int var7; int var8; int var9; int var10; - if (var5.field2378 == 1) { // L: 1594 - var6 = var5.minX - var1; // L: 1595 - if (var6 > 0) { // L: 1596 - var7 = (var6 * var5.field2383 >> 8) + var5.minZ; // L: 1597 - var8 = (var6 * var5.field2382 >> 8) + var5.maxZ; // L: 1598 - var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1599 - var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1600 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 + if (var5.field2365 == 1) { + var6 = var5.minX - var1; + if (var6 > 0) { + var7 = (var6 * var5.field2368 >> 8) + var5.minZ; + var8 = (var6 * var5.field2370 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2359 >> 8) + var5.minY; + var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 2) { // L: 1605 - var6 = var1 - var5.minX; // L: 1606 - if (var6 > 0) { // L: 1607 - var7 = (var6 * var5.field2383 >> 8) + var5.minZ; // L: 1608 - var8 = (var6 * var5.field2382 >> 8) + var5.maxZ; // L: 1609 - var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1610 - var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1611 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 + } else if (var5.field2365 == 2) { + var6 = var1 - var5.minX; + if (var6 > 0) { + var7 = (var6 * var5.field2368 >> 8) + var5.minZ; + var8 = (var6 * var5.field2370 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2359 >> 8) + var5.minY; + var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 3) { // L: 1616 - var6 = var5.minZ - var3; // L: 1617 - if (var6 > 0) { // L: 1618 - var7 = (var6 * var5.field2370 >> 8) + var5.minX; // L: 1619 - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1620 - var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1621 - var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1622 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 + } else if (var5.field2365 == 3) { + var6 = var5.minZ - var3; + if (var6 > 0) { + var7 = (var6 * var5.field2366 >> 8) + var5.minX; + var8 = (var6 * var5.field2367 >> 8) + var5.maxX; + var9 = (var6 * var5.field2359 >> 8) + var5.minY; + var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 4) { // L: 1627 - var6 = var3 - var5.minZ; // L: 1628 - if (var6 > 0) { // L: 1629 - var7 = (var6 * var5.field2370 >> 8) + var5.minX; // L: 1630 - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1631 - var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1632 - var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1633 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 + } else if (var5.field2365 == 4) { + var6 = var3 - var5.minZ; + if (var6 > 0) { + var7 = (var6 * var5.field2366 >> 8) + var5.minX; + var8 = (var6 * var5.field2367 >> 8) + var5.maxX; + var9 = (var6 * var5.field2359 >> 8) + var5.minY; + var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 5) { // L: 1638 - var6 = var2 - var5.minY; // L: 1639 - if (var6 > 0) { // L: 1640 - var7 = (var6 * var5.field2370 >> 8) + var5.minX; // L: 1641 - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1642 - var9 = (var6 * var5.field2383 >> 8) + var5.minZ; // L: 1643 - var10 = (var6 * var5.field2382 >> 8) + var5.maxZ; // L: 1644 - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 + } else if (var5.field2365 == 5) { + var6 = var2 - var5.minY; + if (var6 > 0) { + var7 = (var6 * var5.field2366 >> 8) + var5.minX; + var8 = (var6 * var5.field2367 >> 8) + var5.maxX; + var9 = (var6 * var5.field2368 >> 8) + var5.minZ; + var10 = (var6 * var5.field2370 >> 8) + var5.maxZ; + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } } } } - return false; // L: 1650 + return false; } - @ObfuscatedName("y") + @ObfuscatedName("j") @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: 149 - var8.minTileX = var2 / 128; // L: 150 - var8.maxTileX = var3 / 128; // L: 151 - var8.minTileY = var4 / 128; // L: 152 - var8.maxTileY = var5 / 128; // L: 153 - var8.type = var1; // L: 154 - var8.minX = var2; // L: 155 - var8.maxX = var3; // L: 156 - var8.minZ = var4; // L: 157 - var8.maxZ = var5; // L: 158 - var8.minY = var6; // L: 159 - var8.maxY = var7; // L: 160 - Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161 - } // L: 162 + Occluder var8 = new Occluder(); + var8.minTileX = var2 / 128; + var8.maxTileX = var3 / 128; + var8.minTileY = var4 / 128; + var8.maxTileY = var5 / 128; + var8.type = var1; + var8.minX = var2; + var8.maxX = var3; + var8.minZ = var4; + var8.maxZ = var5; + var8.minY = var6; + var8.maxY = var7; + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; + } - @ObfuscatedName("aq") + @ObfuscatedName("av") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; // L: 638 - Scene_viewportYMin = 0; // L: 639 - Scene_viewportXMax = var3; // L: 640 - Scene_viewportYMax = var4; // L: 641 - Scene_viewportXCenter = var3 / 2; // L: 642 - Scene_viewportYCenter = var4 / 2; // L: 643 - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644 + Scene_viewportXMin = 0; + Scene_viewportYMin = 0; + Scene_viewportXMax = var3; + Scene_viewportYMax = var4; + Scene_viewportXCenter = var3 / 2; + Scene_viewportYCenter = var4 / 2; + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; int var6; int var7; @@ -2456,135 +2456,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645 - for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650 - var8 = (var6 - 128) / 32; // L: 651 - var9 = var7 / 64; // L: 652 + for (var6 = 128; var6 <= 383; var6 += 32) { + for (var7 = 0; var7 < 2048; var7 += 64) { + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; + var8 = (var6 - 128) / 32; + var9 = var7 / 64; - for (int var10 = -26; var10 < 26; ++var10) { // L: 653 - for (var11 = -26; var11 < 26; ++var11) { // L: 654 - var12 = var10 * 128; // L: 655 - int var13 = var11 * 128; // L: 656 - boolean var14 = false; // L: 657 + for (int var10 = -26; var10 < 26; ++var10) { + for (var11 = -26; var11 < 26; ++var11) { + var12 = var10 * 128; + int var13 = var11 * 128; + boolean var14 = false; - for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 - if (method4072(var12, var0[var8] + var15, var13)) { // L: 659 - var14 = true; // L: 660 + for (int var15 = -var1; var15 <= var2; var15 += 128) { + if (method4141(var12, var0[var8] + var15, var13)) { + var14 = true; break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; } } } } - for (var6 = 0; var6 < 8; ++var6) { // L: 669 - for (var7 = 0; var7 < 32; ++var7) { // L: 670 - for (var8 = -25; var8 < 25; ++var8) { // L: 671 - for (var9 = -25; var9 < 25; ++var9) { // L: 672 - boolean var16 = false; // L: 673 + for (var6 = 0; var6 < 8; ++var6) { + for (var7 = 0; var7 < 32; ++var7) { + for (var8 = -25; var8 < 25; ++var8) { + for (var9 = -25; var9 < 25; ++var9) { + boolean var16 = false; - label84: - for (var11 = -1; var11 <= 1; ++var11) { // L: 674 - for (var12 = -1; var12 <= 1; ++var12) { // L: 675 - if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676 - var16 = true; // L: 677 - break label84; + label85: + for (var11 = -1; var11 <= 1; ++var11) { + for (var12 = -1; var12 <= 1; ++var12) { + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; + break label85; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680 - var16 = true; // L: 681 - break label84; // L: 682 + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; + break label85; } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684 - var16 = true; // L: 685 - break label84; // L: 686 + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; + break label85; } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688 - var16 = true; // L: 689 - break label84; // L: 690 + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; + break label85; } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; } } } } - } // L: 699 + } - @ObfuscatedName("ae") - static boolean method4072(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702 - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703 - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704 - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 705 - if (var5 >= 50 && var5 <= 3500) { // L: 706 - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 707 - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 708 - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 709 + @ObfuscatedName("as") + static boolean method4141(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; + if (var5 >= 50 && var5 <= 3500) { + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; } else { - return false; // L: 710 + return false; } } - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 729 + return viewportWalking && Scene_selectedX != -1; } @ObfuscatedName("aj") - public static void method4069() { - Scene_selectedX = -1; // L: 733 - viewportWalking = false; // L: 734 - } // L: 735 + public static void method4014() { + Scene_selectedX = -1; + viewportWalking = false; + } - @ObfuscatedName("am") - static final int method4113(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1340 - if (var1 < 2) { // L: 1341 + @ObfuscatedName("ap") + static final int method4019(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 1342 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 1343 + return (var0 & 65408) + var1; } - @ObfuscatedName("aa") + @ObfuscatedName("ah") @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: 1347 + if (var1 < var2 && var1 < var3 && var1 < var4) { return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351 - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352 - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353 - if (var8 == 0) { // L: 1354 - if (var9 != 0) { // L: 1357 - return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358 + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); + if (var8 == 0) { + if (var9 != 0) { + return var9 < 0 ? var10 <= 0 : var10 >= 0; } else { - return true; // L: 1360 + return true; } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 18c616b6d5..75e6eabbf4 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,102 +2,102 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("go") +@ObfuscatedName("gt") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("t") - static int[] field2410; - @ObfuscatedName("x") - static int[] field2412; - @ObfuscatedName("u") - static int[] field2413; @ObfuscatedName("q") - static int[] field2414; - @ObfuscatedName("s") - static int[] field2404; - @ObfuscatedName("p") - static final int[][] field2416; + static int[] field2396; + @ObfuscatedName("u") + static int[] field2384; + @ObfuscatedName("e") + static int[] field2398; @ObfuscatedName("c") - static final int[][] field2396; - @ObfuscatedName("f") + static int[] field2399; + @ObfuscatedName("i") + static int[] field2400; + @ObfuscatedName("m") + static final int[][] field2397; + @ObfuscatedName("b") + static final int[][] field2402; + @ObfuscatedName("s") @Export("vertexX") int[] vertexX; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("vertexY") int[] vertexY; @ObfuscatedName("v") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("faceX") int[] faceX; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("faceY") int[] faceY; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("faceZ") int[] faceZ; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("isFlat") boolean isFlat; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("shape") int shape; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("rotation") int rotation; @ObfuscatedName("k") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("overlayRgb") int overlayRgb; static { - field2410 = new int[6]; // L: 21 - field2412 = new int[6]; // L: 22 - field2413 = new int[6]; // L: 23 - field2414 = new int[6]; // L: 24 - field2404 = new int[6]; // L: 25 - field2416 = 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 - field2396 = 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 + field2396 = new int[6]; + field2384 = new int[6]; + field2398 = new int[6]; + field2399 = new int[6]; + field2400 = new int[6]; + field2397 = 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}}; + field2402 = 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}}; } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { - this.isFlat = true; // L: 16 - if (var7 != var6 || var8 != var6 || var9 != var6) { // L: 58 + this.isFlat = true; + if (var7 != var6 || var8 != var6 || var9 != var6) { this.isFlat = false; } - this.shape = var1; // L: 59 - this.rotation = var2; // L: 60 - this.underlayRgb = var18; // L: 61 - this.overlayRgb = var19; // L: 62 - short var20 = 128; // L: 63 - int var21 = var20 / 2; // L: 64 - int var22 = var20 / 4; // L: 65 - int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field2416[var1]; // L: 67 - int var25 = var24.length; // L: 68 - this.vertexX = new int[var25]; // L: 69 - this.vertexY = new int[var25]; // L: 70 - this.vertexZ = new int[var25]; // L: 71 - int[] var26 = new int[var25]; // L: 72 - int[] var27 = new int[var25]; // L: 73 - int var28 = var20 * var4; // L: 74 - int var29 = var5 * var20; // L: 75 + this.shape = var1; + this.rotation = var2; + this.underlayRgb = var18; + this.overlayRgb = var19; + short var20 = 128; + int var21 = var20 / 2; + int var22 = var20 / 4; + int var23 = var20 * 3 / 4; + int[] var24 = field2397[var1]; + int var25 = var24.length; + this.vertexX = new int[var25]; + this.vertexY = new int[var25]; + this.vertexZ = new int[var25]; + int[] var26 = new int[var25]; + int[] var27 = new int[var25]; + int var28 = var20 * var4; + int var29 = var5 * var20; int var31; int var32; @@ -105,204 +105,204 @@ public final class SceneTileModel { int var34; int var35; int var36; - for (int var30 = 0; var30 < var25; ++var30) { // L: 76 - var31 = var24[var30]; // L: 77 - if ((var31 & 1) == 0 && var31 <= 8) { // L: 78 + for (int var30 = 0; var30 < var25; ++var30) { + var31 = var24[var30]; + if ((var31 & 1) == 0 && var31 <= 8) { var31 = (var31 - var2 - var2 - 1 & 7) + 1; } - if (var31 > 8 && var31 <= 12) { // L: 79 + if (var31 > 8 && var31 <= 12) { var31 = (var31 - 9 - var2 & 3) + 9; } - if (var31 > 12 && var31 <= 16) { // L: 80 + if (var31 > 12 && var31 <= 16) { var31 = (var31 - 13 - var2 & 3) + 13; } - if (var31 == 1) { // L: 86 - var32 = var28; // L: 87 - var33 = var29; // L: 88 - var34 = var6; // L: 89 - var35 = var10; // L: 90 - var36 = var14; // L: 91 - } else if (var31 == 2) { // L: 93 - var32 = var28 + var21; // L: 94 - var33 = var29; // L: 95 - var34 = var7 + var6 >> 1; // L: 96 - var35 = var11 + var10 >> 1; // L: 97 - var36 = var15 + var14 >> 1; // L: 98 - } else if (var31 == 3) { // L: 100 - var32 = var28 + var20; // L: 101 - var33 = var29; // L: 102 - var34 = var7; // L: 103 - var35 = var11; // L: 104 - var36 = var15; // L: 105 - } else if (var31 == 4) { // L: 107 - var32 = var28 + var20; // L: 108 - var33 = var29 + var21; // L: 109 - var34 = var8 + var7 >> 1; // L: 110 - var35 = var11 + var12 >> 1; // L: 111 - var36 = var15 + var16 >> 1; // L: 112 - } else if (var31 == 5) { // L: 114 - var32 = var28 + var20; // L: 115 - var33 = var29 + var20; // L: 116 - var34 = var8; // L: 117 - var35 = var12; // L: 118 - var36 = var16; // L: 119 - } else if (var31 == 6) { // L: 121 - var32 = var28 + var21; // L: 122 - var33 = var29 + var20; // L: 123 - var34 = var8 + var9 >> 1; // L: 124 - var35 = var13 + var12 >> 1; // L: 125 - var36 = var17 + var16 >> 1; // L: 126 - } else if (var31 == 7) { // L: 128 - var32 = var28; // L: 129 - var33 = var29 + var20; // L: 130 - var34 = var9; // L: 131 - var35 = var13; // L: 132 - var36 = var17; // L: 133 - } else if (var31 == 8) { // L: 135 - var32 = var28; // L: 136 - var33 = var29 + var21; // L: 137 - var34 = var9 + var6 >> 1; // L: 138 - var35 = var13 + var10 >> 1; // L: 139 - var36 = var17 + var14 >> 1; // L: 140 - } else if (var31 == 9) { // L: 142 - var32 = var28 + var21; // L: 143 - var33 = var29 + var22; // L: 144 - var34 = var7 + var6 >> 1; // L: 145 - var35 = var11 + var10 >> 1; // L: 146 - var36 = var15 + var14 >> 1; // L: 147 - } else if (var31 == 10) { // L: 149 - var32 = var28 + var23; // L: 150 - var33 = var29 + var21; // L: 151 - var34 = var8 + var7 >> 1; // L: 152 - var35 = var11 + var12 >> 1; // L: 153 - var36 = var15 + var16 >> 1; // L: 154 - } else if (var31 == 11) { // L: 156 - var32 = var28 + var21; // L: 157 - var33 = var29 + var23; // L: 158 - var34 = var8 + var9 >> 1; // L: 159 - var35 = var13 + var12 >> 1; // L: 160 - var36 = var17 + var16 >> 1; // L: 161 - } else if (var31 == 12) { // L: 163 - var32 = var28 + var22; // L: 164 - var33 = var29 + var21; // L: 165 - var34 = var9 + var6 >> 1; // L: 166 - var35 = var13 + var10 >> 1; // L: 167 - var36 = var17 + var14 >> 1; // L: 168 - } else if (var31 == 13) { // L: 170 - var32 = var28 + var22; // L: 171 - var33 = var29 + var22; // L: 172 - var34 = var6; // L: 173 - var35 = var10; // L: 174 - var36 = var14; // L: 175 - } else if (var31 == 14) { // L: 177 - var32 = var28 + var23; // L: 178 - var33 = var29 + var22; // L: 179 - var34 = var7; // L: 180 - var35 = var11; // L: 181 - var36 = var15; // L: 182 - } else if (var31 == 15) { // L: 184 - var32 = var28 + var23; // L: 185 - var33 = var29 + var23; // L: 186 - var34 = var8; // L: 187 - var35 = var12; // L: 188 - var36 = var16; // L: 189 + if (var31 == 1) { + var32 = var28; + var33 = var29; + var34 = var6; + var35 = var10; + var36 = var14; + } else if (var31 == 2) { + var32 = var28 + var21; + var33 = var29; + var34 = var7 + var6 >> 1; + var35 = var11 + var10 >> 1; + var36 = var15 + var14 >> 1; + } else if (var31 == 3) { + var32 = var28 + var20; + var33 = var29; + var34 = var7; + var35 = var11; + var36 = var15; + } else if (var31 == 4) { + var32 = var28 + var20; + var33 = var29 + var21; + var34 = var8 + var7 >> 1; + var35 = var11 + var12 >> 1; + var36 = var15 + var16 >> 1; + } else if (var31 == 5) { + var32 = var28 + var20; + var33 = var29 + var20; + var34 = var8; + var35 = var12; + var36 = var16; + } else if (var31 == 6) { + var32 = var28 + var21; + var33 = var29 + var20; + var34 = var8 + var9 >> 1; + var35 = var13 + var12 >> 1; + var36 = var17 + var16 >> 1; + } else if (var31 == 7) { + var32 = var28; + var33 = var29 + var20; + var34 = var9; + var35 = var13; + var36 = var17; + } else if (var31 == 8) { + var32 = var28; + var33 = var29 + var21; + var34 = var9 + var6 >> 1; + var35 = var13 + var10 >> 1; + var36 = var17 + var14 >> 1; + } else if (var31 == 9) { + var32 = var28 + var21; + var33 = var29 + var22; + var34 = var7 + var6 >> 1; + var35 = var11 + var10 >> 1; + var36 = var15 + var14 >> 1; + } else if (var31 == 10) { + var32 = var28 + var23; + var33 = var29 + var21; + var34 = var8 + var7 >> 1; + var35 = var11 + var12 >> 1; + var36 = var15 + var16 >> 1; + } else if (var31 == 11) { + var32 = var28 + var21; + var33 = var29 + var23; + var34 = var8 + var9 >> 1; + var35 = var13 + var12 >> 1; + var36 = var17 + var16 >> 1; + } else if (var31 == 12) { + var32 = var28 + var22; + var33 = var29 + var21; + var34 = var9 + var6 >> 1; + var35 = var13 + var10 >> 1; + var36 = var17 + var14 >> 1; + } else if (var31 == 13) { + var32 = var28 + var22; + var33 = var29 + var22; + var34 = var6; + var35 = var10; + var36 = var14; + } else if (var31 == 14) { + var32 = var28 + var23; + var33 = var29 + var22; + var34 = var7; + var35 = var11; + var36 = var15; + } else if (var31 == 15) { + var32 = var28 + var23; + var33 = var29 + var23; + var34 = var8; + var35 = var12; + var36 = var16; } else { - var32 = var28 + var22; // L: 192 - var33 = var29 + var23; // L: 193 - var34 = var9; // L: 194 - var35 = var13; // L: 195 - var36 = var17; // L: 196 + var32 = var28 + var22; + var33 = var29 + var23; + var34 = var9; + var35 = var13; + var36 = var17; } - this.vertexX[var30] = var32; // L: 198 - this.vertexY[var30] = var34; // L: 199 - this.vertexZ[var30] = var33; // L: 200 - var26[var30] = var35; // L: 201 - var27[var30] = var36; // L: 202 + this.vertexX[var30] = var32; + this.vertexY[var30] = var34; + this.vertexZ[var30] = var33; + var26[var30] = var35; + var27[var30] = var36; } - int[] var38 = field2396[var1]; // L: 204 - var31 = var38.length / 4; // L: 205 - this.faceX = new int[var31]; // L: 206 - this.faceY = new int[var31]; // L: 207 - this.faceZ = new int[var31]; // L: 208 - this.triangleColorA = new int[var31]; // L: 209 - this.triangleColorB = new int[var31]; // L: 210 - this.triangleColorC = new int[var31]; // L: 211 - if (var3 != -1) { // L: 212 + int[] var38 = field2402[var1]; + var31 = var38.length / 4; + this.faceX = new int[var31]; + this.faceY = new int[var31]; + this.faceZ = new int[var31]; + this.triangleColorA = new int[var31]; + this.triangleColorB = new int[var31]; + this.triangleColorC = new int[var31]; + if (var3 != -1) { this.triangleTextureId = new int[var31]; } - var32 = 0; // L: 213 + var32 = 0; - for (var33 = 0; var33 < var31; ++var33) { // L: 214 - var34 = var38[var32]; // L: 215 - var35 = var38[var32 + 1]; // L: 216 - var36 = var38[var32 + 2]; // L: 217 - int var37 = var38[var32 + 3]; // L: 218 - var32 += 4; // L: 219 - if (var35 < 4) { // L: 220 + for (var33 = 0; var33 < var31; ++var33) { + var34 = var38[var32]; + var35 = var38[var32 + 1]; + var36 = var38[var32 + 2]; + int var37 = var38[var32 + 3]; + var32 += 4; + if (var35 < 4) { var35 = var35 - var2 & 3; } - if (var36 < 4) { // L: 221 + if (var36 < 4) { var36 = var36 - var2 & 3; } - if (var37 < 4) { // L: 222 + if (var37 < 4) { var37 = var37 - var2 & 3; } - this.faceX[var33] = var35; // L: 223 - this.faceY[var33] = var36; // L: 224 - this.faceZ[var33] = var37; // L: 225 - if (var34 == 0) { // L: 226 - this.triangleColorA[var33] = var26[var35]; // L: 227 - this.triangleColorB[var33] = var26[var36]; // L: 228 - this.triangleColorC[var33] = var26[var37]; // L: 229 - if (this.triangleTextureId != null) { // L: 230 + this.faceX[var33] = var35; + this.faceY[var33] = var36; + this.faceZ[var33] = var37; + if (var34 == 0) { + this.triangleColorA[var33] = var26[var35]; + this.triangleColorB[var33] = var26[var36]; + this.triangleColorC[var33] = var26[var37]; + if (this.triangleTextureId != null) { this.triangleTextureId[var33] = -1; } } else { - this.triangleColorA[var33] = var27[var35]; // L: 233 - this.triangleColorB[var33] = var27[var36]; // L: 234 - this.triangleColorC[var33] = var27[var37]; // L: 235 - if (this.triangleTextureId != null) { // L: 236 + this.triangleColorA[var33] = var27[var35]; + this.triangleColorB[var33] = var27[var36]; + this.triangleColorC[var33] = var27[var37]; + if (this.triangleTextureId != null) { this.triangleTextureId[var33] = var3; } } } - var33 = var6; // L: 239 - var34 = var7; // L: 240 - if (var7 < var6) { // L: 241 + var33 = var6; + var34 = var7; + if (var7 < var6) { var33 = var7; } - if (var7 > var7) { // L: 242 + if (var7 > var7) { var34 = var7; } - if (var8 < var33) { // L: 243 + if (var8 < var33) { var33 = var8; } - if (var8 > var34) { // L: 244 + if (var8 > var34) { var34 = var8; } - if (var9 < var33) { // L: 245 + if (var9 < var33) { var33 = var9; } - if (var9 > var34) { // L: 246 + if (var9 > var34) { var34 = var9; } - var33 /= 14; // L: 247 - var34 /= 14; // L: 248 - } // L: 249 + var33 /= 14; + var34 /= 14; + } } diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index 6241cd250c..e6444aa188 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -2,58 +2,242 @@ 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("hp") +@ObfuscatedName("he") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1060365903 + intValue = -88650323 ) @Export("swColor") int swColor; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1024115467 + intValue = -1332576457 ) @Export("seColor") int seColor; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1904939773 + intValue = -1142944653 ) @Export("neColor") int neColor; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2128770803 + intValue = -1931362483 ) @Export("nwColor") int nwColor; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1045696483 + intValue = -1331962247 ) @Export("texture") int texture; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("isFlat") boolean isFlat; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 437021985 + intValue = 929370087 ) @Export("rgb") int rgb; 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.rgb = var6; // L: 18 - this.isFlat = var7; // L: 19 - } // L: 20 + this.isFlat = true; + this.swColor = var1; + this.seColor = var2; + this.neColor = var3; + this.nwColor = var4; + this.texture = var5; + this.rgb = var6; + this.isFlat = var7; + } + + @ObfuscatedName("s") + public static final void method4322(long var0) { + if (var0 > 0L) { + if (0L == var0 % 10L) { + WorldMapDecorationType.method4881(var0 - 1L); + WorldMapDecorationType.method4881(1L); + } else { + WorldMapDecorationType.method4881(var0); + } + + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "490227479" + ) + static int method4323(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = KeyHandler.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = KeyHandler.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = KeyHandler.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = KeyHandler.ItemDefinition_get(var3); + if (var7.noteTemplate == -1 && var7.note >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = KeyHandler.ItemDefinition_get(var3); + if (var7.noteTemplate >= 0 && var7.note >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = KeyHandler.ItemDefinition_get(var3); + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = KeyHandler.ItemDefinition_get(var3); + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var6 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + WorldMapSection1.findItemDefinitions(var6, var4 == 1); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BoundaryObject.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + TileItem.foundItemIndex = 0; + return 1; + } else if (var0 == 4213) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = KeyHandler.ItemDefinition_get(var3).getShiftClickIndex(); + if (var4 == -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; + } + + return 1; + } else { + return 2; + } + } else { + if (NPC.foundItemIds != null && TileItem.foundItemIndex < BoundaryObject.foundItemIdCount) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPC.foundItemIds[++TileItem.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } + } + } + + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static final void method4321() { + boolean var0 = false; + + while (!var0) { + var0 = true; + + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { + String var2 = Client.menuTargets[var1]; + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; + Client.menuTargets[var1 + 1] = var2; + String var3 = Client.menuActions[var1]; + Client.menuActions[var1] = Client.menuActions[var1 + 1]; + Client.menuActions[var1 + 1] = var3; + int var4 = Client.menuOpcodes[var1]; + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; + Client.menuOpcodes[var1 + 1] = var4; + var4 = Client.menuArguments1[var1]; + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; + Client.menuArguments1[var1 + 1] = var4; + var4 = Client.menuArguments2[var1]; + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; + Client.menuArguments2[var1 + 1] = var4; + var4 = Client.menuIdentifiers[var1]; + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; + Client.menuIdentifiers[var1 + 1] = var4; + boolean var5 = Client.menuShiftClick[var1]; + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; + Client.menuShiftClick[var1 + 1] = var5; + var0 = false; + } + } + } + + } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index dace251cb2..541f95544a 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,99 +4,94 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("bd") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("e") - String field1069; + @ObfuscatedName("h") + public static boolean field877; + @ObfuscatedName("ac") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" + ) + static Client client; + @ObfuscatedName("t") + String field862; @ObfuscatedName("v") @Export("opcodes") int[] opcodes; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("intOperands") int[] intOperands; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1160704097 + intValue = 1660927915 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 622564641 + intValue = -2081440793 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2125275351 + intValue = -502913765 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1075522957 + intValue = -1150919323 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lmo;" + descriptor = "[Lmc;" ) @Export("switches") IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); // L: 12 + Script_cached = new EvictingDualNodeHashTable(128); } Script() { - } // L: 23 + } - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)[Lmo;", - garbageValue = "-592819583" + descriptor = "(II)[Lmc;", + garbageValue = "-631335991" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 150 + return new IterableNodeHashTable[var1]; } - @ObfuscatedName("hb") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2884568" + descriptor = "(IIB)I", + garbageValue = "-17" ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - class34.method407(); // L: 7735 - Client.menuActions[0] = "Cancel"; // L: 7736 - Client.menuTargets[0] = ""; // L: 7737 - Client.menuOpcodes[0] = 1006; // L: 7738 - Client.menuShiftClick[0] = false; // L: 7739 - Client.menuOptionsCount = 1; // L: 7740 - } // L: 7741 - - @ObfuscatedName("ku") - @ObfuscatedSignature( - descriptor = "(Liv;I)V", - garbageValue = "-1229350050" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field830) { // L: 11013 - Client.field831[var0.rootIndex] = true; // L: 11014 + public static int method1724(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { + var2 = var2 << 1 | var0 & 1; + var0 >>>= 1; } - } // L: 11016 + return var2; + } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index eb7d5dab57..034824879b 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,93 +4,149 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("bq") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("args") Object[] args; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("isMouseInputEvent") boolean isMouseInputEvent; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("widget") Widget widget; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 666010529 + intValue = -721069241 ) @Export("mouseX") int mouseX; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1253492813 + intValue = -1085248063 ) @Export("mouseY") int mouseY; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1848842303 + intValue = 119023005 ) @Export("opIndex") int opIndex; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1390259441 + intValue = 1436810095 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 156564383 + intValue = 1067398595 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("targetName") String targetName; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1428737731 + intValue = 372026329 ) - int field1154; - @ObfuscatedName("b") + int field961; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1474025505 + intValue = 1624043465 ) @Export("type") int type; public ScriptEvent() { - this.type = 76; // L: 19 + this.type = 76; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "-1554075021" + descriptor = "([Ljava/lang/Object;B)V", + garbageValue = "-28" ) @Export("setArgs") public void setArgs(Object[] var1) { - this.args = var1; // L: 22 - } // L: 23 + this.args = var1; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1915392065" + descriptor = "(IB)V", + garbageValue = "-38" ) @Export("setType") public void setType(int var1) { - this.type = var1; // L: 26 - } // L: 27 + this.type = var1; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[IIII)V", + garbageValue = "1503065357" + ) + static void method1809(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + int var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method1809(var0, var1, var2, var5 - 1); + method1809(var0, var1, var5 + 1, var3); + } + + } + + @ObfuscatedName("fz") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "467893323" + ) + static int method1807() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } + + return var0 * 10000 / Client.field682; + } else { + return 10000; + } + } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 448c9cab5d..c88fb3b7c7 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -4,117 +4,174 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("ar") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "[Loa;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lcf;" - ) - @Export("script") - Script script; - @ObfuscatedName("e") + @ObfuscatedName("o") + static int[] field375; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -186261179 + intValue = -655317505 + ) + static int field372; + @ObfuscatedName("go") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("oc") + @ObfuscatedSignature( + descriptor = "Lma;" + ) + static class339 field371; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1577245173 ) @Export("pc") int pc; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lbd;" + ) + @Export("script") + Script script; @ObfuscatedName("v") @Export("intLocals") int[] intLocals; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("stringLocals") String[] stringLocals; ScriptFrame() { - this.pc = -1; // L: 5 - } // L: 9 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-309151908" - ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var1 = WorldMapSection2.method3329(var0); // L: 24 - int var2 = var1.baseVar; // L: 25 - int var3 = var1.startBit; // L: 26 - int var4 = var1.endBit; // L: 27 - int var5 = Varps.Varps_masks[var4 - var3]; // L: 28 - return Varps.Varps_main[var2] >> var3 & var5; // L: 29 + this.pc = -1; } - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1244477807" + descriptor = "(Lnu;B)V", + garbageValue = "-71" ) - static void method1231() { - if (FaceNormal.loadWorlds()) { // L: 1519 - Login.worldSelectOpen = true; // L: 1520 - Login.worldSelectPage = 0; // L: 1521 - Login.worldSelectPagesCount = 0; // L: 1522 + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = MouseHandler.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - GrandExchangeOfferNameComparator.baseX; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - NPC.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + GrandExchangeEvent.Client_plane = var2.plane = var4; + if (Players.field1167[var1] != null) { + var2.read(Players.field1167[var1]); } - } // L: 1524 + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1174[var1] = 0; + Players.Players_emptyIdxCount = 0; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1365321694" - ) - static int method1233(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3563 + for (int var7 = 1; var7 < 2048; ++var7) { + if (var7 != var1) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players.Players_orientations[var7] = 0; + Players.Players_targetIndices[var7] = -1; + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; + Players.field1174[var7] = 0; + } + } + + var0.exportIndex(); } - @ObfuscatedName("av") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "242905867" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-158968956" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 4396 - if (class20.loadInterface(var0)) { // L: 4397 - Widget[] var1 = GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0]; // L: 4398 + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4399 - Widget var3 = var1[var2]; // L: 4400 - if (var3.onLoad != null) { // L: 4401 - ScriptEvent var4 = new ScriptEvent(); // L: 4402 - var4.widget = var3; // L: 4403 - var4.args = var3.onLoad; // L: 4404 - Varcs.runScript(var4, 5000000, 0); // L: 4405 + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "368137942" + ) + public static int method852(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; } } - } - } - } // L: 4408 + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); + } - @ObfuscatedName("ll") + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + throw new NumberFormatException(); + } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; + } + + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1037794122" + descriptor = "(I)V", + garbageValue = "-601175279" ) - static String method1232(String var0) { - PlayerType[] var1 = class106.PlayerType_values(); // L: 11685 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11686 - PlayerType var3 = var1[var2]; // L: 11687 - if (var3.modIcon != -1 && var0.startsWith(MusicPatchPcmStream.method4743(var3.modIcon))) { // L: 11689 11690 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11691 - break; - } - } - - return var0; // L: 11698 + public static void method851() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 5aa0340a37..3acb38584e 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,73 +1,119 @@ import java.io.File; +import java.io.RandomAccessFile; +import java.security.SecureRandom; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("bm") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("y") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - SecureRandomCallable() { - } // L: 36 - - public Object call() { - return GrandExchangeOfferOwnWorldComparator.method1271(); // L: 45 } - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "0" - ) - @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 - } + public Object call() { + SecureRandom var2 = new SecureRandom(); + var2.nextInt(); + return var2; + } - 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("y") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2065815479" + descriptor = "(Ljava/lang/String;B)Ljava/io/File;", + garbageValue = "-61" ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 167 - if (KeyHandler.field276 == KeyHandler.field277) { // L: 168 - return false; + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; } else { - SoundCache.field446 = KeyHandler.field270[KeyHandler.field276]; // L: 169 - Timer.field3780 = KeyHandler.field269[KeyHandler.field276]; // L: 170 - KeyHandler.field276 = KeyHandler.field276 + 1 & 127; // L: 171 - return true; // L: 172 + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; + + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; + } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); + } } } } - @ObfuscatedName("lt") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Liv;S)Ljava/lang/String;", - garbageValue = "32547" + descriptor = "(IIII)I", + garbageValue = "863729241" ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var0)) == 0) { // L: 11566 - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11567 11568 11570 + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1188208671" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (MouseRecorder.friendsChat != null) { + PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } + + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "(Lnv;IB)V", + garbageValue = "-10" + ) + static void method1776(Buffer var0, int var1) { + class144.method2802(var0.array, var1); + InterfaceParent.method1798(var0, var1); + } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 2feb17111d..4bf911e46b 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,82 +4,111 @@ 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("cv") +@ObfuscatedName("bf") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "Ljf;" + @ObfuscatedName("ga") + @ObfuscatedGetter( + intValue = -505968065 ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("f") + static int field858; + @ObfuscatedName("s") @Export("executor") ExecutorService executor; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("future") Future future; SecureRandomFuture() { - this.executor = Executors.newSingleThreadExecutor(); // L: 10 - this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 - } // L: 15 + this.executor = Executors.newSingleThreadExecutor(); + this.future = this.executor.submit(new SecureRandomCallable()); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "96" + descriptor = "(I)V", + garbageValue = "-658220043" ) @Export("shutdown") void shutdown() { - this.executor.shutdown(); // L: 18 - this.executor = null; // L: 19 - } // L: 20 + this.executor.shutdown(); + this.executor = null; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1235169435" + garbageValue = "-1251057070" ) @Export("isDone") boolean isDone() { - return this.future.isDone(); // L: 23 + return this.future.isDone(); } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "-455615969" + descriptor = "(S)Ljava/security/SecureRandom;", + garbageValue = "-12481" ) @Export("get") SecureRandom get() { try { - return (SecureRandom)this.future.get(); // L: 28 - } catch (Exception var2) { // L: 30 - return GrandExchangeOfferOwnWorldComparator.method1271(); // L: 31 + return (SecureRandom)this.future.get(); + } catch (Exception var4) { + SecureRandom var3 = new SecureRandom(); + var3.nextInt(); + return var3; } } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-687753348" + descriptor = "(IB)Lep;", + garbageValue = "-50" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; // L: 22 + public static VarcInt method1705(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); + var1 = new VarcInt(); + if (var2 != null) { + var1.method2752(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("ki") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-758448635" + descriptor = "(Lag;Lag;IZIZB)I", + garbageValue = "31" ) - static final void method2085() { - Client.field819 = Client.cycleCntr; // L: 11466 - class170.field2016 = true; // L: 11467 - } // L: 11468 + static int method1713(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = class137.compareWorlds(var0, var1, var2, var3); + if (var6 != 0) { + return var3 ? -var6 : var6; + } else if (var4 == -1) { + return 0; + } else { + int var7 = class137.compareWorlds(var0, var1, var4, var5); + return var5 ? -var7 : var7; + } + } + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-110" + ) + static void method1711() { + FloorUnderlayDefinition.method2884(DevicePcmPlayerProvider.menuWidth / 2 + SpotAnimationDefinition.menuX, DefaultsGroup.menuY); + } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 032f036065..a19c4d9146 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -3,395 +3,525 @@ 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("fm") +@ObfuscatedName("fz") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("SequenceDefinition_archive") public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("SequenceDefinition_animationsArchive") public static AbstractArchive SequenceDefinition_animationsArchive; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("SequenceDefinition_skeletonsArchive") public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lht;" - ) - @Export("SequenceDefinition_cached") - public static EvictingDualNodeHashTable SequenceDefinition_cached; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" + ) + @Export("SequenceDefinition_cached") + static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhw;" ) @Export("SequenceDefinition_cachedFrames") - public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("o") + static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("n") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 403704851 + intValue = 294327283 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("z") - int[] field1886; - @ObfuscatedName("b") - public boolean field1888; - @ObfuscatedName("i") + @ObfuscatedName("r") + int[] field1869; + @ObfuscatedName("p") + public boolean field1868; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1860367517 + intValue = 876106233 ) - public int field1892; + public int field1863; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1677443273 + intValue = 1000333789 ) @Export("shield") public int shield; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -757910463 + intValue = 358908245 ) @Export("weapon") public int weapon; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -374777757 - ) - public int field1896; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -302620765 - ) - public int field1895; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 317689877 - ) - public int field1893; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2048501497 + intValue = 516434387 ) - public int field1894; + public int field1872; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 895065837 + ) + public int field1867; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1381330405 + ) + public int field1859; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1244249499 + ) + public int field1875; static { - SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 15 - SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 16 + SequenceDefinition_cached = new EvictingDualNodeHashTable(64); + SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); } SequenceDefinition() { - this.frameCount = -1; // L: 21 - this.field1888 = false; // L: 23 - this.field1892 = 5; // L: 24 - this.shield = -1; // L: 25 - this.weapon = -1; // L: 26 - this.field1896 = 99; // L: 27 - this.field1895 = -1; // L: 28 - this.field1893 = -1; // L: 29 - this.field1894 = 2; // L: 30 - } // L: 32 + this.frameCount = -1; + this.field1868 = false; + this.field1863 = 5; + this.shield = -1; + this.weapon = -1; + this.field1872 = 99; + this.field1867 = -1; + this.field1859 = -1; + this.field1875 = 2; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1823528439" + descriptor = "(Lnv;B)V", + garbageValue = "97" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 47 - if (var2 == 0) { // L: 48 - return; // L: 51 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 49 + this.decodeNext(var1, var2); } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "48" + descriptor = "(Lnv;IB)V", + garbageValue = "2" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 54 - var3 = var1.readUnsignedShort(); // L: 55 - this.frameLengths = new int[var3]; // L: 56 + if (var2 == 1) { + var3 = var1.readUnsignedShort(); + this.frameLengths = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 57 + for (var4 = 0; var4 < var3; ++var4) { this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; // L: 58 + this.frameIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 59 + for (var4 = 0; var4 < var3; ++var4) { this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 60 + for (var4 = 0; var4 < var3; ++var4) { this.frameIds[var4] += var1.readUnsignedShort() << 16; } } else if (var2 == 2) { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { - var3 = var1.readUnsignedByte(); // L: 64 - this.field1886 = new int[var3 + 1]; + var3 = var1.readUnsignedByte(); + this.field1869 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field1886[var4] = var1.readUnsignedByte(); + this.field1869[var4] = var1.readUnsignedByte(); } - this.field1886[var3] = 9999999; + this.field1869[var3] = 9999999; } else if (var2 == 4) { - this.field1888 = true; + this.field1868 = true; } else if (var2 == 5) { - this.field1892 = var1.readUnsignedByte(); + this.field1863 = var1.readUnsignedByte(); } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 72 + } else if (var2 == 7) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { - this.field1896 = var1.readUnsignedByte(); + this.field1872 = var1.readUnsignedByte(); } else if (var2 == 9) { - this.field1895 = var1.readUnsignedByte(); + this.field1867 = var1.readUnsignedByte(); } else if (var2 == 10) { - this.field1893 = var1.readUnsignedByte(); + this.field1859 = var1.readUnsignedByte(); } else if (var2 == 11) { - this.field1894 = var1.readUnsignedByte(); + this.field1875 = var1.readUnsignedByte(); } else if (var2 == 12) { - var3 = var1.readUnsignedByte(); // L: 78 - this.chatFrameIds = new int[var3]; // L: 79 + var3 = var1.readUnsignedByte(); + this.chatFrameIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 80 + for (var4 = 0; var4 < var3; ++var4) { this.chatFrameIds[var4] = var1.readUnsignedShort(); } for (var4 = 0; var4 < var3; ++var4) { this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { // L: 83 - var3 = var1.readUnsignedByte(); // L: 84 - this.soundEffects = new int[var3]; // L: 85 + } else if (var2 == 13) { + var3 = var1.readUnsignedByte(); + this.soundEffects = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 86 + for (var4 = 0; var4 < var3; ++var4) { this.soundEffects[var4] = var1.readMedium(); } } - } // L: 89 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1961662829" - ) - @Export("postDecode") - void postDecode() { - if (this.field1895 == -1) { // L: 92 - if (this.field1886 != null) { // L: 93 - this.field1895 = 2; - } else { - this.field1895 = 0; // L: 94 - } - } - - if (this.field1893 == -1) { // L: 96 - if (this.field1886 != null) { // L: 97 - this.field1893 = 2; - } else { - this.field1893 = 0; // L: 98 - } - } - - } // L: 100 + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lgd;II)Lgd;", - garbageValue = "-237449426" + descriptor = "(I)V", + garbageValue = "1038655222" + ) + @Export("postDecode") + void postDecode() { + if (this.field1867 == -1) { + if (this.field1869 != null) { + this.field1867 = 2; + } else { + this.field1867 = 0; + } + } + + if (this.field1859 == -1) { + if (this.field1869 != null) { + this.field1859 = 2; + } else { + this.field1859 = 0; + } + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lgl;II)Lgl;", + garbageValue = "872884979" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { - var2 = this.frameIds[var2]; // L: 103 - Frames var3 = class69.getFrames(var2 >> 16); // L: 104 - var2 &= 65535; // L: 105 + var2 = this.frameIds[var2]; + Frames var3 = class119.getFrames(var2 >> 16); + var2 &= 65535; if (var3 == null) { - return var1.toSharedSequenceModel(true); // L: 106 + return var1.toSharedSequenceModel(true); } else { - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); // L: 107 - var4.animate(var3, var2); // L: 108 - return var4; // L: 109 + Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); + var4.animate(var3, var2); + return var4; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lgl;III)Lgl;", + garbageValue = "1143206669" + ) + @Export("transformObjectModel") + Model transformObjectModel(Model var1, int var2, int var3) { + var2 = this.frameIds[var2]; + Frames var4 = class119.getFrames(var2 >> 16); + var2 &= 65535; + if (var4 == null) { + return var1.toSharedSequenceModel(true); + } else { + Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); + var3 &= 3; + if (var3 == 1) { + var5.rotateY270Ccw(); + } else if (var3 == 2) { + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY90Ccw(); + } + + var5.animate(var4, var2); + if (var3 == 1) { + var5.rotateY90Ccw(); + } else if (var3 == 2) { + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY270Ccw(); + } + + return var5; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lgl;II)Lgl;", + garbageValue = "280067218" + ) + @Export("transformSpotAnimationModel") + Model transformSpotAnimationModel(Model var1, int var2) { + var2 = this.frameIds[var2]; + Frames var3 = class119.getFrames(var2 >> 16); + var2 &= 65535; + if (var3 == null) { + return var1.toSharedSpotAnimationModel(true); + } else { + Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); + var4.animate(var3, var2); + return var4; + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lgl;ILfz;IB)Lgl;", + garbageValue = "-29" + ) + @Export("applyTransformations") + public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { + var2 = this.frameIds[var2]; + Frames var5 = class119.getFrames(var2 >> 16); + var2 &= 65535; + if (var5 == null) { + return var3.transformActorModel(var1, var4); + } else { + var4 = var3.frameIds[var4]; + Frames var6 = class119.getFrames(var4 >> 16); + var4 &= 65535; + Model var7; + if (var6 == null) { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); + var7.animate(var5, var2); + return var7; + } else { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); + var7.animate2(var5, var2, var6, var4, this.field1869); + return var7; + } } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgd;III)Lgd;", - garbageValue = "-188678867" - ) - @Export("transformObjectModel") - Model transformObjectModel(Model var1, int var2, int var3) { - var2 = this.frameIds[var2]; // L: 113 - Frames var4 = class69.getFrames(var2 >> 16); // L: 114 - var2 &= 65535; // L: 115 - if (var4 == null) { // L: 116 - return var1.toSharedSequenceModel(true); - } else { - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); // L: 117 - var3 &= 3; // L: 118 - if (var3 == 1) { // L: 119 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 120 - var5.rotateY180(); - } else if (var3 == 3) { // L: 121 - var5.rotateY90Ccw(); - } - - var5.animate(var4, var2); // L: 122 - if (var3 == 1) { // L: 123 - var5.rotateY90Ccw(); - } else if (var3 == 2) { // L: 124 - var5.rotateY180(); - } else if (var3 == 3) { // L: 125 - var5.rotateY270Ccw(); - } - - return var5; // L: 126 - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lgd;IB)Lgd;", - garbageValue = "-1" - ) - @Export("transformSpotAnimationModel") - Model transformSpotAnimationModel(Model var1, int var2) { - var2 = this.frameIds[var2]; // L: 130 - Frames var3 = class69.getFrames(var2 >> 16); // L: 131 - var2 &= 65535; // L: 132 - if (var3 == null) { - return var1.toSharedSpotAnimationModel(true); // L: 133 - } else { - Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); // L: 134 - var4.animate(var3, var2); // L: 135 - return var4; // L: 136 - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lgd;ILfm;II)Lgd;", - garbageValue = "-1179378305" - ) - @Export("applyTransformations") - public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; // L: 140 - Frames var5 = class69.getFrames(var2 >> 16); // L: 141 - var2 &= 65535; // L: 142 - if (var5 == null) { // L: 143 - return var3.transformActorModel(var1, var4); - } else { - var4 = var3.frameIds[var4]; // L: 144 - Frames var6 = class69.getFrames(var4 >> 16); // L: 145 - var4 &= 65535; // L: 146 - Model var7; - if (var6 == null) { // L: 147 - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 148 - var7.animate(var5, var2); // L: 149 - return var7; // L: 150 - } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152 - var7.animate2(var5, var2, var6, var4, this.field1886); // L: 153 - return var7; // L: 154 - } - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lgd;II)Lgd;", - garbageValue = "-23683496" + descriptor = "(Lgl;II)Lgl;", + garbageValue = "-2011899065" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { - int var3 = this.frameIds[var2]; // L: 158 - Frames var4 = class69.getFrames(var3 >> 16); // L: 159 - var3 &= 65535; // L: 160 - if (var4 == null) { // L: 161 + int var3 = this.frameIds[var2]; + Frames var4 = class119.getFrames(var3 >> 16); + var3 &= 65535; + if (var4 == null) { return var1.toSharedSequenceModel(true); } else { - Frames var5 = null; // L: 162 - int var6 = 0; // L: 163 - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 164 - var6 = this.chatFrameIds[var2]; // L: 165 - var5 = class69.getFrames(var6 >> 16); // L: 166 - var6 &= 65535; // L: 167 + Frames var5 = null; + int var6 = 0; + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { + var6 = this.chatFrameIds[var2]; + var5 = class119.getFrames(var6 >> 16); + var6 &= 65535; } Model var7; - if (var5 != null && var6 != 65535) { // L: 169 - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 174 - var7.animate(var4, var3); // L: 175 - var7.animate(var5, var6); // L: 176 - return var7; // L: 177 + if (var5 != null && var6 != 65535) { + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); + var7.animate(var4, var3); + var7.animate(var5, var6); + return var7; } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 170 - var7.animate(var4, var3); // L: 171 - return var7; // L: 172 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); + var7.animate(var4, var3); + return var7; } } } - @ObfuscatedName("v") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-88" + descriptor = "(I)V", + garbageValue = "1163543834" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 61 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 62 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 65 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 66 - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 69 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 70 + static final void method3167() { + MouseHandler.method369("Your friend list is full. Max of 200 for free users, and 400 for members"); + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1200065978" + ) + static int method3165(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; } else { - if (Tiles.ByteArrayPool_arrays != null) { // L: 73 - for (int var1 = 0; var1 < class372.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 74 - if (var0.length == class372.ByteArrayPool_alternativeSizes[var1] && WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var1] < Tiles.ByteArrayPool_arrays[var1].length) { // L: 75 - Tiles.ByteArrayPool_arrays[var1][WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 76 - return; // L: 77 + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; + return 1; + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (ModeWhere.grandExchangeEvents != null) { + ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (ModeWhere.grandExchangeEvents != null) { + ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + Interpreter.Interpreter_intStackSize -= 2; + var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; + boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + if (ModeWhere.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; + ModeWhere.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (ModeWhere.grandExchangeEvents != null) { + ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (ModeWhere.grandExchangeEvents != null) { + ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere.grandExchangeEvents == null ? 0 : ModeWhere.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); + long var5 = UrlRequester.method2125() - WorldMapRectangle.field2066 - var4.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; + return 1; + } else { + return 2; } } } - } - } // L: 63 67 71 81 + } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 8ab0dd7f88..7c8e4fb1d2 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -1,600 +1,651 @@ +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("hs") +@ObfuscatedName("hi") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("f") + @ObfuscatedName("sf") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lmz;" ) - public static final ServerPacket field2752; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2704; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2705; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2706; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2707; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2708; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2709; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2746; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2711; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2728; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2713; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2714; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2715; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2716; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2721; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2718; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2719; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2778; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2765; + @Export("platformInfo") + static PlatformInfo platformInfo; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2722; - @ObfuscatedName("p") + public static final ServerPacket field2787; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2720; - @ObfuscatedName("c") + public static final ServerPacket field2746; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2724; - @ObfuscatedName("n") + public static final ServerPacket field2693; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2725; + public static final ServerPacket field2692; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2726; + public static final ServerPacket field2695; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2768; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2712; + public static final ServerPacket field2697; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2719; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2699; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2700; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2701; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2702; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2767; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2704; @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2753; - @ObfuscatedName("aw") + public static final ServerPacket field2705; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2732; + public static final ServerPacket field2706; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2707; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2757; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2755; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2710; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2694; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2712; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2713; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2714; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2748; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2711; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2750; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2718; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2717; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2728; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2721; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2703; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2723; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2724; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2725; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2726; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2756; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2715; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2729; @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2773; - @ObfuscatedName("ad") + public static final ServerPacket field2730; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) public static final ServerPacket field2731; @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2798; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2733; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2734; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2735; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2717; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2737; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2738; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2739; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2740; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2741; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2742; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2743; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2744; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2710; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2793; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2747; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2723; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2749; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2748; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2751; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2727; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2736; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2754; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2755; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2703; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2757; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2758; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2799; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2760; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2761; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2762; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2763; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2764; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2794; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2766; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2767; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2768; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2769; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2770; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2771; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2772; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2759; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) public static final ServerPacket field2774; - @ObfuscatedName("bl") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2775; - @ObfuscatedName("bd") + public static final ServerPacket field2733; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2776; - @ObfuscatedName("bp") + public static final ServerPacket field2734; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2777; + public static final ServerPacket field2735; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2736; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2737; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2738; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2709; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2740; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2741; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2742; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2720; @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2780; - @ObfuscatedName("bh") + public static final ServerPacket field2744; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2779; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2730; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2781; - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2750; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2782; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2784; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2785; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2786; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2729; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2792; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2789; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2790; - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2783; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2791; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) public static final ServerPacket field2745; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2727; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2732; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2781; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2749; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2770; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2751; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2752; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2747; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2754; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2722; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2769; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2698; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2758; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2759; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2760; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2761; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2762; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2763; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2708; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2765; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2766; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2716; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2783; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2777; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2743; @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2756; - @ObfuscatedName("cy") + public static final ServerPacket field2771; + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2795; - @ObfuscatedName("ct") + public static final ServerPacket field2772; + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2796; + public static final ServerPacket field2773; @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhi;" ) - public static final ServerPacket field2797; + public static final ServerPacket field2691; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2775; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2776; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2764; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2778; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2779; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2780; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2753; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2782; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2696; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2784; @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lhi;" + ) + public static final ServerPacket field2785; + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -1501005443 + intValue = -820114081 ) @Export("id") public final int id; - @ObfuscatedName("co") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -2132505615 + intValue = -772727033 ) @Export("length") public final int length; static { - field2752 = new ServerPacket(0, -2); // L: 5 - field2704 = new ServerPacket(1, 0); // L: 6 - field2705 = new ServerPacket(2, 0); // L: 7 - field2706 = new ServerPacket(3, 7); // L: 8 - field2707 = new ServerPacket(4, -2); // L: 9 - field2708 = new ServerPacket(5, 4); // L: 10 - field2709 = new ServerPacket(6, 2); // L: 11 - field2746 = new ServerPacket(7, 15); // L: 12 - field2711 = new ServerPacket(8, -2); // L: 13 - field2728 = new ServerPacket(9, 2); // L: 14 - field2713 = new ServerPacket(10, -2); // L: 15 - field2714 = new ServerPacket(11, 2); // L: 16 - field2715 = new ServerPacket(12, 5); // L: 17 - field2716 = new ServerPacket(13, 0); // L: 18 - field2721 = new ServerPacket(14, -2); // L: 19 - field2718 = new ServerPacket(15, 4); // L: 20 - field2719 = new ServerPacket(16, 6); // L: 21 - field2778 = new ServerPacket(17, 0); // L: 22 - field2765 = new ServerPacket(18, -2); // L: 23 - field2722 = new ServerPacket(19, -2); // L: 24 - field2720 = new ServerPacket(20, 0); // L: 25 - field2724 = new ServerPacket(21, 8); // L: 26 - field2725 = new ServerPacket(22, 6); // L: 27 - field2726 = new ServerPacket(23, -2); // L: 28 - field2712 = new ServerPacket(24, 1); // L: 29 - field2753 = new ServerPacket(25, 20); // L: 30 - field2732 = new ServerPacket(26, -2); // L: 31 - field2773 = new ServerPacket(27, 1); // L: 32 - field2731 = new ServerPacket(28, -1); // L: 33 - field2798 = new ServerPacket(29, 6); // L: 34 - field2733 = new ServerPacket(30, -2); // L: 35 - field2734 = new ServerPacket(31, -2); // L: 36 - field2735 = new ServerPacket(32, -1); // L: 37 - field2717 = new ServerPacket(33, 8); // L: 38 - field2737 = new ServerPacket(34, -1); // L: 39 - field2738 = new ServerPacket(35, 6); // L: 40 - field2739 = new ServerPacket(36, -1); // L: 41 - field2740 = new ServerPacket(37, -1); // L: 42 - field2741 = new ServerPacket(38, 2); // L: 43 - field2742 = new ServerPacket(39, 5); // L: 44 - field2743 = new ServerPacket(40, 6); // L: 45 - field2744 = new ServerPacket(41, -2); // L: 46 - field2710 = new ServerPacket(42, -1); // L: 47 - field2793 = new ServerPacket(43, -1); // L: 48 - field2747 = new ServerPacket(44, 3); // L: 49 - field2723 = new ServerPacket(45, 6); // L: 50 - field2749 = new ServerPacket(46, -2); // L: 51 - field2748 = new ServerPacket(47, 5); // L: 52 - field2751 = new ServerPacket(48, 7); // L: 53 - field2727 = new ServerPacket(49, -1); // L: 54 - field2736 = new ServerPacket(50, 12); // L: 55 - field2754 = new ServerPacket(51, 2); // L: 56 - field2755 = new ServerPacket(52, 10); // L: 57 - field2703 = new ServerPacket(53, 3); // L: 58 - field2757 = new ServerPacket(54, -2); // L: 59 - field2758 = new ServerPacket(55, 0); // L: 60 - field2799 = new ServerPacket(56, 10); // L: 61 - field2760 = new ServerPacket(57, 0); // L: 62 - field2761 = new ServerPacket(58, 1); // L: 63 - field2762 = new ServerPacket(59, 5); // L: 64 - field2763 = new ServerPacket(60, 2); // L: 65 - field2764 = new ServerPacket(61, -2); // L: 66 - field2794 = new ServerPacket(62, 14); // L: 67 - field2766 = new ServerPacket(63, 28); // L: 68 - field2767 = new ServerPacket(64, -2); // L: 69 - field2768 = new ServerPacket(65, 1); // L: 70 - field2769 = new ServerPacket(66, 5); // L: 71 - field2770 = new ServerPacket(67, -2); // L: 72 - field2771 = new ServerPacket(68, 4); // L: 73 - field2772 = new ServerPacket(69, 4); // L: 74 - field2759 = new ServerPacket(70, 6); // L: 75 - field2774 = new ServerPacket(71, 6); // L: 76 - field2775 = new ServerPacket(72, 6); // L: 77 - field2776 = new ServerPacket(73, -2); // L: 78 - field2777 = new ServerPacket(74, 2); // L: 79 - field2780 = new ServerPacket(75, 2); // L: 80 - field2779 = new ServerPacket(76, -2); // L: 81 - field2730 = new ServerPacket(77, -2); // L: 82 - field2781 = new ServerPacket(78, 6); // L: 83 - field2750 = new ServerPacket(79, -2); // L: 84 - field2782 = new ServerPacket(80, 0); // L: 85 - field2784 = new ServerPacket(81, 4); // L: 86 - field2785 = new ServerPacket(82, 4); // L: 87 - field2786 = new ServerPacket(83, 0); // L: 88 - field2729 = new ServerPacket(84, -2); // L: 89 - field2792 = new ServerPacket(85, 8); // L: 90 - field2789 = new ServerPacket(86, 1); // L: 91 - field2790 = new ServerPacket(87, -1); // L: 92 - field2783 = new ServerPacket(88, 2); // L: 93 - field2791 = new ServerPacket(89, 4); // L: 94 - field2745 = new ServerPacket(90, 6); // L: 95 - field2756 = new ServerPacket(91, 2); // L: 96 - field2795 = new ServerPacket(92, -2); // L: 97 - field2796 = new ServerPacket(93, 8); // L: 98 - field2797 = new ServerPacket(94, 1); // L: 99 + field2787 = new ServerPacket(0, -2); + field2746 = new ServerPacket(1, -2); + field2693 = new ServerPacket(2, -2); + field2692 = new ServerPacket(3, 0); + field2695 = new ServerPacket(4, 1); + field2768 = new ServerPacket(5, 0); + field2697 = new ServerPacket(6, 5); + field2719 = new ServerPacket(7, 0); + field2699 = new ServerPacket(8, 2); + field2700 = new ServerPacket(9, 8); + field2701 = new ServerPacket(10, 3); + field2702 = new ServerPacket(11, -1); + field2767 = new ServerPacket(12, 4); + field2704 = new ServerPacket(13, 12); + field2705 = new ServerPacket(14, 2); + field2706 = new ServerPacket(15, -2); + field2707 = new ServerPacket(16, 4); + field2757 = new ServerPacket(17, -2); + field2755 = new ServerPacket(18, 2); + field2710 = new ServerPacket(19, -1); + field2694 = new ServerPacket(20, -2); + field2712 = new ServerPacket(21, 20); + field2713 = new ServerPacket(22, -1); + field2714 = new ServerPacket(23, 2); + field2748 = new ServerPacket(24, -2); + field2711 = new ServerPacket(25, 7); + field2750 = new ServerPacket(26, 4); + field2718 = new ServerPacket(27, 1); + field2717 = new ServerPacket(28, 0); + field2728 = new ServerPacket(29, -2); + field2721 = new ServerPacket(30, 6); + field2703 = new ServerPacket(31, 6); + field2723 = new ServerPacket(32, 8); + field2724 = new ServerPacket(33, 8); + field2725 = new ServerPacket(34, -1); + field2726 = new ServerPacket(35, -2); + field2756 = new ServerPacket(36, -2); + field2715 = new ServerPacket(37, -2); + field2729 = new ServerPacket(38, -2); + field2730 = new ServerPacket(39, 1); + field2731 = new ServerPacket(40, 4); + field2774 = new ServerPacket(41, 6); + field2733 = new ServerPacket(42, -2); + field2734 = new ServerPacket(43, 4); + field2735 = new ServerPacket(44, 0); + field2736 = new ServerPacket(45, 6); + field2737 = new ServerPacket(46, -2); + field2738 = new ServerPacket(47, 10); + field2709 = new ServerPacket(48, 2); + field2740 = new ServerPacket(49, -1); + field2741 = new ServerPacket(50, 1); + field2742 = new ServerPacket(51, 0); + field2720 = new ServerPacket(52, 1); + field2744 = new ServerPacket(53, 6); + field2745 = new ServerPacket(54, 14); + field2727 = new ServerPacket(55, 0); + field2732 = new ServerPacket(56, -2); + field2781 = new ServerPacket(57, 2); + field2749 = new ServerPacket(58, 5); + field2770 = new ServerPacket(59, 4); + field2751 = new ServerPacket(60, 8); + field2752 = new ServerPacket(61, -2); + field2747 = new ServerPacket(62, 10); + field2754 = new ServerPacket(63, 0); + field2722 = new ServerPacket(64, -1); + field2769 = new ServerPacket(65, 5); + field2698 = new ServerPacket(66, 28); + field2758 = new ServerPacket(67, 2); + field2759 = new ServerPacket(68, 6); + field2760 = new ServerPacket(69, 3); + field2761 = new ServerPacket(70, 6); + field2762 = new ServerPacket(71, 1); + field2763 = new ServerPacket(72, 6); + field2708 = new ServerPacket(73, 0); + field2765 = new ServerPacket(74, -1); + field2766 = new ServerPacket(75, 6); + field2716 = new ServerPacket(76, 4); + field2783 = new ServerPacket(77, 2); + field2777 = new ServerPacket(78, -1); + field2743 = new ServerPacket(79, -2); + field2771 = new ServerPacket(80, 15); + field2772 = new ServerPacket(81, 5); + field2773 = new ServerPacket(82, -2); + field2691 = new ServerPacket(83, 7); + field2775 = new ServerPacket(84, 6); + field2776 = new ServerPacket(85, -2); + field2764 = new ServerPacket(86, -2); + field2778 = new ServerPacket(87, 2); + field2779 = new ServerPacket(88, 5); + field2780 = new ServerPacket(89, -2); + field2753 = new ServerPacket(90, 6); + field2782 = new ServerPacket(91, -2); + field2696 = new ServerPacket(92, -2); + field2784 = new ServerPacket(93, -1); + field2785 = new ServerPacket(94, 2); } ServerPacket(int var1, int var2) { - this.id = var1; // L: 108 - this.length = var2; // L: 109 - } // L: 110 + this.id = var1; + this.length = var2; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;B)V", + garbageValue = "-18" + ) + static void method4427(File var0) { + FileSystem.FileSystem_cacheDir = var0; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;Ljava/lang/String;Ljava/lang/String;I)Lkt;", + garbageValue = "-1119907711" + ) + public static Font method4425(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); + int var5 = var0.getFileId(var4, var3); + return class251.method4840(var0, var1, var4, var5); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "1310603132" + ) + static final int method4428(int var0, int var1, int var2) { + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = GrandExchangeOfferAgeComparator.method5126(var3, var5); + int var8 = GrandExchangeOfferAgeComparator.method5126(var3 + 1, var5); + int var9 = GrandExchangeOfferAgeComparator.method5126(var3, var5 + 1); + int var10 = GrandExchangeOfferAgeComparator.method5126(var3 + 1, var5 + 1); + int var11 = GrandExchangeOfferOwnWorldComparator.method890(var7, var8, var4, var2); + int var12 = GrandExchangeOfferOwnWorldComparator.method890(var9, var10, var4, var2); + return GrandExchangeOfferOwnWorldComparator.method890(var11, var12, var6, var2); + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 720a3a2b8c..7c5cb272aa 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,90 +4,77 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gj") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("f") + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1170142713 + intValue = -1537374689 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 213807601 + intValue = -450404879 ) @Export("count") int count; @ObfuscatedName("v") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("labels") int[][] labels; Skeleton(int var1, byte[] var2) { - this.id = var1; // L: 13 - Buffer var3 = new Buffer(var2); // L: 14 - this.count = var3.readUnsignedByte(); // L: 15 - this.transformTypes = new int[this.count]; // L: 16 - this.labels = new int[this.count][]; // L: 17 + this.id = var1; + Buffer var3 = new Buffer(var2); + this.count = var3.readUnsignedByte(); + this.transformTypes = new int[this.count]; + this.labels = new int[this.count][]; int var4; - for (var4 = 0; var4 < this.count; ++var4) { // L: 18 + for (var4 = 0; var4 < this.count; ++var4) { this.transformTypes[var4] = var3.readUnsignedByte(); } - for (var4 = 0; var4 < this.count; ++var4) { // L: 19 + for (var4 = 0; var4 < this.count; ++var4) { this.labels[var4] = new int[var3.readUnsignedByte()]; } - for (var4 = 0; var4 < this.count; ++var4) { // L: 20 - for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { // L: 21 + for (var4 = 0; var4 < this.count; ++var4) { + for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { this.labels[var4][var5] = var3.readUnsignedByte(); } } - } // L: 23 + } - @ObfuscatedName("ia") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-913891462" + descriptor = "(IB)I", + garbageValue = "79" ) - static final void method4034() { - boolean var0 = false; // L: 8917 + public static int method3973(int var0) { + return ApproximateRouteStrategy.method880(ViewportMouse.ViewportMouse_entityTags[var0]); + } - while (!var0) { // L: 8918 - var0 = true; // L: 8919 - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8920 - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 8921 - String var2 = Client.menuTargets[var1]; // L: 8922 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8923 - Client.menuTargets[var1 + 1] = var2; // L: 8924 - String var3 = Client.menuActions[var1]; // L: 8925 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8926 - Client.menuActions[var1 + 1] = var3; // L: 8927 - int var4 = Client.menuOpcodes[var1]; // L: 8928 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8929 - Client.menuOpcodes[var1 + 1] = var4; // L: 8930 - var4 = Client.menuArguments1[var1]; // L: 8931 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8932 - Client.menuArguments1[var1 + 1] = var4; // L: 8933 - var4 = Client.menuArguments2[var1]; // L: 8934 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8935 - Client.menuArguments2[var1 + 1] = var4; // L: 8936 - var4 = Client.menuIdentifiers[var1]; // L: 8937 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8938 - Client.menuIdentifiers[var1 + 1] = var4; // L: 8939 - boolean var5 = Client.menuShiftClick[var1]; // L: 8940 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8941 - Client.menuShiftClick[var1 + 1] = var5; // L: 8942 - var0 = false; // L: 8943 - } - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-731407124" + ) + public static int method3972(int var0) { + if (var0 > 0) { + return 1; + } else { + return var0 < 0 ? -1 : 0; } - - } // L: 8947 + } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index a500864d7f..dad86c6f5a 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,37 +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("ij") +@ObfuscatedName("im") @Implements("Skills") public class Skills { - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("Skills_enabled") public static final boolean[] Skills_enabled; @ObfuscatedName("v") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("b") - public static short[][] field3175; - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "[Loa;" + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -74287869 ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; static { - Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; // L: 5 - Skills_experienceTable = new int[99]; // L: 6 - int var0 = 0; // L: 9 + Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; + Skills_experienceTable = new int[99]; + int var0 = 0; - for (int var1 = 0; var1 < 99; ++var1) { // L: 10 - int var2 = var1 + 1; // L: 11 - int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); // L: 12 - var0 += var3; // L: 13 - Skills_experienceTable[var1] = var0 / 4; // L: 14 + for (int var1 = 0; var1 < 99; ++var1) { + int var2 = var1 + 1; + int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); + var0 += var3; + Skills_experienceTable[var1] = var0 / 4; } - } // L: 16 + } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 03b249b1ab..2ca1e40a60 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,27 +3,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hn") +@ObfuscatedName("hj") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("ref") SoftReference ref; SoftWrapper(Object var1, int var2) { - super(var2); // L: 10 - this.ref = new SoftReference(var1); // L: 11 - } // L: 12 + super(var2); + this.ref = new SoftReference(var1); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("get") Object get() { - return this.ref.get(); // L: 15 + return this.ref.get(); } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("isSoft") boolean isSoft() { - return true; // L: 19 + return true; } } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 88f889cc64..f46e3589aa 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,537 +1,189 @@ -import java.awt.Component; -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("bz") +@ObfuscatedName("an") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("rj") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lbq;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("rz") - @ObfuscatedGetter( - intValue = 1079033783 - ) - static int field448; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = -1271809059 - ) - public static int field446; - @ObfuscatedName("ez") - static int[] field438; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmi;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;)V" + descriptor = "(Ljy;Ljy;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { - this.musicSamples = new NodeHashTable(256); // L: 9 - this.rawSounds = new NodeHashTable(256); // L: 10 - this.soundEffectIndex = var1; // L: 13 - this.musicSampleIndex = var2; // L: 14 - } // L: 15 + this.musicSamples = new NodeHashTable(256); + this.rawSounds = new NodeHashTable(256); + this.soundEffectIndex = var1; + this.musicSampleIndex = var2; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II[IB)Lar;", - garbageValue = "58" + descriptor = "(II[II)Lz;", + garbageValue = "137643816" ) @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) { // L: 23 + } else if (var3 != null && var3[0] <= 0) { return null; } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 - if (var8 == null) { // L: 25 + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); + if (var8 == null) { return null; } else { - var7 = var8.toRawSound(); // L: 26 - this.rawSounds.put(var7, var5); // L: 27 + var7 = var8.toRawSound(); + this.rawSounds.put(var7, var5); if (var3 != null) { - var3[0] -= var7.samples.length; // L: 28 + var3[0] -= var7.samples.length; } - return var7; // L: 29 + return var7; } } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II[II)Lar;", - garbageValue = "822692099" + descriptor = "(II[II)Lz;", + garbageValue = "220994032" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 33 - var4 |= var1 << 16; // L: 34 - long var5 = (long)var4 ^ 4294967296L; // L: 35 - RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 36 - if (var7 != null) { // L: 37 + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); + var4 |= var1 << 16; + long var5 = (long)var4 ^ 4294967296L; + RawSound var7 = (RawSound)this.rawSounds.get(var5); + if (var7 != null) { return var7; - } else if (var3 != null && var3[0] <= 0) { // L: 38 + } else if (var3 != null && var3[0] <= 0) { return null; } else { - VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); // L: 39 - if (var8 == null) { // L: 40 - var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); // L: 41 - if (var8 == null) { // L: 42 + VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); + if (var8 == null) { + var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); + if (var8 == null) { return null; } - this.musicSamples.put(var8, var5); // L: 43 + this.musicSamples.put(var8, var5); } - var7 = var8.toRawSound(var3); // L: 45 - if (var7 == null) { // L: 46 + var7 = var8.toRawSound(var3); + if (var7 == null) { return null; } else { - var8.remove(); // L: 47 - this.rawSounds.put(var7, var5); // L: 48 - return var7; // L: 49 + var8.remove(); + this.rawSounds.put(var7, var5); + return var7; } } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I[II)Lar;", - garbageValue = "-2090630447" + descriptor = "(I[IS)Lz;", + garbageValue = "13775" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { - if (this.soundEffectIndex.getGroupCount() == 1) { // L: 53 + if (this.soundEffectIndex.getGroupCount() == 1) { return this.getSoundEffect0(0, var1, var2); } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { - return this.getSoundEffect0(var1, 0, var2); // L: 54 + return this.getSoundEffect0(var1, 0, var2); } else { - throw new RuntimeException(); // L: 55 + throw new RuntimeException(); } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I[II)Lar;", - garbageValue = "-1103543677" + descriptor = "(I[II)Lz;", + garbageValue = "1621022899" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { - if (this.musicSampleIndex.getGroupCount() == 1) { // L: 59 + if (this.musicSampleIndex.getGroupCount() == 1) { return this.getMusicSample0(0, var1, var2); } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { - return this.getMusicSample0(var1, 0, var2); // L: 60 + return this.getMusicSample0(var1, 0, var2); } else { - throw new RuntimeException(); // L: 61 + throw new RuntimeException(); } } - @ObfuscatedName("e") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "-55" + descriptor = "(Lbk;III)V", + garbageValue = "-7347311" ) - static void method932(Component var0) { - var0.setFocusTraversalKeysEnabled(false); // L: 155 - var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 156 - var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 157 - } // L: 158 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1363768741" - ) - static void method928() { - Players.Players_count = 0; // L: 618 - - for (int var0 = 0; var0 < 2048; ++var0) { // L: 619 - Players.field1362[var0] = null; // L: 620 - Players.field1361[var0] = 1; // L: 621 - } - - } // L: 623 - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-943679526" - ) - static int method929(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2992 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2993 - var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2994 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2995 - return 1; // L: 2996 - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 2998 - UserComparator9.Interpreter_stringStackSize -= 2; // L: 2999 - var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3000 - var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3001 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3002 - return 1; // L: 3003 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3005 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3006 - var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3007 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + HealthBarDefinition.intToString(var9, true); // L: 3008 - return 1; // L: 3009 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3011 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3012 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3013 - return 1; // L: 3014 - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 3016 - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3017 - long var13 = ((long)var10 + 11745L) * 86400000L; // L: 3018 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3019 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 3020 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3021 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3022 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3023 - return 1; // L: 3024 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3026 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 3034 - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3035 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3036 - return 1; // L: 3037 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3039 - UserComparator9.Interpreter_stringStackSize -= 2; // L: 3040 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class269.method5000(class226.compareStrings(Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1], AbstractArchive.clientLanguage)); // L: 3041 - return 1; // L: 3042 - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3044 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3045 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3046 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3047 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3048 - var11 = GrandExchangeOfferOwnWorldComparator.archive13.takeFile(var5, 0); // L: 3049 - var12 = new Font(var11); // L: 3050 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3051 - return 1; // L: 3052 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3054 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3055 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3056 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3057 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3058 - var11 = GrandExchangeOfferOwnWorldComparator.archive13.takeFile(var5, 0); // L: 3059 - var12 = new Font(var11); // L: 3060 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3061 - return 1; // L: 3062 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3064 - UserComparator9.Interpreter_stringStackSize -= 2; // L: 3065 - var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3066 - var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3067 - if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 3068 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4; // L: 3069 - } - - return 1; // L: 3070 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3072 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3073 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3074 - return 1; // L: 3075 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3077 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3078 - var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3079 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3080 - return 1; // L: 3081 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3083 - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3084 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = GameBuild.isCharPrintable((char)var10) ? 1 : 0; // L: 3085 - return 1; // L: 3086 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3088 - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3089 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DynamicObject.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3090 - return 1; // L: 3091 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3093 - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3094 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = HitSplatDefinition.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3095 - return 1; // L: 3096 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3098 - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3099 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class105.isDigit((char)var10) ? 1 : 0; // L: 3100 - return 1; // L: 3101 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3103 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3104 - if (var3 != null) { // L: 3105 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3106 - } - - return 1; // L: 3107 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3109 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3110 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3111 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3112 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3113 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3114 - return 1; // L: 3115 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3117 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3118 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 3119 - boolean var16 = false; // L: 3120 - - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3121 - char var7 = var3.charAt(var6); // L: 3122 - if (var7 == '<') { // L: 3123 - var16 = true; - } else if (var7 == '>') { // L: 3124 - var16 = false; - } else if (!var16) { // L: 3125 - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3127 - return 1; // L: 3128 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3130 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3131 - var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3132 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3133 - return 1; // L: 3134 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3136 - UserComparator9.Interpreter_stringStackSize -= 2; // L: 3137 - var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3138 - var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3139 - var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3140 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3141 - return 1; // L: 3142 - } else if (var0 == 4122) { // L: 3144 - var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3145 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3146 - return 1; // L: 3147 - } else { - return 2; // L: 3149 - } - } - } else { - UserComparator9.Interpreter_stringStackSize -= 2; // L: 3027 - var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3028 - var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3029 - if (class262.localPlayer.appearance != null && class262.localPlayer.appearance.isFemale) { // L: 3030 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3; // L: 3031 - } - - return 1; // L: 3032 - } - } - } + static final void method542(MenuAction var0, int var1, int var2) { + class121.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); } - @ObfuscatedName("gu") + @ObfuscatedName("je") @ObfuscatedSignature( - descriptor = "(Lcl;B)V", - garbageValue = "-11" + descriptor = "(Lio;IIB)V", + garbageValue = "23" ) - static final void method930(Actor var0) { - var0.movementSequence = var0.idleSequence; // L: 4198 - if (var0.pathLength == 0) { // L: 4199 - var0.field1242 = 0; // L: 4200 + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); } else { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4203 - SequenceDefinition var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.sequence); // L: 4204 - if (var0.field1281 > 0 && var1.field1895 == 0) { // L: 4205 - ++var0.field1242; // L: 4206 - return; // L: 4207 - } - - if (var0.field1281 <= 0 && var1.field1893 == 0) { // L: 4209 - ++var0.field1242; // L: 4210 - return; // L: 4211 - } - } - - int var10 = var0.x; // L: 4214 - int var2 = var0.y; // L: 4215 - int var3 = var0.field1225 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4216 - int var4 = var0.field1225 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4217 - if (var10 < var3) { // L: 4218 - if (var2 < var4) { // L: 4219 - var0.orientation = 1280; - } else if (var2 > var4) { // L: 4220 - var0.orientation = 1792; - } else { - var0.orientation = 1536; // L: 4221 - } - } else if (var10 > var3) { // L: 4223 - if (var2 < var4) { // L: 4224 - var0.orientation = 768; - } else if (var2 > var4) { // L: 4225 - var0.orientation = 256; - } else { - var0.orientation = 512; // L: 4226 - } - } else if (var2 < var4) { // L: 4228 - var0.orientation = 1024; - } else if (var2 > var4) { // L: 4229 - var0.orientation = 0; - } - - byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4230 - if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4231 - int var6 = var0.orientation - var0.rotation & 2047; // L: 4238 - if (var6 > 1024) { // L: 4239 - var6 -= 2048; - } - - int var7 = var0.walkBackSequence; // L: 4240 - if (var6 >= -256 && var6 <= 256) { // L: 4241 - var7 = var0.walkSequence; - } else if (var6 >= 256 && var6 < 768) { // L: 4242 - var7 = var0.walkRightSequence; - } else if (var6 >= -768 && var6 <= -256) { // L: 4243 - var7 = var0.walkLeftSequence; - } - - if (var7 == -1) { - var7 = var0.walkSequence; // L: 4244 - } - - var0.movementSequence = var7; // L: 4245 - int var8 = 4; // L: 4246 - boolean var9 = true; // L: 4247 - if (var0 instanceof NPC) { // L: 4248 - var9 = ((NPC)var0).definition.isClickable; - } - - if (var9) { // L: 4249 - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1275 != 0) { // L: 4250 - var8 = 2; - } - - if (var0.pathLength > 2) { // L: 4251 - var8 = 6; - } - - if (var0.pathLength > 3) { // L: 4252 - var8 = 8; - } - - if (var0.field1242 > 0 && var0.pathLength > 1) { // L: 4253 - var8 = 8; // L: 4254 - --var0.field1242; // L: 4255 - } - } else { - if (var0.pathLength > 1) { // L: 4259 - var8 = 6; - } - - if (var0.pathLength > 2) { // L: 4260 - var8 = 8; - } - - if (var0.field1242 > 0 && var0.pathLength > 1) { // L: 4261 - var8 = 8; // L: 4262 - --var0.field1242; // L: 4263 - } - } - - if (var5 == 2) { // L: 4266 - var8 <<= 1; - } - - if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 4267 - var0.movementSequence = var0.runSequence; - } - - if (var10 != var3 || var2 != var4) { // L: 4268 - if (var10 < var3) { // L: 4269 - var0.x += var8; // L: 4270 - if (var0.x > var3) { // L: 4271 - var0.x = var3; - } - } else if (var10 > var3) { // L: 4273 - var0.x -= var8; // L: 4274 - if (var0.x < var3) { // L: 4275 - var0.x = var3; - } - } - - if (var2 < var4) { // L: 4277 - var0.y += var8; // L: 4278 - if (var0.y > var4) { // L: 4279 - var0.y = var4; - } - } else if (var2 > var4) { // L: 4281 - var0.y -= var8; // L: 4282 - if (var0.y < var4) { // L: 4283 - var0.y = var4; - } - } - } - - if (var3 == var0.x && var4 == var0.y) { // L: 4286 - --var0.pathLength; // L: 4287 - if (var0.field1281 > 0) { // L: 4288 - --var0.field1281; - } - } - - } else { - var0.x = var3; // L: 4232 - var0.y = var4; // L: 4233 - --var0.pathLength; // L: 4234 - if (var0.field1281 > 0) { - --var0.field1281; // L: 4235 - } - - } + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); } - } // L: 4201 4236 4290 + + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + } + + } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index f002ca8051..1ff5382cad 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,132 +3,132 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("b") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("e") + @ObfuscatedName("t") + @Export("start") + int start; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lbm;" + descriptor = "[Lak;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("v") - @Export("start") - int start; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) SoundEffect(Buffer var1) { - this.instruments = new Instrument[10]; // L: 10 + this.instruments = new Instrument[10]; - for (int var2 = 0; var2 < 10; ++var2) { // L: 21 - int var3 = var1.readUnsignedByte(); // L: 22 - if (var3 != 0) { // L: 23 - --var1.offset; // L: 24 - this.instruments[var2] = new Instrument(); // L: 25 - this.instruments[var2].decode(var1); // L: 26 + for (int var2 = 0; var2 < 10; ++var2) { + int var3 = var1.readUnsignedByte(); + if (var3 != 0) { + --var1.offset; + this.instruments[var2] = new Instrument(); + this.instruments[var2].decode(var1); } } - this.start = var1.readUnsignedShort(); // L: 28 - this.end = var1.readUnsignedShort(); // L: 29 - } // L: 30 + this.start = var1.readUnsignedShort(); + this.end = var1.readUnsignedShort(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lar;" + descriptor = "()Lz;" ) @Export("toRawSound") public RawSound toRawSound() { - byte[] var1 = this.mix(); // L: 33 - return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 + byte[] var1 = this.mix(); + return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } @ObfuscatedName("v") @Export("calculateDelay") public final int calculateDelay() { - int var1 = 9999999; // L: 38 + int var1 = 9999999; int var2; - for (var2 = 0; var2 < 10; ++var2) { // L: 39 - if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { // L: 40 41 + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { var1 = this.instruments[var2].offset / 20; } } - if (this.start < this.end && this.start / 20 < var1) { // L: 44 + if (this.start < this.end && this.start / 20 < var1) { var1 = this.start / 20; } - if (var1 != 9999999 && var1 != 0) { // L: 45 - for (var2 = 0; var2 < 10; ++var2) { // L: 46 + if (var1 != 9999999 && var1 != 0) { + for (var2 = 0; var2 < 10; ++var2) { if (this.instruments[var2] != null) { Instrument var10000 = this.instruments[var2]; - var10000.offset -= var1 * 20; // L: 47 + var10000.offset -= var1 * 20; } } - if (this.start < this.end) { // L: 49 - this.start -= var1 * 20; // L: 50 - this.end -= var1 * 20; // L: 51 + if (this.start < this.end) { + this.start -= var1 * 20; + this.end -= var1 * 20; } - return var1; // L: 53 + return var1; } else { return 0; } } - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("mix") final byte[] mix() { - int var1 = 0; // L: 57 + int var1 = 0; int var2; - for (var2 = 0; var2 < 10; ++var2) { // L: 58 - if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { // L: 59 60 + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { var1 = this.instruments[var2].duration + this.instruments[var2].offset; } } - if (var1 == 0) { // L: 63 + if (var1 == 0) { return new byte[0]; } else { - var2 = var1 * 22050 / 1000; // L: 64 - byte[] var3 = new byte[var2]; // L: 65 + var2 = var1 * 22050 / 1000; + byte[] var3 = new byte[var2]; - for (int var4 = 0; var4 < 10; ++var4) { // L: 66 - if (this.instruments[var4] != null) { // L: 67 - int var5 = this.instruments[var4].duration * 22050 / 1000; // L: 68 - int var6 = this.instruments[var4].offset * 22050 / 1000; // L: 69 - int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); // L: 70 + for (int var4 = 0; var4 < 10; ++var4) { + if (this.instruments[var4] != null) { + int var5 = this.instruments[var4].duration * 22050 / 1000; + int var6 = this.instruments[var4].offset * 22050 / 1000; + int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); - for (int var8 = 0; var8 < var5; ++var8) { // L: 71 - int var9 = (var7[var8] >> 8) + var3[var8 + var6]; // L: 72 - if ((var9 + 128 & -256) != 0) { // L: 73 + for (int var8 = 0; var8 < var5; ++var8) { + int var9 = (var7[var8] >> 8) + var3[var8 + var6]; + if ((var9 + 128 & -256) != 0) { var9 = var9 >> 31 ^ 127; } - var3[var8 + var6] = (byte)var9; // L: 74 + var3[var8 + var6] = (byte)var9; } } } - return var3; // L: 78 + return var3; } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lax;" + descriptor = "(Ljy;II)Lb;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 15 - return var3 == null ? null : new SoundEffect(new Buffer(var3)); // L: 16 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new SoundEffect(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 8eba0372a0..ff6ff9c1ea 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,109 +3,109 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("g") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("segments") int segments; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("durations") int[] durations; @ObfuscatedName("v") @Export("phases") int[] phases; - @ObfuscatedName("y") - @Export("max") - int max; @ObfuscatedName("j") @Export("start") int start; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("m") + @ObfuscatedName("n") @Export("form") int form; - @ObfuscatedName("r") + @ObfuscatedName("w") @Export("ticks") int ticks; - @ObfuscatedName("h") + @ObfuscatedName("f") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("d") + @ObfuscatedName("o") @Export("step") int step; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("amplitude") int amplitude; + @ObfuscatedName("p") + @Export("max") + int max; SoundEnvelope() { - this.segments = 2; // L: 21 - this.durations = new int[2]; // L: 22 - this.phases = new int[2]; // L: 23 - this.durations[0] = 0; // L: 24 - this.durations[1] = 65535; // L: 25 - this.phases[0] = 0; // L: 26 - this.phases[1] = 65535; // L: 27 - } // L: 28 + this.segments = 2; + this.durations = new int[2]; + this.phases = new int[2]; + this.durations[0] = 0; + this.durations[1] = 65535; + this.phases[0] = 0; + this.phases[1] = 65535; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) @Export("decode") final void decode(Buffer var1) { - this.form = var1.readUnsignedByte(); // L: 31 - this.start = var1.readInt(); // L: 32 - this.end = var1.readInt(); // L: 33 - this.decodeSegments(var1); // L: 34 - } // L: 35 + this.form = var1.readUnsignedByte(); + this.start = var1.readInt(); + this.end = var1.readInt(); + this.decodeSegments(var1); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { - this.segments = var1.readUnsignedByte(); // L: 38 - this.durations = new int[this.segments]; // L: 39 - this.phases = new int[this.segments]; // L: 40 + this.segments = var1.readUnsignedByte(); + this.durations = new int[this.segments]; + this.phases = new int[this.segments]; - for (int var2 = 0; var2 < this.segments; ++var2) { // L: 41 - this.durations[var2] = var1.readUnsignedShort(); // L: 42 - this.phases[var2] = var1.readUnsignedShort(); // L: 43 + for (int var2 = 0; var2 < this.segments; ++var2) { + this.durations[var2] = var1.readUnsignedShort(); + this.phases[var2] = var1.readUnsignedShort(); } - } // L: 45 + } @ObfuscatedName("v") @Export("reset") final void reset() { - this.ticks = 0; // L: 48 - this.phaseIndex = 0; // L: 49 - this.step = 0; // L: 50 - this.amplitude = 0; // L: 51 - this.max = 0; // L: 52 - } // L: 53 + this.ticks = 0; + this.phaseIndex = 0; + this.step = 0; + this.amplitude = 0; + this.max = 0; + } - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("doStep") final int doStep(int var1) { - if (this.max >= this.ticks) { // L: 56 - this.amplitude = this.phases[this.phaseIndex++] << 15; // L: 57 - if (this.phaseIndex >= this.segments) { // L: 58 + if (this.max >= this.ticks) { + this.amplitude = this.phases[this.phaseIndex++] << 15; + if (this.phaseIndex >= this.segments) { this.phaseIndex = this.segments - 1; } - this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); // L: 59 - if (this.ticks > this.max) { // L: 60 + this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); + if (this.ticks > this.max) { this.step = ((this.phases[this.phaseIndex] << 15) - this.amplitude) / (this.ticks - this.max); } } - this.amplitude += this.step; // L: 62 - ++this.max; // L: 63 - return this.amplitude - this.step >> 15; // L: 64 + this.amplitude += this.step; + ++this.max; + return this.amplitude - this.step >> 15; } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 1cc2b347a0..a4e10a458b 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -4,105 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("ae") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -95994325 + intValue = 1103685727 ) - @Export("VarpDefinition_fileCount") - public static int VarpDefinition_fileCount; - @ObfuscatedName("km") - @ObfuscatedGetter( - intValue = 1676071199 - ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("f") + static int field219; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lbq;" + descriptor = "Ljy;" + ) + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "[Ly;" ) @Export("players") volatile PcmPlayer[] players; SoundSystem() { - this.players = new PcmPlayer[2]; // L: 6 - } // L: 8 + this.players = new PcmPlayer[2]; + } public void run() { try { - for (int var1 = 0; var1 < 2; ++var1) { // L: 12 - PcmPlayer var2 = this.players[var1]; // L: 13 - if (var2 != null) { // L: 14 + for (int var1 = 0; var1 < 2; ++var1) { + PcmPlayer var2 = this.players[var1]; + if (var2 != null) { var2.run(); } } - } catch (Exception var4) { // L: 17 - FriendsChat.RunException_sendStackTrace((String)null, var4); // L: 18 + } catch (Exception var4) { + BufferedSink.RunException_sendStackTrace((String)null, var4); } - } // L: 20 + } - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-27" + descriptor = "(IB)I", + garbageValue = "-18" ) - public static void method916() { - StructComposition.StructDefinition_cached.clear(); // L: 67 - } // L: 68 + public static int method530(int var0) { + --var0; + var0 |= var0 >>> 1; + var0 |= var0 >>> 2; + var0 |= var0 >>> 4; + var0 |= var0 >>> 8; + var0 |= var0 >>> 16; + return var0 + 1; + } - @ObfuscatedName("ig") + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "1" + descriptor = "(II)Z", + garbageValue = "-1583086105" ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class20.loadInterface(var0)) { // L: 9373 - WorldMapCacheName.field2135 = null; // L: 9380 - PcmPlayer.drawInterface(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9381 - if (WorldMapCacheName.field2135 != null) { // L: 9382 - PcmPlayer.drawInterface(WorldMapCacheName.field2135, -1412584499, var1, var2, var3, var4, Clock.field1538, Canvas.field296, var7); // L: 9383 - WorldMapCacheName.field2135 = null; // L: 9384 - } - - } else { - if (var7 != -1) { // L: 9374 - Client.field831[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 9376 - Client.field831[var8] = true; - } - } - - } - } // L: 9378 9386 - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(IIIILoa;Liq;B)V", - garbageValue = "-118" - ) - @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: 11405 - if (var6 > 4225 && var6 < 90000) { // L: 11406 - int var7 = Client.camAngleY & 2047; // L: 11407 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11408 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11409 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11410 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11411 - double var12 = Math.atan2((double)var10, (double)var11); // L: 11412 - int var14 = var5.width / 2 - 25; // L: 11413 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11414 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11415 - byte var17 = 20; // L: 11416 - class22.redHintArrowSprite.method7043(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11417 - } else { - class32.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11419 - } - - } // L: 11420 + static boolean method524(int var0) { + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; + } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 3470bc8266..3542d6fe93 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,373 +4,255 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("ew") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("SpotAnimationDefinition_archive") static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("SpotAnimationDefinition_modelArchive") - static AbstractArchive SpotAnimationDefinition_modelArchive; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("SpotAnimationDefinition_cached") static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("SpotAnimationDefinition_cachedModels") static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("j") + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ldj;" + ) + static ClanSettings field1668; + @ObfuscatedName("bm") + static String field1660; + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "[Lom;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("lj") @ObfuscatedGetter( - intValue = 1638565333 + intValue = -309582745 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -65861111 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2042923893 + intValue = 2118506859 ) @Export("archive") int archive; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1562787325 + intValue = 1858774641 ) @Export("sequence") public int sequence; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -131798201 + intValue = -415768423 ) @Export("widthScale") int widthScale; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1053916553 + intValue = -1584952373 ) @Export("heightScale") int heightScale; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -715862297 + intValue = -725816873 ) @Export("orientation") int orientation; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1937159093 + intValue = -1352900179 ) @Export("ambient") int ambient; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2094133553 + intValue = -483776629 ) @Export("contrast") int contrast; static { - SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 - SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 15 + SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); + SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); } SpotAnimationDefinition() { - this.sequence = -1; // L: 18 - this.widthScale = 128; // L: 23 - this.heightScale = 128; // L: 24 - this.orientation = 0; // L: 25 - this.ambient = 0; // L: 26 - this.contrast = 0; // L: 27 - } // L: 29 + this.sequence = -1; + this.widthScale = 128; + this.heightScale = 128; + this.orientation = 0; + this.ambient = 0; + this.contrast = 0; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;B)V", - garbageValue = "-47" + descriptor = "(Lnv;I)V", + garbageValue = "-194666192" ) @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) { + return; } - this.decodeNext(var1, var2); // L: 51 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "95" + descriptor = "(Lnv;II)V", + garbageValue = "1903458867" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 56 + if (var2 == 1) { this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 57 + } else if (var2 == 2) { this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { // L: 58 + } else if (var2 == 4) { this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 59 + } else if (var2 == 5) { this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 60 + } else if (var2 == 6) { this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 61 + } else if (var2 == 7) { this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { // L: 62 + } else if (var2 == 8) { 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) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - 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) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } 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) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - 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) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } } - } // L: 82 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lgd;", - garbageValue = "-1" + descriptor = "(II)Lgl;", + garbageValue = "517757552" ) @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); + if (var2 == null) { + ModelData var3 = ModelData.ModelData_get(class406.SpotAnimationDefinition_modelArchive, this.archive, 0); + if (var3 == null) { 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) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - if (this.retextureFrom != null) { // L: 94 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 95 - var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 96 + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - 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); + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); } Model var5; - if (this.sequence != -1 && var1 != -1) { // L: 103 - var5 = WorldMapScaleHandler.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + if (this.sequence != -1 && var1 != -1) { + var5 = World.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); // L: 104 + var5 = var2.toSharedSpotAnimationModel(true); } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 105 + if (this.widthScale != 128 || this.heightScale != 128) { var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { // L: 106 - if (this.orientation == 90) { // L: 107 + if (this.orientation != 0) { + if (this.orientation == 90) { var5.rotateY90Ccw(); } - if (this.orientation == 180) { // L: 108 - var5.rotateY90Ccw(); // L: 109 - var5.rotateY90Ccw(); // L: 110 + if (this.orientation == 180) { + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); } - if (this.orientation == 270) { // L: 112 - var5.rotateY90Ccw(); // L: 113 - var5.rotateY90Ccw(); // L: 114 - var5.rotateY90Ccw(); // L: 115 + if (this.orientation == 270) { + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); } } - return var5; // L: 118 + return var5; } - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(CLkn;I)I", - garbageValue = "-1325304015" + descriptor = "(ILjy;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-1069722401" ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; // L: 143 - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 144 - var0 = Character.toLowerCase(var0); // L: 145 - var2 = (var0 << 4) + 1; // L: 146 - } - - if (var0 == 241 && var1 == Language.Language_ES) { // L: 148 - var2 = 1762; - } - - return var2; // L: 149 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIIIIZI)Loa;", - garbageValue = "1093852955" - ) - @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)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // 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 = class250.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 = class250.ItemDefinition_get(var10); - } - } - - Model var19 = var9.getModel(1); // L: 373 - if (var19 == null) { // L: 374 - return null; - } else { - SpritePixels var20 = null; // L: 375 - if (var9.noteTemplate != -1) { // L: 376 - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377 - if (var20 == null) { // L: 378 - return null; - } - } else if (var9.notedId != -1) { // L: 380 - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381 - if (var20 == null) { // L: 382 - return null; - } - } else if (var9.placeholderTemplate != -1) { // L: 384 - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385 - if (var20 == 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.method3950(16, 16); // L: 397 - Rasterizer3D.field2281 = false; // L: 398 - if (var9.placeholderTemplate != -1) { // L: 399 - var20.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 - var19.calculateBoundsCylinder(); // L: 405 - var19.method4347(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406 - if (var9.notedId != -1) { // L: 407 - var20.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 - var20.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413 - ItemComposition.ItemDefinition_fontPlain11.draw(MenuAction.method2026(var1), 0, 9, 16776960, 1); // L: 414 - } - - if (!var5) { // L: 416 - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 417 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 418 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 419 - Rasterizer3D.field2281 = true; // L: 420 - return var8; // L: 421 - } + public static void method2875(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); + UserComparator5.method2162(var0, var1, var6, var7, var4, var5); } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 89d3c583ce..7afda879e3 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,58 +4,76 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("iy") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 833712115 + intValue = -1651182107 ) @Export("width") public final int width; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1197266213 + intValue = 2104957101 ) @Export("height") public final int height; @ObfuscatedName("v") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 718 - this.height = var2; // L: 719 - this.xWidths = var3; // L: 720 - this.xStarts = var4; // L: 721 - } // L: 722 + this.width = var1; + this.height = var2; + this.xWidths = var3; + this.xStarts = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1133848125" + garbageValue = "1977979545" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 725 - int var3 = this.xStarts[var2]; // L: 726 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 727 + if (var2 >= 0 && var2 < this.xStarts.length) { + int var3 = this.xStarts[var2]; + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { return true; } } - return false; // L: 729 + return false; } - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-99" + descriptor = "(Lnv;Ljava/lang/String;I)I", + garbageValue = "672319355" ) - public static final boolean method4777(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 48 + public static int method4690(Buffer var0, String var1) { + int var2 = var0.offset; + byte[] var3 = class104.method2265(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class251.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1881481613" + ) + static int method4691(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + } } } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 51506fe038..4f2b8fbef2 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,899 +3,899 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oa") +@ObfuscatedName("om") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("pixels") public int[] pixels; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("subWidth") public int subWidth; @ObfuscatedName("v") @Export("subHeight") public int subHeight; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("xOffset") public int xOffset; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("yOffset") - public int yOffset; - @ObfuscatedName("o") + int yOffset; + @ObfuscatedName("n") @Export("width") public int width; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("height") public int height; public SpritePixels(int[] var1, int var2, int var3) { - this.pixels = var1; // L: 26 - this.subWidth = this.width = var2; // L: 27 - this.subHeight = this.height = var3; // L: 28 - this.yOffset = 0; // L: 29 - this.xOffset = 0; // L: 30 - } // L: 31 + this.pixels = var1; + this.subWidth = this.width = var2; + this.subHeight = this.height = var3; + this.yOffset = 0; + this.xOffset = 0; + } public SpritePixels(int var1, int var2) { - this(new int[var2 * var1], var1, var2); // L: 22 - } // L: 23 + this(new int[var2 * var1], var1, var2); + } - public SpritePixels() { - } // L: 19 + SpritePixels() { + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Loa;" + descriptor = "()Lom;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { - SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); // L: 34 - var1.width = this.width; // L: 35 - var1.height = this.height; // L: 36 - var1.xOffset = this.width - this.subWidth - this.xOffset; // L: 37 - var1.yOffset = this.yOffset; // L: 38 + SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); + var1.width = this.width; + var1.height = this.height; + var1.xOffset = this.width - this.subWidth - this.xOffset; + var1.yOffset = this.yOffset; - for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 39 - for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 40 - var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3]; // L: 41 + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { + var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3]; } } - return var1; // L: 44 + return var1; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Loa;" + descriptor = "()Lom;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { - SpritePixels var1 = new SpritePixels(this.width, this.height); // L: 48 + SpritePixels var1 = new SpritePixels(this.width, this.height); - 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) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { + var1.pixels[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; } } - return var1; // L: 54 + return var1; } @ObfuscatedName("v") @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); + } - @ObfuscatedName("y") + @ObfuscatedName("j") @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) { + int[] var1 = new int[this.width * this.height]; - 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) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { + var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; } } - this.pixels = var1; // 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; + this.subWidth = this.width; + this.subHeight = this.height; + this.xOffset = 0; + this.yOffset = 0; } - } // L: 74 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @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) { + int var2 = var1; + if (var1 > this.xOffset) { var2 = this.xOffset; } - int var3 = var1; // L: 80 - if (var1 + this.xOffset + this.subWidth > this.width) { // L: 81 + int var3 = var1; + if (var1 + this.xOffset + this.subWidth > this.width) { var3 = this.width - this.xOffset - this.subWidth; } - int var4 = var1; // L: 82 - if (var1 > this.yOffset) { // L: 83 + int var4 = var1; + if (var1 > this.yOffset) { var4 = this.yOffset; } - int var5 = var1; // L: 84 - if (var1 + this.yOffset + this.subHeight > this.height) { // L: 85 + int var5 = var1; + if (var1 + this.yOffset + this.subHeight > this.height) { 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; + int var7 = var4 + var5 + this.subHeight; + int[] var8 = new int[var6 * var7]; - 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) { + for (int var10 = 0; var10 < this.subWidth; ++var10) { + var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; } } - 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; + this.subWidth = var6; + this.subHeight = var7; + this.xOffset -= var2; + this.yOffset -= var4; } - } // L: 99 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @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]; + int var2 = 0; - for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 104 + for (int var3 = 0; var3 < this.subHeight; ++var3) { for (int var4 = this.subWidth - 1; var4 >= 0; --var4) { - var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; // L: 105 - } - } - - this.pixels = var1; // L: 107 - this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 - } // L: 109 - - @ObfuscatedName("m") - @Export("flipVertically") - public void flipVertically() { - int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 - int var2 = 0; // L: 113 - - for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { // L: 114 - for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 115 var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; } } - this.pixels = var1; // L: 117 - this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 - } // L: 119 + this.pixels = var1; + this.xOffset = this.width - this.subWidth - this.xOffset; + } - @ObfuscatedName("r") + @ObfuscatedName("w") + @Export("flipVertically") + public void flipVertically() { + int[] var1 = new int[this.subWidth * this.subHeight]; + int var2 = 0; + + for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { + for (int var4 = 0; var4 < this.subWidth; ++var4) { + var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; + } + } + + this.pixels = var1; + this.yOffset = this.height - this.subHeight - this.yOffset; + } + + @ObfuscatedName("f") @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]; + int var3 = 0; - for (int var4 = 0; var4 < this.subHeight; ++var4) { // L: 124 - for (int var5 = 0; var5 < this.subWidth; ++var5) { // L: 125 - int var6 = this.pixels[var3]; // L: 126 - if (var6 == 0) { // L: 127 - if (var5 > 0 && this.pixels[var3 - 1] != 0) { // L: 128 + for (int var4 = 0; var4 < this.subHeight; ++var4) { + for (int var5 = 0; var5 < this.subWidth; ++var5) { + int var6 = this.pixels[var3]; + if (var6 == 0) { + if (var5 > 0 && this.pixels[var3 - 1] != 0) { var6 = var1; - } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129 + } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { 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; + } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { var6 = var1; } } - var2[var3++] = var6; // L: 133 + var2[var3++] = var6; } } - this.pixels = var2; // L: 136 - } // L: 137 + this.pixels = var2; + } - @ObfuscatedName("h") + @ObfuscatedName("o") @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) { + int var3 = var2 * this.subWidth; - for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 142 - if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { // L: 143 + for (int var4 = this.subWidth - 1; var4 > 0; --var4) { + if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { this.pixels[var4 + var3] = var1; } } } - } // L: 146 + } - @ObfuscatedName("d") + @ObfuscatedName("x") @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; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var4 = 0; + int var5 = this.subHeight; + int var6 = this.subWidth; + int var7 = Rasterizer2D.Rasterizer2D_width - var6; + int var8 = 0; 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) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var5 -= var9; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var4 += var9 * var6; + var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 164 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var6 -= var9; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var4 += var9; + var3 += var9; + var8 += var9; + var7 += var9; } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 174 - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 175 - var6 -= var9; // L: 176 - var8 += var9; // L: 177 - var7 += var9; // L: 178 + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var6 -= var9; + var8 += var9; + var7 += var9; } - 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) { + Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); } - } // L: 182 + } - @ObfuscatedName("b") + @ObfuscatedName("p") @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; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var4 = 0; + int var5 = this.subHeight; + int var6 = this.subWidth; + int var7 = Rasterizer2D.Rasterizer2D_width - var6; + int var8 = 0; 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) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var5 -= var9; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var4 += var9 * var6; + var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 218 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var6 -= var9; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var4 += var9; + var3 += var9; + var8 += var9; + var7 += var9; } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 228 - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 229 - var6 -= var9; // L: 230 - var8 += var9; // L: 231 - var7 += var9; // L: 232 + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var6 -= var9; + var8 += var9; + var7 += var9; } - 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) { + Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); } - } // L: 236 + } @ObfuscatedName("k") @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) { + int var5 = this.subWidth; + int var6 = this.subHeight; + int var7 = 0; + int var8 = 0; + int var9 = this.width; + int var10 = this.height; + int var11 = (var9 << 16) / var3; + int var12 = (var10 << 16) / var4; 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) { + var13 = (var11 + (this.xOffset << 16) - 1) / var11; + var1 += var13; + var7 += var13 * var11 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 281 - var13 = (var12 + (this.yOffset << 16) - 1) / var12; // L: 282 - var2 += var13; // L: 283 - var8 += var13 * var12 - (this.yOffset << 16); // L: 284 + if (this.yOffset > 0) { + var13 = (var12 + (this.yOffset << 16) - 1) / var12; + var2 += var13; + var8 += var13 * var12 - (this.yOffset << 16); } - if (var5 < var9) { // L: 286 + if (var5 < var9) { var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { // L: 287 + if (var6 < var10) { 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; + int var14 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var15; + var13 += var15 * Rasterizer2D.Rasterizer2D_width; + var8 += var12 * var15; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 297 - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 298 - var3 -= var15; // L: 299 - var14 += var15; // L: 300 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var15; + var14 += var15; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 302 - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 303 - var3 -= var15; // L: 304 - var13 += var15; // L: 305 - var7 += var11 * var15; // L: 306 - var14 += var15; // L: 307 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var15; + var13 += var15; + var7 += var11 * var15; + var14 += var15; } - 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: 310 + } - @ObfuscatedName("t") + @ObfuscatedName("q") @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) { + this.drawTransBgAt(var1, var2); } 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; + var2 += this.yOffset; + int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var6 = 0; + int var7 = this.subHeight; + int var8 = this.subWidth; + int var9 = Rasterizer2D.Rasterizer2D_width - var8; + int var10 = 0; 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) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var7 -= var11; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var6 += var11 * var8; + var5 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 348 + if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var8 -= var11; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var6 += var11; + var5 += var11; + var10 += var11; + var9 += var11; } - if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 358 - var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 359 - var8 -= var11; // L: 360 - var10 += var11; // L: 361 - var9 += var11; // L: 362 + if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var8 -= var11; + var10 += var11; + var9 += var11; } - 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) { + Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); } } - } // L: 331 366 + } - @ObfuscatedName("u") + @ObfuscatedName("e") @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; + var2 += this.yOffset; + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var5 = 0; + int var6 = this.subHeight; + int var7 = this.subWidth; + int var8 = Rasterizer2D.Rasterizer2D_width - var7; + int var9 = 0; 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) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var6 -= var10; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var5 += var10 * var7; + var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 404 + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var7 -= var10; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var5 += var10; + var4 += var10; + var9 += var10; + var8 += var10; } - if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 414 - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 415 - var7 -= var10; // L: 416 - var9 += var10; // L: 417 - var8 += var10; // L: 418 + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var7 -= var10; + var9 += var10; + var8 += var10; } - 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) { + Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); } - } // L: 422 + } - @ObfuscatedName("s") + @ObfuscatedName("i") @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) { + int var6 = this.subWidth; + int var7 = this.subHeight; + int var8 = 0; + int var9 = 0; + int var10 = this.width; + int var11 = this.height; + int var12 = (var10 << 16) / var3; + int var13 = (var11 << 16) / var4; 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) { + var14 = (var12 + (this.xOffset << 16) - 1) / var12; + var1 += var14; + var8 += var14 * var12 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 455 - var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 456 - var2 += var14; // L: 457 - var9 += var14 * var13 - (this.yOffset << 16); // L: 458 + if (this.yOffset > 0) { + var14 = (var13 + (this.yOffset << 16) - 1) / var13; + var2 += var14; + var9 += var14 * var13 - (this.yOffset << 16); } - if (var6 < var10) { // L: 460 + if (var6 < var10) { var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { // L: 461 + if (var7 < var11) { 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; + int var15 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var16; + var14 += var16 * Rasterizer2D.Rasterizer2D_width; + var9 += var13 * var16; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 471 - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 472 - var3 -= var16; // L: 473 - var15 += var16; // L: 474 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var16; + var15 += var16; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 476 - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 477 - var3 -= var16; // L: 478 - var14 += var16; // L: 479 - var8 += var12 * var16; // L: 480 - var15 += var16; // L: 481 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var16; + var14 += var16; + var8 += var12 * var16; + var15 += var16; } - 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: 484 + } - @ObfuscatedName("c") - public void method7035(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("b") + public void method7108(int var1, int var2, int var3) { + var1 += this.xOffset; + var2 += this.yOffset; + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var5 = 0; + int var6 = this.subHeight; + int var7 = this.subWidth; + int var8 = Rasterizer2D.Rasterizer2D_width - var7; + int var9 = 0; 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) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var6 -= var10; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var5 += var10 * var7; + var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 522 + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var7 -= var10; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var5 += var10; + var4 += var10; + var9 += var10; + var8 += var10; } - if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 532 - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 533 - var7 -= var10; // L: 534 - var9 += var10; // L: 535 - var8 += var10; // L: 536 + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var7 -= var10; + var9 += var10; + var8 += var10; } - if (var7 > 0 && var6 > 0) { // L: 538 + if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method7036(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 + method7109(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method7065(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 + method7187(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } - } // L: 541 + } - @ObfuscatedName("w") - public void method7038(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("y") + public void method7111(int var1, int var2, int var3, int var4, int var5) { + if (var3 > 0 && var4 > 0) { + int var6 = this.subWidth; + int var7 = this.subHeight; + int var8 = 0; + int var9 = 0; + int var10 = this.width; + int var11 = this.height; + int var12 = (var10 << 16) / var3; + int var13 = (var11 << 16) / var4; 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) { + var14 = (var12 + (this.xOffset << 16) - 1) / var12; + var1 += var14; + var8 += var14 * var12 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 596 - var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 597 - var2 += var14; // L: 598 - var9 += var14 * var13 - (this.yOffset << 16); // L: 599 + if (this.yOffset > 0) { + var14 = (var13 + (this.yOffset << 16) - 1) / var13; + var2 += var14; + var9 += var14 * var13 - (this.yOffset << 16); } - if (var6 < var10) { // L: 601 + if (var6 < var10) { var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { // L: 602 + if (var7 < var11) { 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; + int var15 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var16; + var14 += var16 * Rasterizer2D.Rasterizer2D_width; + var9 += var13 * var16; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 612 - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 613 - var3 -= var16; // L: 614 - var15 += var16; // L: 615 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var16; + var15 += var16; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 617 - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 618 - var3 -= var16; // L: 619 - var14 += var16; // L: 620 - var8 += var12 * var16; // L: 621 - var15 += var16; // L: 622 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var16; + var14 += var16; + var8 += var12 * var16; + var15 += var16; } - if (var5 == 256) { // L: 624 - method7039(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + if (var5 == 256) { + method7112(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method7064(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + method7113(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } - } // L: 626 + } - @ObfuscatedName("ak") - public void method7041(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("an") + public void method7114(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + int var9 = var2 < 0 ? -var2 : 0; + int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; + int var11 = var1 < 0 ? -var1 : 0; int var10000; - if (this.subWidth + var1 <= var5) { // L: 678 + if (this.subWidth + var1 <= var5) { 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; + int var14 = var9 + var2; - 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) { + int var16 = var7[var14]; + int var17 = var8[var14++]; + int var18 = var13; int var19; - if (var1 < var16) { // L: 686 - var19 = var16 - var1; // L: 687 - var18 = var13 + (var19 - var11); // L: 688 + if (var1 < var16) { + var19 = var16 - var1; + var18 = var13 + (var19 - var11); } else { - var19 = var11; // L: 690 + var19 = var11; } int var12; - if (this.subWidth + var1 <= var16 + var17) { // L: 691 + if (this.subWidth + var1 <= var16 + var17) { var12 = this.subWidth; } else { - var12 = var16 + var17 - var1; // L: 692 + var12 = var16 + var17 - var1; } - 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) { + int var21 = this.pixels[var20 + var15 * this.subWidth]; if (var21 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; // L: 695 + Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; } else { - ++var18; // L: 696 + ++var18; } } - var13 += Rasterizer2D.Rasterizer2D_width; // L: 698 + var13 += Rasterizer2D.Rasterizer2D_width; } - } // L: 700 + } - @ObfuscatedName("ad") + @ObfuscatedName("am") @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; + int var12 = -var4 / 2; + int var13 = (int)(Math.sin((double)var7 / 326.11D) * 65536.0D); + int var14 = (int)(Math.cos((double)var7 / 326.11D) * 65536.0D); + var13 = var13 * var8 >> 8; + var14 = var14 * var8 >> 8; + int var15 = var12 * var13 + var11 * var14 + (var5 << 16); + int var16 = var12 * var14 - var11 * var13 + (var6 << 16); + int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - 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) { + int var18 = var9[var2]; + int var19 = var17 + var18; + int var20 = var15 + var14 * var18; + int var21 = var16 - var13 * var18; - 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) { + Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; + var20 += var14; + var21 -= var13; } - var15 += var13; // L: 723 - var16 += var14; // L: 724 - var17 += Rasterizer2D.Rasterizer2D_width; // L: 725 + var15 += var13; + var16 += var14; + var17 += Rasterizer2D.Rasterizer2D_width; } - } catch (Exception var23) { // L: 728 + } catch (Exception var23) { } - } // L: 729 + } - @ObfuscatedName("at") - public void method7043(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("al") + public void method7116(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; + int var11 = -var4 / 2; + int var12 = (int)(Math.sin(var7) * 65536.0D); + int var13 = (int)(Math.cos(var7) * 65536.0D); + var12 = var12 * var9 >> 8; + var13 = var13 * var9 >> 8; + int var14 = var11 * var12 + var10 * var13 + (var5 << 16); + int var15 = var11 * var13 - var10 * var12 + (var6 << 16); + int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - 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) { + int var17 = var16; + int var18 = var14; + int var19 = var15; - 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) { + int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; + if (var20 != 0) { Rasterizer2D.Rasterizer2D_pixels[var17++] = var20; } else { - ++var17; // L: 749 + ++var17; } - var18 += var13; // L: 750 - var19 -= var12; // L: 751 + var18 += var13; + var19 -= var12; } - var14 += var12; // L: 753 - var15 += var13; // L: 754 - var16 += Rasterizer2D.Rasterizer2D_width; // L: 755 + var14 += var12; + var15 += var13; + var16 += Rasterizer2D.Rasterizer2D_width; } - } catch (Exception var22) { // L: 758 + } catch (Exception var22) { } - } // L: 759 + } - @ObfuscatedName("ah") - public void method7097(int var1, int var2, int var3, int var4) { - this.method7045(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 - } // L: 763 + @ObfuscatedName("aq") + public void method7117(int var1, int var2, int var3, int var4) { + this.method7118(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + } - @ObfuscatedName("az") - void method7045(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 + @ObfuscatedName("aa") + void method7118(int var1, int var2, int var3, int var4, int var5, int var6) { + if (var6 != 0) { + var1 -= this.xOffset << 4; + var2 -= this.yOffset << 4; + double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; + int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); + int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); + int var11 = var10 * -var1 + -var2 * var9; + int var12 = -var2 * var10 + var9 * -(-var1); + int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; + int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; + int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; + int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); + int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); + int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); int var19; int var20; - if (var11 < var13) { // L: 782 - var19 = var11; // L: 783 - var20 = var13; // L: 784 + if (var11 < var13) { + var19 = var11; + var20 = var13; } else { - var19 = var13; // L: 787 - var20 = var11; // L: 788 + var19 = var13; + var20 = var11; } - if (var15 < var19) { // L: 790 + if (var15 < var19) { var19 = var15; } - if (var17 < var19) { // L: 791 + if (var17 < var19) { var19 = var17; } - if (var15 > var20) { // L: 792 + if (var15 > var20) { var20 = var15; } - if (var17 > var20) { // L: 793 + if (var17 > var20) { var20 = var17; } int var21; int var22; - if (var12 < var14) { // L: 796 - var21 = var12; // L: 797 - var22 = var14; // L: 798 + if (var12 < var14) { + var21 = var12; + var22 = var14; } else { - var21 = var14; // L: 801 - var22 = var12; // L: 802 + var21 = var14; + var22 = var12; } - if (var16 < var21) { // L: 804 + if (var16 < var21) { var21 = var16; } - if (var18 < var21) { // L: 805 + if (var18 < var21) { var21 = var18; } - if (var16 > var22) { // L: 806 + if (var16 > var22) { var22 = var16; } - if (var18 > var22) { // L: 807 + if (var18 > var22) { 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; + var20 = var20 + 4095 >> 12; + var21 >>= 12; + var22 = var22 + 4095 >> 12; + var19 += var3; + var20 += var3; + var21 += var4; + var22 += var4; + var19 >>= 4; + var20 = var20 + 15 >> 4; + var21 >>= 4; + var22 = var22 + 15 >> 4; + if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { var19 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 821 + if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { var20 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 822 + if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { var21 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 823 + if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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; + if (var20 < 0) { + var22 = var21 - var22; + if (var22 < 0) { + int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; + double var24 = 1.6777216E7D / (double)var6; + int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); + int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); + int var28 = (var19 << 4) + 8 - var3; + int var29 = (var21 << 4) + 8 - var4; + int var30 = (var1 << 8) - (var29 * var26 >> 4); + int var31 = (var29 * var27 >> 4) + (var2 << 8); int var32; int var33; int var34; @@ -903,350 +903,350 @@ public final class SpritePixels extends Rasterizer2D { int var36; int var37; int var38; - if (var27 == 0) { // L: 837 - if (var26 == 0) { // L: 838 + if (var27 == 0) { + if (var26 == 0) { 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; + var35 = var30; + var36 = var31; + var37 = var20; + if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { + for (; var37 < 0; ++var37) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 851 + ++var34; } } } - ++var33; // L: 839 + ++var33; } - } else if (var26 < 0) { // L: 855 + } else if (var26 < 0) { 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; + var35 = var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { + var32 = (var26 - var32) / var26; + var37 = var20 + var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 869 + if ((var32 = (var36 - var26) / var26) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 873 + ++var34; } - var36 += var26; // L: 874 - ++var37; // L: 870 + var36 += var26; + ++var37; } } - ++var33; // L: 856 + ++var33; 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; + var35 = var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if (var36 < 0) { + var32 = (var26 - 1 - var36) / var26; + var37 = var20 + var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 892 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 896 + ++var34; } - var36 += var26; // L: 897 - ++var37; // L: 893 + var36 += var26; + ++var37; } } - ++var33; // L: 879 + ++var33; var30 -= var26; } } - } else if (var27 < 0) { // L: 902 - if (var26 == 0) { // L: 903 + } else if (var27 < 0) { + if (var26 == 0) { 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; + var35 = (var28 * var27 >> 4) + var30; + var36 = var31; + var37 = var20; + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 917 + if ((var32 = (var35 - var27) / var27) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 921 + ++var34; } - var35 += var27; // L: 922 - ++var37; // L: 918 + var35 += var27; + ++var37; } } - ++var33; // L: 904 + ++var33; var31 += var27; } - } else if (var26 < 0) { // L: 926 + } else if (var26 < 0) { 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; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 939 + if ((var32 = (var35 - var27) / var27) > var37) { 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) { + var32 = (var26 - var32) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 947 + if ((var32 = (var36 - var26) / var26) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 951 + ++var34; } - var35 += var27; // L: 952 - var36 += var26; // L: 953 - ++var37; // L: 948 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 927 + ++var33; 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; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 970 + if ((var32 = (var35 - var27) / var27) > var37) { 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) { + var32 = (var26 - 1 - var36) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 978 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 982 + ++var34; } - var35 += var27; // L: 983 - var36 += var26; // L: 984 - ++var37; // L: 979 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 958 + ++var33; var30 -= var26; var31 += var27; } } - } else if (var26 == 0) { // L: 990 + } else if (var26 == 0) { 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; + var35 = (var28 * var27 >> 4) + var30; + var36 = var31; + var37 = var20; + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1004 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1008 + ++var34; } - var35 += var27; // L: 1009 - ++var37; // L: 1005 + var35 += var27; + ++var37; } } - ++var33; // L: 991 + ++var33; var31 += var27; } - } else if (var26 < 0) { // L: 1013 + } else if (var26 < 0) { 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; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1026 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { 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) { + var32 = (var26 - var32) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 1034 + if ((var32 = (var36 - var26) / var26) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1038 + ++var34; } - var35 += var27; // L: 1039 - var36 += var26; // L: 1040 - ++var37; // L: 1035 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 1014 + ++var33; 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; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1057 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { 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) { + var32 = (var26 - 1 - var36) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 1065 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { 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]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1069 + ++var34; } - var35 += var27; // L: 1070 - var36 += var26; // L: 1071 - ++var37; // L: 1066 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 1045 + ++var33; var30 -= var26; var31 += var27; } @@ -1255,405 +1255,405 @@ public final class SpritePixels extends Rasterizer2D { } } } - } // L: 1076 + } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @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) { + int var5 = var3 * this.xOffset / this.width + var1; + int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; + int var7 = var2 + var4 * this.yOffset / this.height; + int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; + if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { var5 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 1087 + if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { var6 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 1088 + if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { var7 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 1089 + if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { 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) { + int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; + int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); + if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { + for (int var11 = var7; var11 < var8; ++var11) { + for (int var12 = var5; var12 < var6; ++var12) { + int var13 = var12 - var1 << 4; + int var14 = var11 - var2 << 4; + int var15 = var13 * this.width / var3 - (this.xOffset << 4); + int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); + int var17 = var14 * this.height / var4 - (this.yOffset << 4); + int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); + int var19 = (var16 - var15) * (var18 - var17) >> 1; + if (var19 != 0) { + if (var15 < 0) { var15 = 0; } - if (var16 >= this.subWidth << 4) { // L: 1107 + if (var16 >= this.subWidth << 4) { var16 = this.subWidth << 4; } - if (var17 < 0) { // L: 1108 + if (var17 < 0) { var17 = 0; } - if (var18 >= this.subHeight << 4) { // L: 1109 + if (var18 >= this.subHeight << 4) { 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; + --var18; + int var20 = 16 - (var15 & 15); + int var21 = (var16 & 15) + 1; + int var22 = 16 - (var17 & 15); + int var23 = (var18 & 15) + 1; + var15 >>= 4; + var16 >>= 4; + var17 >>= 4; + var18 >>= 4; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; 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) { + int var29 = 16; + if (var28 == var17) { var29 = var22; } - if (var28 == var18) { // L: 1127 + if (var28 == var18) { 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) { + int var31 = this.pixels[var30 + var28 * this.subWidth]; + if (var31 != 0) { int var32; - if (var30 == var15) { // L: 1132 + if (var30 == var15) { var32 = var29 * var20; - } else if (var30 == var16) { // L: 1133 + } else if (var30 == var16) { var32 = var29 * var21; } else { - var32 = var29 << 4; // L: 1134 + var32 = var29 << 4; } - 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; + var24 += var32 * (var31 >> 16 & 255); + var25 += var32 * (var31 >> 8 & 255); + var26 += (var31 & 255) * var32; } } } - if (var27 >= var19) { // L: 1142 - var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); // L: 1143 - if (var28 == 0) { // L: 1144 + if (var27 >= var19) { + var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); + if (var28 == 0) { var28 = 1; } - Rasterizer2D.Rasterizer2D_pixels[var9] = var28; // L: 1145 + Rasterizer2D.Rasterizer2D_pixels[var9] = var28; } - ++var9; // L: 1147 + ++var9; } } - var9 += var10; // L: 1149 + var9 += var10; } } } } else { - throw new IllegalArgumentException(); // L: 1080 + throw new IllegalArgumentException(); } - } // L: 1094 1151 + } - @ObfuscatedName("z") + @ObfuscatedName("r") @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) { 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++]) { + var0[var3++] = var1[var2++]; + var0[var3++] = var1[var2++]; + var0[var3++] = var1[var2++]; } - for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 193 194 195 + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { } - var3 += var6; // L: 197 - var2 += var7; // L: 198 + var3 += var6; + var2 += var7; } - } // L: 200 + } - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); // L: 239 - var5 = -(var5 & 3); // L: 240 + int var9 = -(var5 >> 2); + var5 = -(var5 & 3); - for (int var10 = -var6; var10 < 0; ++var10) { // L: 241 + for (int var10 = -var6; var10 < 0; ++var10) { 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) { + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 245 + ++var4; } - var2 = var1[var3++]; // L: 246 - if (var2 != 0) { // L: 247 + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 248 + ++var4; } - var2 = var1[var3++]; // L: 249 - if (var2 != 0) { // L: 250 + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 251 + ++var4; } - var2 = var1[var3++]; // L: 252 - if (var2 != 0) { // L: 253 + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 254 + ++var4; } } - for (var11 = var5; var11 < 0; ++var11) { // L: 256 - var2 = var1[var3++]; // L: 257 - if (var2 != 0) { // L: 258 + for (var11 = var5; var11 < 0; ++var11) { + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 259 + ++var4; } } - var4 += var7; // L: 261 - var3 += var8; // L: 262 + var4 += var7; + var3 += var8; } - } // L: 264 - - @ObfuscatedName("g") - @Export("Sprite_drawScaled") - static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { - int var12 = var3; // L: 313 - - for (int var13 = -var8; var13 < 0; ++var13) { // L: 314 - int var14 = var11 * (var4 >> 16); // L: 315 - - for (int var15 = -var7; var15 < 0; ++var15) { // L: 316 - var2 = var1[(var3 >> 16) + var14]; // L: 317 - if (var2 != 0) { // L: 318 - var0[var5++] = var2; - } else { - ++var5; // L: 319 - } - - var3 += var9; // L: 320 - } - - var4 += var10; // L: 322 - var3 = var12; // L: 323 - var5 += var6; // L: 324 - } - - } // L: 326 - - @ObfuscatedName("x") - @Export("Sprite_drawTransOverlay") - static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - int var11 = 256 - var9; // L: 369 - int var12 = (var10 & 16711935) * var11 & -16711936; // L: 370 - int var13 = (var10 & 65280) * var11 & 16711680; // L: 371 - var10 = (var12 | var13) >>> 8; // L: 372 - - for (int var14 = -var6; var14 < 0; ++var14) { // L: 373 - for (int var15 = -var5; var15 < 0; ++var15) { // L: 374 - var2 = var1[var3++]; // L: 375 - if (var2 != 0) { // L: 376 - var12 = var9 * (var2 & 16711935) & -16711936; // L: 377 - var13 = (var2 & 65280) * var9 & 16711680; // L: 378 - var0[var4++] = var10 + ((var12 | var13) >>> 8); // L: 379 - } else { - ++var4; // L: 381 - } - } - - var4 += var7; // L: 383 - var3 += var8; // L: 384 - } - - } // L: 386 - - @ObfuscatedName("q") - @Export("Sprite_drawTransparent") - static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - int var10 = 256 - var9; // L: 425 - - for (int var11 = -var6; var11 < 0; ++var11) { // L: 426 - for (int var12 = -var5; var12 < 0; ++var12) { // L: 427 - var2 = var1[var3++]; // L: 428 - if (var2 != 0) { // L: 429 - int var13 = var0[var4]; // L: 430 - var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; // L: 431 - } else { - ++var4; // L: 433 - } - } - - var4 += var7; // L: 435 - var3 += var8; // L: 436 - } - - } // L: 438 - - @ObfuscatedName("p") - @Export("Sprite_drawTransScaled") - static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - int var13 = 256 - var12; // L: 487 - int var14 = var3; // L: 488 - - for (int var15 = -var8; var15 < 0; ++var15) { // L: 489 - int var16 = var11 * (var4 >> 16); // L: 490 - - for (int var17 = -var7; var17 < 0; ++var17) { // L: 491 - var2 = var1[(var3 >> 16) + var16]; // L: 492 - if (var2 != 0) { // L: 493 - int var18 = var0[var5]; // L: 494 - var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; // L: 495 - } else { - ++var5; // L: 497 - } - - var3 += var9; // L: 498 - } - - var4 += var10; // L: 500 - var3 = var14; // L: 501 - var5 += var6; // L: 502 - } - - } // L: 504 - - @ObfuscatedName("n") - static void method7036(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - for (var8 = -var10; var8 < 0; ++var8) { // L: 544 - for (var6 = -var9; var6 < 0; ++var6) { // L: 545 - var0 = var4[var5++]; // L: 546 - if (var0 != 0) { // L: 547 - var1 = var3[var7]; // L: 548 - var2 = var0 + var1; // L: 549 - var0 = (var0 & 16711935) + (var1 & 16711935); // L: 550 - var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 551 - var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 552 - } else { - ++var7; // L: 554 - } - } - - var7 += var11; // L: 556 - var5 += var12; // L: 557 - } - - } // L: 559 - - @ObfuscatedName("l") - static void method7065(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { - for (var8 = -var10; var8 < 0; ++var8) { // L: 562 - for (var6 = -var9; var6 < 0; ++var6) { // L: 563 - var0 = var4[var5++]; // L: 564 - if (var0 != 0) { // L: 565 - var1 = var13 * (var0 & 16711935); // L: 566 - var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; // L: 567 - var1 = var3[var7]; // L: 568 - var2 = var0 + var1; // L: 569 - var0 = (var0 & 16711935) + (var1 & 16711935); // L: 570 - var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 571 - var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 572 - } else { - ++var7; // L: 574 - } - } - - var7 += var11; // L: 576 - var5 += var12; // L: 577 - } - - } // L: 579 + } @ObfuscatedName("a") - static void method7039(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 + @Export("Sprite_drawScaled") + static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { + int var12 = var3; - for (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 + for (int var13 = -var8; var13 < 0; ++var13) { + int var14 = var11 * (var4 >> 16); + + for (int var15 = -var7; var15 < 0; ++var15) { + var2 = var1[(var3 >> 16) + var14]; + if (var2 != 0) { + var0[var5++] = var2; } else { - ++var10; // L: 641 + ++var5; } - var3 += var13; // L: 642 + var3 += var9; } - var9 += var14; // L: 644 - var3 = var16; // L: 645 - var10 += var11; // L: 646 + var4 += var10; + var3 = var12; + var5 += var6; } - } // L: 648 + } - @ObfuscatedName("aw") - static void method7064(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("u") + @Export("Sprite_drawTransOverlay") + static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + int var11 = 256 - var9; + int var12 = (var10 & 16711935) * var11 & -16711936; + int var13 = (var10 & 65280) * var11 & 16711680; + var10 = (var12 | var13) >>> 8; - for (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 (int var14 = -var6; var14 < 0; ++var14) { + for (int var15 = -var5; var15 < 0; ++var15) { + var2 = var1[var3++]; + if (var2 != 0) { + var12 = var9 * (var2 & 16711935) & -16711936; + var13 = (var2 & 65280) * var9 & 16711680; + var0[var4++] = var10 + ((var12 | var13) >>> 8); } else { - ++var10; // L: 665 + ++var4; + } + } + + var4 += var7; + var3 += var8; + } + + } + + @ObfuscatedName("c") + @Export("Sprite_drawTransparent") + static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { + int var10 = 256 - var9; + + for (int var11 = -var6; var11 < 0; ++var11) { + for (int var12 = -var5; var12 < 0; ++var12) { + var2 = var1[var3++]; + if (var2 != 0) { + int var13 = var0[var4]; + var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; + } else { + ++var4; + } + } + + var4 += var7; + var3 += var8; + } + + } + + @ObfuscatedName("m") + @Export("Sprite_drawTransScaled") + static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + int var13 = 256 - var12; + int var14 = var3; + + for (int var15 = -var8; var15 < 0; ++var15) { + int var16 = var11 * (var4 >> 16); + + for (int var17 = -var7; var17 < 0; ++var17) { + var2 = var1[(var3 >> 16) + var16]; + if (var2 != 0) { + int var18 = var0[var5]; + var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; + } else { + ++var5; } - var3 += var13; // L: 666 + var3 += var9; } - var9 += var14; // L: 668 - var3 = var17; // L: 669 - var10 += var11; // L: 670 + var4 += var10; + var3 = var14; + var5 += var6; } - } // L: 672 + } + + @ObfuscatedName("z") + static void method7109(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + for (var8 = -var10; var8 < 0; ++var8) { + for (var6 = -var9; var6 < 0; ++var6) { + var0 = var4[var5++]; + if (var0 != 0) { + var1 = var3[var7]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); + } else { + ++var7; + } + } + + var7 += var11; + var5 += var12; + } + + } + + @ObfuscatedName("d") + static void method7187(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + for (var8 = -var10; var8 < 0; ++var8) { + for (var6 = -var9; var6 < 0; ++var6) { + var0 = var4[var5++]; + if (var0 != 0) { + var1 = var13 * (var0 & 16711935); + var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; + var1 = var3[var7]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); + } else { + ++var7; + } + } + + var7 += var11; + var5 += var12; + } + + } + + @ObfuscatedName("g") + static void method7112(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + for (int var16 = var3; var8 < 0; ++var8) { + var7 = var15 * (var9 >> 16); + + for (var6 = -var12; var6 < 0; ++var6) { + var0 = var4[(var3 >> 16) + var7]; + if (var0 != 0) { + var1 = var5[var10]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); + } else { + ++var10; + } + + var3 += var13; + } + + var9 += var14; + var3 = var16; + var10 += var11; + } + + } + + @ObfuscatedName("ae") + static void method7113(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + for (int var17 = var3; var8 < 0; ++var8) { + var7 = var15 * (var9 >> 16); + + for (var6 = -var12; var6 < 0; ++var6) { + var0 = var4[(var3 >> 16) + var7]; + if (var0 != 0) { + var1 = (var0 & 16711935) * var16; + var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; + var1 = var5[var10]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); + } else { + ++var10; + } + + var3 += var13; + } + + var9 += var14; + var3 = var17; + var10 += var11; + } + + } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index c39f5993e8..efacdab66f 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,25 +1,74 @@ +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("jh") +@ObfuscatedName("jq") @Implements("Strings") public class Strings { - @ObfuscatedName("bz") - public static String field3284; - @ObfuscatedName("ci") - public static String field3529; - @ObfuscatedName("ja") - public static String field3499; - @ObfuscatedName("jw") - public static String field3500; - @ObfuscatedName("jn") - public static String field3286; + @ObfuscatedName("ro") + @ObfuscatedGetter( + intValue = -742412081 + ) + static int field3397; + @ObfuscatedName("by") + public static String field3298; + @ObfuscatedName("cs") + public static String field3467; + @ObfuscatedName("jo") + public static String field3495; + @ObfuscatedName("jh") + public static String field3354; + @ObfuscatedName("ji") + public static String field3319; static { - field3284 = "Please visit the support page for assistance."; // L: 60 - field3529 = "Please visit the support page for assistance."; // L: 99 - field3499 = ""; // L: 275 - field3500 = "Page has opened in a new window."; // L: 276 - field3286 = "(Please check your popup blocker.)"; // L: 277 - } // L: 307 + field3298 = "Please visit the support page for assistance."; + field3467 = "Please visit the support page for assistance."; + field3495 = ""; + field3354 = "Page has opened in a new window."; + field3319 = "(Please check your popup blocker.)"; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "70" + ) + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (NPC.World_request == null) { + NPC.World_request = WorldMapManager.urlRequester.request(new URL(ByteArrayPool.field3775)); + } else if (NPC.World_request.isDone()) { + byte[] var0 = NPC.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class15.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class15.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); + } + + Varcs.sortWorlds(class15.World_worlds, 0, class15.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + NPC.World_request = null; + return true; + } + } catch (Exception var4) { + var4.printStackTrace(); + NPC.World_request = null; + } + + return false; + } } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index c82902e61f..771a878be7 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -1,88 +1,80 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eh") +@ObfuscatedName("et") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("StructDefinition_archive") public static AbstractArchive StructDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("li") - @ObfuscatedGetter( - intValue = 456557527 - ) - @Export("menuX") - static int menuX; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmc;" ) @Export("params") IterableNodeHashTable params; static { - StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13 + StructDefinition_cached = new EvictingDualNodeHashTable(64); } StructComposition() { - } // L: 16 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2004161330" + garbageValue = "-1995312361" ) @Export("postDecode") void postDecode() { - } // L: 29 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;B)V", - garbageValue = "-59" + descriptor = "(Lnv;B)V", + garbageValue = "103" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 33 - if (var2 == 0) { // L: 34 - return; // L: 37 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 35 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-606284417" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 249) { - this.params = class19.readStringIntParameters(var1, this.params); // L: 40 - } - - } - @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnv;IB)V", + garbageValue = "30" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 249) { + this.params = ObjectSound.readStringIntParameters(var1, this.params); + } + + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1271027205" + garbageValue = "1579959620" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -95,131 +87,682 @@ public class StructComposition extends DualNode { if (var5 == null) { var3 = var2; } else { - var3 = var5.integer; // L: 57 + var3 = var5.integer; } } return var3; } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "1" + garbageValue = "-38" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return WorldMapElement.method2742(this.params, var1, var2); // L: 63 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IIIB)Lcf;", - garbageValue = "15" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = MusicPatchNode.method4776(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 + IterableNodeHashTable var4 = this.params; + String var3; + if (var4 == null) { + var3 = var2; } else { - String var6 = String.valueOf(var3); // L: 46 - int var7 = Varcs.archive12.getGroupId(var6); // L: 47 - if (var7 == -1) { // L: 48 - var4 = null; // L: 49 + ObjectNode var5 = (ObjectNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; } else { - label58: { - byte[] var8 = Varcs.archive12.takeFileFlat(var7); // L: 52 - if (var8 != null) { // L: 53 - if (var8.length <= 1) { // L: 54 - var4 = null; // L: 55 - break label58; // L: 56 - } - - var5 = NetSocket.newScript(var8); // L: 58 - if (var5 != null) { // L: 59 - Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60 - var4 = var5; // L: 61 - break label58; // L: 62 - } - } - - var4 = null; // L: 65 - } + var3 = (String)var5.obj; } } - if (var4 != null) { // L: 68 - return var4; // L: 69 + return var3; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lio;II)V", + garbageValue = "-1632565261" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2987 == null) { + throw new RuntimeException(); } else { - var3 = VarbitComposition.method2935(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 = Varcs.archive12.getGroupId(var13); // L: 80 - if (var9 == -1) { // L: 81 - var12 = null; // L: 82 - } else { - byte[] var10 = Varcs.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 = NetSocket.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 - } + if (var0.field2966 == null) { + var0.field2966 = new int[var0.field2987.length]; } - return var12 != null ? var12 : null; + var0.field2966[var1] = Integer.MAX_VALUE; } } - @ObfuscatedName("p") + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-560000506" + descriptor = "([Lio;IIIIIIIII)V", + garbageValue = "2088353051" ) - static int method2972(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1390 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1391 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var3)); // L: 1392 - return 1; // L: 1393 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1395 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1402 - if (var3.dataText == null) { // L: 1403 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + int var11; + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1404 + var11 = var8; } - return 1; // L: 1405 - } else { - return 2; // L: 1407 - } - } else { - int var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1396 - --var4; // L: 1397 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1398 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1399 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; - } + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !FloorUnderlayDefinition.isComponentHidden(var10)) { + if (var10.contentType > 0) { + Decimator.method806(var10); + } - return 1; // L: 1400 + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; + int var15; + int var16; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + UrlRequest.field1224 = var0; + PcmPlayer.field191 = var6; + MouseRecorder.field976 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field585) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field586) { + var15 = Client.field586; + } + + if (var15 + var10.width > Client.field586 + Client.clickedWidgetParent.width) { + var15 = Client.field586 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field587) { + var16 = Client.field587; + } + + if (var16 + var10.height > Client.field587 + Client.clickedWidgetParent.height) { + var16 = Client.field587 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { + var15 = var2; + var16 = var3; + var17 = var4; + var18 = var5; + } else if (var10.type == 9) { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var19 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var19 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var19 < var4 ? var19 : var4; + var18 = var20 < var5 ? var20 : var5; + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (Client.displayFps) { + var13 += 15; + WorldMapDecorationType.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var42 = Runtime.getRuntime(); + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + WorldMapDecorationType.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + AbstractWorldMapIcon.drawEntities(var12, var13, var10.width, var10.height); + Client.field616[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + ArchiveLoader.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + class345.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + PcmPlayer.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + PcmPlayer.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + class6.loginScreenRunesAnimation.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && FloorUnderlayDefinition.isComponentHidden(var10) && var10 != Coord.mousedOverWidgetIf1) { + continue; + } + + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var30 != null) { + class41.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + } + + if (Client.isResizable || Client.field508[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + class100.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { + var19 = 0; + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { + for (var21 = 0; var21 < var10.rawWidth; ++var21) { + var22 = var12 + var21 * (var10.paddingX + 32); + var23 = var20 * (var10.paddingY + 32) + var13; + if (var19 < 20) { + var22 += var10.inventoryXOffsets[var19]; + var23 += var10.inventoryYOffsets[var19]; + } + + if (var10.itemIds[var19] <= 0) { + if (var10.inventorySprites != null && var19 < 20) { + SpritePixels var46 = var10.getInventorySprite(var19); + if (var46 != null) { + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2955) { + AttackOption.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; + boolean var38 = false; + var26 = var10.itemIds[var19] - 1; + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Client.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == KeyHandler.selectedItemSlot && var10.id == Tiles.selectedItemWidget) { + var35 = class124.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = class124.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); + } + + if (var35 != null) { + if (var10 == Client.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; + if (var24 < 5 && var24 > -5) { + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { + var25 = 0; + } + + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; + } + + var35.drawTransAt(var22 + var24, var23 + var25, 128); + if (var1 != -1) { + Widget var28 = var0[var1 & 65535]; + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field555 / 3; + if (var29 > Client.field555 * 10) { + var29 = Client.field555 * 10; + } + + if (var29 > var28.scrollY) { + var29 = var28.scrollY; + } + + var28.scrollY -= var29; + Client.draggedWidgetY += var29; + AttackOption.invalidateWidget(var28); + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field555 / 3; + if (var29 > Client.field555 * 10) { + var29 = Client.field555 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; + Client.draggedWidgetY -= var29; + AttackOption.invalidateWidget(var28); + } + } + } else if (var10 == Canvas.field77 && var19 == Client.field513) { + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); + } + } else { + AttackOption.invalidateWidget(var10); + } + } + } + + ++var19; + } + } + } else if (var10.type == 3) { + if (HealthBarDefinition.runCs1(var10)) { + var19 = var10.color2; + if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.field4257) { + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } else { + Font var39; + if (var10.type == 4) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field2955) { + AttackOption.invalidateWidget(var10); + } + } else { + String var44 = var10.text; + if (HealthBarDefinition.runCs1(var10)) { + var20 = var10.color2; + if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var44 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemComposition var45 = KeyHandler.ItemDefinition_get(var10.itemId); + var44 = var45.name; + if (var44 == null) { + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var44 = ScriptFrame.colorStartTag(16748608) + var44 + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var44 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var44 = Player.method1833(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else if (var10.type == 5) { + SpritePixels var40; + if (!var10.isIf3) { + var40 = var10.getSprite(HealthBarDefinition.runCs1(var10)); + if (var40 != null) { + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2955) { + AttackOption.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var40 = class124.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); + } + + if (var40 == null) { + if (Widget.field2955) { + AttackOption.invalidateWidget(var10); + } + } else { + var20 = var40.width; + var21 = var40.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var40.method7117(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var40.drawTransBgAt(var12, var13); + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; + + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { + var40.method7117(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { + boolean var36 = HealthBarDefinition.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var41 = null; + var22 = 0; + if (var10.itemId != -1) { + var33 = KeyHandler.ItemDefinition_get(var10.itemId); + if (var33 != null) { + var33 = var33.getCountObj(var10.itemQuantity); + var41 = var33.getModel(1); + if (var41 != null) { + var41.calculateBoundsCylinder(); + var22 = var41.height / 2; + } else { + AttackOption.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = MouseHandler.localPlayer.getModel(); + } + } else if (var20 == -1) { + var41 = var10.getModel((SequenceDefinition)null, -1, var36, MouseHandler.localPlayer.appearance); + if (var41 == null && Widget.field2955) { + AttackOption.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = World.SequenceDefinition_get(var20); + var41 = var10.getModel(var47, var10.modelFrame, var36, MouseHandler.localPlayer.appearance); + if (var41 == null && Widget.field2955) { + AttackOption.invalidateWidget(var10); + } + } + + Rasterizer3D.method3895(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var41 != null) { + if (!var10.isIf3) { + var41.method4260(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var41.method4223(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4260(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); + } else { + if (var10.type == 7) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field2955) { + AttackOption.invalidateWidget(var10); + } + continue; + } + + var20 = 0; + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { + for (var22 = 0; var22 < var10.rawWidth; ++var22) { + if (var10.itemIds[var20] > 0) { + var33 = KeyHandler.ItemDefinition_get(var10.itemIds[var20] - 1); + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { + var34 = ScriptFrame.colorStartTag(16748608) + var33.name + ""; + } else { + var34 = ScriptFrame.colorStartTag(16748608) + var33.name + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var22 * (var10.paddingX + 115) + var12; + var26 = var21 * (var10.paddingY + 12) + var13; + if (var10.textXAlignment == 0) { + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + } + } + + ++var20; + } + } + } + + if (var10.type == 8 && var10 == ModeWhere.field3698 && Client.field559 == Client.field648) { + var19 = 0; + var20 = 0; + Font var31 = WorldMapDecorationType.fontPlain12; + String var32 = var10.text; + + String var43; + for (var32 = Player.method1833(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { + var24 = var32.indexOf("
"); + if (var24 != -1) { + var43 = var32.substring(0, var24); + var32 = var32.substring(var24 + 4); + } else { + var43 = var32; + var32 = ""; + } + + var25 = var31.stringWidth(var43); + if (var25 > var19) { + var19 = var25; + } + } + + var19 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var19; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var32 = var10.text; + var26 = var25 + var31.ascent + 2; + + for (var32 = Player.method1833(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { + int var27 = var32.indexOf("
"); + if (var27 != -1) { + var43 = var32.substring(0, var27); + var32 = var32.substring(var27 + 4); + } else { + var43 = var32; + var32 = ""; + } + + var31.draw(var43, var24 + 3, var26, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2991) { + var19 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); + } else { + PendingSpawn.method1868(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } + } + } + } + } + } + } + } + } } + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index a4695347a0..3e06d62759 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -3,126 +3,188 @@ 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("jl") +@ObfuscatedName("jr") @Implements("StudioGame") -public enum StudioGame implements Enumerated -{ - @ObfuscatedName("f") +public enum StudioGame implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljr;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljr;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljr;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljr;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljr;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljr;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("m") + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "[Lom;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("w") @Export("name") public final String name; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 698335859 + intValue = -840829897 ) @Export("id") final int id; StudioGame(String var3, String var4, int var5) { - this.name = var3; // L: 17 - this.id = var5; // L: 18 - } // L: 19 + this.name = var3; + this.id = var5; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 22 + return this.id; } - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IS)Z", - garbageValue = "14714" + descriptor = "(IIIB)Lom;", + garbageValue = "-5" ) - static boolean method4982(String var0, int var1) { - return HealthBarUpdate.method2284(var0, var1, "openjs"); // L: 55 + static SpritePixels method4914(int var0, int var1, int var2) { + return (SpritePixels)WorldMapRegion.WorldMapRegion_cachedSprites.get(HitSplatDefinition.method2988(var0, var1, var2)); } - @ObfuscatedName("n") + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "1" + descriptor = "(IS)V", + garbageValue = "6409" ) - static int method4983(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1824 - ChatChannel.Interpreter_intStackSize -= 3; // L: 1825 - ClanSettings.queueSoundEffect(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]); // L: 1826 - return 1; // L: 1827 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1829 - class6.playSong(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1830 - return 1; // L: 1831 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1833 - ChatChannel.Interpreter_intStackSize -= 2; // L: 1834 - ReflectionCheck.method1230(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 1835 - return 1; // L: 1836 - } else { - int var3; - if (var0 == 3203) { // L: 1838 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1839 - class0.method0(Math.round(2.55F * (float)var3)); // L: 1840 - return 1; // L: 1841 - } else if (var0 == 3204) { // L: 1843 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Math.round((float)class4.clientPreferences.musicVolume / 2.55F); // L: 1844 - return 1; // L: 1845 - } else if (var0 == 3205) { // L: 1847 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1848 - class226.updateSoundEffectVolume(Math.round((float)var3 * 1.27F)); // L: 1849 - return 1; // L: 1850 - } else if (var0 == 3206) { // L: 1852 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Math.round((float)class4.clientPreferences.soundEffectsVolume / 1.27F); // L: 1853 - return 1; // L: 1854 - } else if (var0 == 3207) { // L: 1856 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1857 - NPCComposition.method2882(Math.round(1.27F * (float)var3)); // L: 1858 - return 1; // L: 1859 - } else if (var0 == 3208) { // L: 1861 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Math.round((float)class4.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1862 - return 1; // L: 1863 + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { + Client.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + Client.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + Client.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + Login.loginIndex = 3; + Login.field809 = 1; + } else if (var0 == 4) { + Login.loginIndex = 12; + Login.field804 = 0; + } else if (var0 == 5) { + Login.field809 = 2; + Client.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { + if (var0 == 7) { + Client.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + Client.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + Client.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + Client.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + Client.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + Client.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + Client.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + Client.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + Client.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { + Client.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { + Login.loginIndex = 12; + Login.field804 = 1; + } else if (var0 == 19) { + Client.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + Client.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + Client.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + Client.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + Client.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + Client.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + Client.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + Client.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + Client.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) { + Client.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) { + Client.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + Client.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { + Login.loginIndex = 8; } else { - return 2; // L: 1865 + if (var0 == 56) { + Client.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + class16.updateGameState(11); + return; + } + + if (var0 == 57) { + Client.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + class16.updateGameState(11); + return; + } + + if (var0 == 61) { + Login.loginIndex = 7; + } else { + Client.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + } } + } else { + Client.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); } + + class16.updateGameState(10); } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index e16d2d6244..4af45513eb 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("ex") @Implements("Task") public class Task { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lex;" ) @Export("next") Task next; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("status") public volatile int status; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 522618097 + intValue = -1479560879 ) @Export("type") int type; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("intArgument") public int intArgument; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("result") public volatile Object result; Task() { - this.status = 0; // L: 11 - } // L: 23 + this.status = 0; + } } diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index fd96693c22..ab7f033bf2 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -2,243 +2,226 @@ import java.io.DataInputStream; import java.net.InetAddress; import java.net.Socket; import java.net.URL; -import java.util.Date; 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("da") +@ObfuscatedName("dz") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("javaVersion") public static String javaVersion; + @ObfuscatedName("fl") + @ObfuscatedSignature( + descriptor = "Lkt;" + ) + @Export("fontBold12") + static Font fontBold12; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lex;" ) @Export("current") Task current; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lex;" ) @Export("task") Task task; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("isClosed") boolean isClosed; public TaskHandler() { - this.current = null; // L: 11 - this.task = null; // L: 12 - this.isClosed = false; // L: 14 - javaVendor = "Unknown"; // L: 20 - javaVersion = "1.6"; // L: 21 + this.current = null; + this.task = null; + this.isClosed = false; + javaVendor = "Unknown"; + javaVersion = "1.6"; try { - javaVendor = System.getProperty("java.vendor"); // L: 23 - javaVersion = System.getProperty("java.version"); // L: 24 - } catch (Exception var2) { // L: 26 + javaVendor = System.getProperty("java.vendor"); + javaVersion = System.getProperty("java.version"); + } catch (Exception var2) { } - this.isClosed = false; // L: 27 - this.thread = new Thread(this); // L: 28 - this.thread.setPriority(10); // L: 29 - this.thread.setDaemon(true); // L: 30 - this.thread.start(); // L: 31 - } // L: 32 + this.isClosed = false; + this.thread = new Thread(this); + this.thread.setPriority(10); + this.thread.setDaemon(true); + this.thread.start(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1744867211" + descriptor = "(B)V", + garbageValue = "1" ) @Export("close") public final void close() { - synchronized(this) { // L: 35 - this.isClosed = true; // L: 36 - this.notifyAll(); // L: 37 - } // L: 38 - - try { - this.thread.join(); // L: 40 - } catch (InterruptedException var3) { // L: 42 + synchronized(this) { + this.isClosed = true; + this.notifyAll(); } - } // L: 43 + try { + this.thread.join(); + } catch (InterruptedException var3) { + } - @ObfuscatedName("e") + } + + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;B)Lel;", - garbageValue = "127" + descriptor = "(IIILjava/lang/Object;B)Lex;", + garbageValue = "-1" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { - Task var5 = new Task(); // L: 90 - var5.type = var1; // L: 91 - var5.intArgument = var2; // L: 92 - var5.objectArgument = var4; // L: 93 - synchronized(this) { // L: 94 - if (this.task != null) { // L: 95 - this.task.next = var5; // L: 96 - this.task = var5; // L: 97 + Task var5 = new Task(); + var5.type = var1; + var5.intArgument = var2; + var5.objectArgument = var4; + synchronized(this) { + if (this.task != null) { + this.task.next = var5; + this.task = var5; } else { - this.task = this.current = var5; // L: 100 + this.task = this.current = var5; } - this.notify(); // L: 102 - return var5; // L: 104 + this.notify(); + return var5; } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lel;", - garbageValue = "1638941584" + descriptor = "(Ljava/lang/String;IB)Lex;", + garbageValue = "-4" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { - return this.newTask(1, var2, 0, var1); // L: 108 + return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lel;", - garbageValue = "2125831447" + descriptor = "(Ljava/lang/Runnable;II)Lex;", + garbageValue = "-272989107" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { - return this.newTask(2, var2, 0, var1); // L: 112 + return this.newTask(2, var2, 0, var1); } public final void run() { while (true) { Task var1; - synchronized(this) { // L: 48 + synchronized(this) { while (true) { - if (this.isClosed) { // L: 50 + if (this.isClosed) { return; } - if (this.current != null) { // L: 51 - var1 = this.current; // L: 52 - this.current = this.current.next; // L: 53 - if (this.current == null) { // L: 54 + if (this.current != null) { + var1 = this.current; + this.current = this.current.next; + if (this.current == null) { this.task = null; } break; } try { - this.wait(); // L: 58 - } catch (InterruptedException var8) { // L: 60 + this.wait(); + } catch (InterruptedException var8) { } } } try { - int var5 = var1.type; // L: 64 - if (var5 == 1) { // L: 65 - var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); // L: 66 - } else if (var5 == 2) { // L: 68 - Thread var3 = new Thread((Runnable)var1.objectArgument); // L: 69 - var3.setDaemon(true); // L: 70 - var3.start(); // L: 71 - var3.setPriority(var1.intArgument); // L: 72 - var1.result = var3; // L: 73 - } else if (var5 == 4) { // L: 75 - var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); // L: 76 + int var5 = var1.type; + if (var5 == 1) { + var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); + } else if (var5 == 2) { + Thread var3 = new Thread((Runnable)var1.objectArgument); + var3.setDaemon(true); + var3.start(); + var3.setPriority(var1.intArgument); + var1.result = var3; + } else if (var5 == 4) { + var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); } - var1.status = 1; // L: 78 - } catch (ThreadDeath var6) { // L: 80 - throw var6; // L: 81 - } catch (Throwable var7) { // L: 83 - var1.status = 2; // L: 84 + var1.status = 1; + } catch (ThreadDeath var6) { + throw var6; + } catch (Throwable var7) { + var1.status = 2; } } } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "89" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1590707620" ) - static int method2626(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1086 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1087 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.x; // L: 1088 - return 1; // L: 1089 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1091 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.y; // L: 1092 - return 1; // L: 1093 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1095 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.width; // L: 1096 - return 1; // L: 1097 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1099 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.height; // L: 1100 - return 1; // L: 1101 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1103 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1104 - return 1; // L: 1105 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1107 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.parentId; // L: 1108 - return 1; // L: 1109 - } else { - return 2; // L: 1111 + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); } + + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; } - @ObfuscatedName("iq") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lcz;IIB)V", - garbageValue = "-68" + descriptor = "(IB)Lay;", + garbageValue = "55" ) - static final void method2625(MenuAction var0, int var1, int var2) { - GameObject.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 7930 - } // L: 7931 + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } - @ObfuscatedName("lr") + @ObfuscatedName("jj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-846504237" + descriptor = "(II)V", + garbageValue = "1968115484" ) - static void method2615(String var0) { - Messages.field1397 = var0; // L: 11587 - - try { - String var1 = class1.client.getParameter(Integer.toString(18)); // L: 11589 - String var2 = class1.client.getParameter(Integer.toString(13)); // L: 11590 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11591 - if (var0.length() == 0) { // L: 11592 - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + static final void method2582(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); + if (var0 != Decimator.clientPreferences.musicVolume) { + if (Decimator.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { + Players.method2022(class108.archive6, Client.currentTrackGroupId, 0, var0, false); + Client.field647 = false; + } else if (var0 == 0) { + DynamicObject.method1727(); + Client.field647 = false; } else { - String var4 = var3 + "; Expires="; // L: 11594 - long var6 = ClientPacket.currentTimeMillis() + 94608000000L; // L: 11596 - Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11598 - int var8 = Calendar.Calendar_calendar.get(7); // L: 11599 - int var9 = Calendar.Calendar_calendar.get(5); // L: 11600 - int var10 = Calendar.Calendar_calendar.get(2); // L: 11601 - int var11 = Calendar.Calendar_calendar.get(1); // L: 11602 - int var12 = Calendar.Calendar_calendar.get(11); // L: 11603 - int var13 = Calendar.Calendar_calendar.get(12); // L: 11604 - int var14 = Calendar.Calendar_calendar.get(13); // L: 11605 - 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: 11606 - var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11608 + FontName.method6374(var0); } - class42.method525(class1.client, "document.cookie=\"" + var3 + "\""); // L: 11610 - } catch (Throwable var15) { // L: 11612 + Decimator.clientPreferences.musicVolume = var0; + MilliClock.savePreferences(); } - } // L: 11613 + } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index be55ce508b..55841b4b07 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,33 +3,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("go") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("averageRGB") int averageRGB; - @ObfuscatedName("o") - boolean field2214; - @ObfuscatedName("m") + @ObfuscatedName("n") + boolean field2201; + @ObfuscatedName("w") @Export("fileIds") int[] fileIds; + @ObfuscatedName("f") + int[] field2207; + @ObfuscatedName("o") + int[] field2204; + @ObfuscatedName("x") + int[] field2199; @ObfuscatedName("r") - int[] field2217; - @ObfuscatedName("h") - int[] field2221; - @ObfuscatedName("d") - int[] field2218; - @ObfuscatedName("z") @Export("animationDirection") int animationDirection; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("pixels") int[] pixels; @ObfuscatedName("k") @@ -37,157 +37,157 @@ public class Texture extends Node { boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnv;)V" ) Texture(Buffer var1) { - this.isLoaded = false; // L: 25 - this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field2214 = 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 + this.isLoaded = false; + this.averageRGB = var1.readUnsignedShort(); + this.field2201 = var1.readUnsignedByte() == 1; + int var2 = var1.readUnsignedByte(); + if (var2 >= 1 && var2 <= 4) { + this.fileIds = new int[var2]; int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 36 + for (var3 = 0; var3 < var2; ++var3) { this.fileIds[var3] = var1.readUnsignedShort(); } - if (var2 > 1) { // L: 37 - this.field2217 = new int[var2 - 1]; // L: 38 + if (var2 > 1) { + this.field2207 = new int[var2 - 1]; - for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field2217[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { + this.field2207[var3] = var1.readUnsignedByte(); } } - if (var2 > 1) { // L: 41 - this.field2221 = new int[var2 - 1]; // L: 42 + if (var2 > 1) { + this.field2204 = new int[var2 - 1]; - for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field2221[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { + this.field2204[var3] = var1.readUnsignedByte(); } } - this.field2218 = new int[var2]; // L: 45 + this.field2199 = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field2218[var3] = var1.readInt(); + for (var3 = 0; var3 < var2; ++var3) { + this.field2199[var3] = var1.readInt(); } - this.animationDirection = var1.readUnsignedByte(); // L: 47 - this.animationSpeed = var1.readUnsignedByte(); // L: 48 - this.pixels = null; // L: 49 + this.animationDirection = var1.readUnsignedByte(); + this.animationSpeed = var1.readUnsignedByte(); + this.pixels = null; } else { - throw new RuntimeException(); // L: 33 + throw new RuntimeException(); } - } // L: 50 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(DILjp;)Z" + descriptor = "(DILjy;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { int var5; - for (var5 = 0; var5 < this.fileIds.length; ++var5) { // L: 53 - if (var4.getFileFlat(this.fileIds[var5]) == null) { // L: 54 + for (var5 = 0; var5 < this.fileIds.length; ++var5) { + if (var4.getFileFlat(this.fileIds[var5]) == null) { return false; } } - var5 = var3 * var3; // L: 56 - this.pixels = new int[var5]; // L: 57 + var5 = var3 * var3; + this.pixels = new int[var5]; - for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - IndexedSprite var7 = ClientPacket.method4492(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.field2218[var6]; // L: 63 - if ((var10 & -16777216) == 16777216) { // L: 64 + for (int var6 = 0; var6 < this.fileIds.length; ++var6) { + IndexedSprite var7 = ObjectComposition.method3046(var4, this.fileIds[var6]); + var7.normalize(); + byte[] var8 = var7.pixels; + int[] var9 = var7.palette; + int var10 = this.field2199[var6]; + if ((var10 & -16777216) == 16777216) { } - if ((var10 & -16777216) == 33554432) { // L: 65 + if ((var10 & -16777216) == 33554432) { } int var11; int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { // L: 66 - var11 = var10 & 16711935; // L: 67 - var12 = var10 >> 8 & 255; // L: 68 + if ((var10 & -16777216) == 50331648) { + var11 = var10 & 16711935; + var12 = var10 >> 8 & 255; - 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 < var9.length; ++var13) { + var14 = var9[var13]; + if (var14 >> 8 == (var14 & 65535)) { + var14 &= 255; + var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; } } } - for (var11 = 0; var11 < var9.length; ++var11) { // L: 77 + for (var11 = 0; var11 < var9.length; ++var11) { var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } - if (var6 == 0) { // L: 79 + if (var6 == 0) { var11 = 0; } else { - var11 = this.field2217[var6 - 1]; // L: 80 + var11 = this.field2207[var6 - 1]; } - if (var11 == 0) { // L: 81 - if (var3 == var7.subWidth) { // L: 82 - for (var12 = 0; var12 < var5; ++var12) { // L: 83 + if (var11 == 0) { + if (var3 == var7.subWidth) { + for (var12 = 0; var12 < var5; ++var12) { this.pixels[var12] = var9[var8[var12] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 - var12 = 0; // L: 86 + } else if (var7.subWidth == 64 && var3 == 128) { + var12 = 0; - for (var13 = 0; var13 < var3; ++var13) { // L: 87 - for (var14 = 0; var14 < var3; ++var14) { // L: 88 + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { // L: 91 - throw new RuntimeException(); // L: 98 + if (var7.subWidth != 128 || var3 != 64) { + throw new RuntimeException(); } - var12 = 0; // L: 92 + var12 = 0; - for (var13 = 0; var13 < var3; ++var13) { // L: 93 - for (var14 = 0; var14 < var3; ++var14) { // L: 94 + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { // L: 101 + if (var11 == 1) { } - if (var11 == 2) { // L: 102 + if (var11 == 2) { } - if (var11 == 3) { // L: 103 + if (var11 == 3) { } } - return true; // L: 105 + return true; } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("reset") void reset() { - this.pixels = null; // L: 109 - } // L: 110 + this.pixels = null; + } @ObfuscatedName("v") @Export("animate") void animate(int var1) { - if (this.pixels != null) { // L: 113 + if (this.pixels != null) { short var2; int var3; int var4; @@ -195,65 +195,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 114 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 115 + if (this.animationDirection == 1 || this.animationDirection == 3) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 117 + if (this.pixels.length == 4096) { var2 = 64; } else { - var2 = 128; // L: 118 + var2 = 128; } - var3 = this.pixels.length; // L: 119 - var4 = var2 * this.animationSpeed * var1; // L: 120 - var5 = var3 - 1; // L: 121 - if (this.animationDirection == 1) { // L: 122 + var3 = this.pixels.length; + var4 = var2 * this.animationSpeed * var1; + var5 = var3 - 1; + if (this.animationDirection == 1) { var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { // L: 123 - var7 = var6 + var4 & var5; // L: 124 - Texture_animatedPixels[var6] = this.pixels[var7]; // L: 125 + for (var6 = 0; var6 < var3; ++var6) { + var7 = var6 + var4 & var5; + Texture_animatedPixels[var6] = this.pixels[var7]; } - var10 = this.pixels; // L: 127 - this.pixels = Texture_animatedPixels; // L: 128 - Texture_animatedPixels = var10; // L: 129 + var10 = this.pixels; + this.pixels = Texture_animatedPixels; + Texture_animatedPixels = var10; } - if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 131 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 132 + if (this.animationDirection == 2 || this.animationDirection == 4) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 134 + if (this.pixels.length == 4096) { var2 = 64; } else { - var2 = 128; // L: 135 + var2 = 128; } - var3 = this.pixels.length; // L: 136 - var4 = this.animationSpeed * var1; // L: 137 - var5 = var2 - 1; // L: 138 - if (this.animationDirection == 2) { // L: 139 + var3 = this.pixels.length; + var4 = this.animationSpeed * var1; + var5 = var2 - 1; + if (this.animationDirection == 2) { var4 = -var4; } - 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 + for (var6 = 0; var6 < var3; var6 += var2) { + for (var7 = 0; var7 < var2; ++var7) { + int var8 = var6 + var7; + int var9 = var6 + (var7 + var4 & var5); + Texture_animatedPixels[var8] = this.pixels[var9]; } } - var10 = this.pixels; // L: 147 - this.pixels = Texture_animatedPixels; // L: 148 - Texture_animatedPixels = var10; // L: 149 + var10 = this.pixels; + this.pixels = Texture_animatedPixels; + Texture_animatedPixels = var10; } } - } // L: 151 + } } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 5f7b450aa4..94afdebbba 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("hy") +@ObfuscatedName("hp") @Implements("TextureLoader") public interface TextureLoader { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "20" + descriptor = "(II)[I", + garbageValue = "2000733187" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1186181127" + garbageValue = "-1891738146" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-189956627" + garbageValue = "-1637380669" ) - boolean vmethod4428(int var1); + boolean vmethod4332(int var1); - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "2053899531" + garbageValue = "-1729121173" ) @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 4e9088f19e..1ba6d17b04 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -4,77 +4,77 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gm") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lgm;" + descriptor = "[Lgo;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lke;" ) @Export("deque") NodeDeque deque; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -518380787 + intValue = -83554031 ) @Export("capacity") int capacity; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -879981925 + intValue = -897849031 ) @Export("remaining") int remaining; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("brightness") double brightness; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -858300133 + intValue = 1531794193 ) @Export("textureSize") int textureSize; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;IDI)V" + descriptor = "(Ljy;Ljy;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { - this.deque = new NodeDeque(); // L: 9 - this.remaining = 0; // L: 11 - this.brightness = 1.0D; // L: 12 - this.textureSize = 128; // L: 13 - this.archive = var2; // L: 17 - this.capacity = var3; // L: 18 - this.remaining = this.capacity; // L: 19 - this.brightness = var4; // L: 20 - this.textureSize = var6; // L: 21 - int[] var7 = var1.getGroupFileIds(0); // L: 22 - int var8 = var7.length; // L: 23 - this.textures = new Texture[var1.getGroupFileCount(0)]; // L: 24 + this.deque = new NodeDeque(); + this.remaining = 0; + this.brightness = 1.0D; + this.textureSize = 128; + this.archive = var2; + this.capacity = var3; + this.remaining = this.capacity; + this.brightness = var4; + this.textureSize = var6; + int[] var7 = var1.getGroupFileIds(0); + int var8 = var7.length; + this.textures = new Texture[var1.getGroupFileCount(0)]; - for (int var9 = 0; var9 < var8; ++var9) { // L: 25 - Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); // L: 26 - this.textures[var7[var9]] = new Texture(var10); // L: 27 + for (int var9 = 0; var9 < var8; ++var9) { + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); + this.textures[var7[var9]] = new Texture(var10); } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1251728227" + garbageValue = "-145874788" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -82,207 +82,140 @@ public class TextureProvider implements TextureLoader { int var2 = 0; Texture[] var3 = this.textures; - for (int var4 = 0; var4 < var3.length; ++var4) { // L: 36 - Texture var5 = var3[var4]; // L: 37 - if (var5 != null && var5.fileIds != null) { // L: 39 - var1 += var5.fileIds.length; // L: 40 - int[] var6 = var5.fileIds; // L: 42 + for (int var4 = 0; var4 < var3.length; ++var4) { + Texture var5 = var3[var4]; + if (var5 != null && var5.fileIds != null) { + var1 += var5.fileIds.length; + int[] var6 = var5.fileIds; - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 - int var8 = var6[var7]; // L: 44 - if (this.archive.method5071(var8)) { // L: 46 - ++var2; // L: 47 + for (int var7 = 0; var7 < var6.length; ++var7) { + int var8 = var6[var7]; + if (this.archive.method5025(var8)) { + ++var2; } } } } - if (var1 == 0) { // L: 55 + if (var1 == 0) { return 0; } else { return var2 * 100 / var1; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("setBrightness") public void setBrightness(double var1) { - this.brightness = var1; // L: 60 - this.clear(); // L: 61 - } // L: 62 + this.brightness = var1; + this.clear(); + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "20" + descriptor = "(II)[I", + garbageValue = "2000733187" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { - Texture var2 = this.textures[var1]; // L: 65 - if (var2 != null) { // L: 66 - if (var2.pixels != null) { // L: 67 - this.deque.addLast(var2); // L: 68 - var2.isLoaded = true; // L: 69 - return var2.pixels; // L: 70 + Texture var2 = this.textures[var1]; + if (var2 != null) { + if (var2.pixels != null) { + this.deque.addLast(var2); + var2.isLoaded = true; + return var2.pixels; } - boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); // L: 72 - if (var3) { // L: 73 - if (this.remaining == 0) { // L: 74 + boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); + if (var3) { + if (this.remaining == 0) { Texture var4 = (Texture)this.deque.removeFirst(); var4.reset(); } else { - --this.remaining; // L: 78 + --this.remaining; } this.deque.addLast(var2); var2.isLoaded = true; - return var2.pixels; // L: 81 + return var2.pixels; } } - return null; // L: 84 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1186181127" - ) - @Export("getAverageTextureRGB") - public int getAverageTextureRGB(int var1) { - return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 + return null; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-189956627" + descriptor = "(II)I", + garbageValue = "-1891738146" ) - public boolean vmethod4428(int var1) { - return this.textures[var1].field2214; // L: 93 + @Export("getAverageTextureRGB") + public int getAverageTextureRGB(int var1) { + return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "2053899531" + garbageValue = "-1637380669" + ) + public boolean vmethod4332(int var1) { + return this.textures[var1].field2201; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1729121173" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { - return this.textureSize == 64; // L: 97 + return this.textureSize == 64; } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-19913" + descriptor = "(B)V", + garbageValue = "83" ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.textures.length; ++var1) { // L: 101 - if (this.textures[var1] != null) { // L: 102 + for (int var1 = 0; var1 < this.textures.length; ++var1) { + if (this.textures[var1] != null) { this.textures[var1].reset(); } } - this.deque = new NodeDeque(); // L: 104 - this.remaining = this.capacity; // L: 105 - } // L: 106 + this.deque = new NodeDeque(); + this.remaining = this.capacity; + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "942464912" + garbageValue = "-484462714" ) @Export("animate") public void animate(int var1) { - for (int var2 = 0; var2 < this.textures.length; ++var2) { // L: 109 - Texture var3 = this.textures[var2]; // L: 110 - if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { // L: 111 - var3.animate(var1); // L: 112 - var3.isLoaded = false; // L: 113 + for (int var2 = 0; var2 < this.textures.length; ++var2) { + Texture var3 = this.textures[var2]; + if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { + var3.animate(var1); + var3.isLoaded = false; } } - } // L: 116 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)Lep;", - garbageValue = "-96" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29 - if (var1 != null) { // L: 30 - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31 - var1 = new EnumComposition(); // L: 32 - if (var2 != null) { // L: 33 - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 - return var1; // L: 35 - } } - @ObfuscatedName("v") - public static int method4272(long var0) { - return (int)(var0 >>> 7 & 127L); // L: 56 + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "970385654" + ) + public static byte[] method4203(byte[] var0) { + int var1 = var0.length; + byte[] var2 = new byte[var1]; + System.arraycopy(var0, 0, var2, 0, var1); + return var2; } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;I)Lof;", - garbageValue = "-1314791632" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 75 - int var4 = var0.getFileId(var3, var2); // L: 76 - IndexedSprite var5; - if (!Message.method1263(var0, var3, var4)) { // L: 79 - var5 = null; // L: 80 - } else { - var5 = class302.method5571(); // L: 83 - } - - return var5; // L: 85 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-635307263" - ) - static final void method4291(String var0) { - PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); // L: 198 - var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 199 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 200 - Client.packetWriter.addNode(var1); // L: 201 - } // L: 202 - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "462577738" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (class20.loadInterface(var0)) { // L: 11040 - Widget[] var1 = GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0]; // L: 11041 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11042 - Widget var3 = var1[var2]; // L: 11043 - if (var3 != null) { // L: 11044 - var3.modelFrame = 0; // L: 11045 - var3.modelFrameCycle = 0; // L: 11046 - } - } - - } - } // L: 11048 } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 671a55638d..d6f9a2301c 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,149 +4,166 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gq") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -608522313 + intValue = 596909537 ) @Export("plane") int plane; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -616715047 + intValue = 312017335 ) @Export("x") int x; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1378240875 + intValue = 247666913 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 219645789 + intValue = 48725311 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhe;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgo;" + descriptor = "Lgt;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhs;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lha;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lgn;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgc;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 660578381 + intValue = -344003939 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lhh;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1421591103 + intValue = -1707697089 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -551165813 + intValue = -1025357845 ) @Export("minPlane") int minPlane; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("u") + @ObfuscatedName("e") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -153088239 + intValue = -1961608803 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2075522037 + intValue = -1843365543 ) - int field2247; - @ObfuscatedName("p") + int field2222; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -403680437 + intValue = -541714505 ) - int field2255; - @ObfuscatedName("c") + int field2227; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1737009435 + intValue = 232353849 ) - int field2256; - @ObfuscatedName("n") + int field2243; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgq;" ) @Export("linkedBelowTile") Tile linkedBelowTile; Tile(int var1, int var2, int var3) { - this.gameObjects = new GameObject[5]; // L: 17 - this.gameObjectEdgeMasks = new int[5]; // L: 18 - this.gameObjectsEdgeMask = 0; // L: 19 - this.originalPlane = this.plane = var1; // L: 31 - this.x = var2; // L: 32 - this.y = var3; // L: 33 - } // L: 34 + this.gameObjects = new GameObject[5]; + this.gameObjectEdgeMasks = new int[5]; + this.gameObjectsEdgeMask = 0; + this.originalPlane = this.plane = var1; + this.x = var2; + this.y = var3; + } - @ObfuscatedName("f") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Ljp;IIB)Loa;", - garbageValue = "-63" + descriptor = "(ILij;ZI)V", + garbageValue = "-1834076518" ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !Message.method1263(var0, var1, var2) ? null : AbstractSocket.method5940(); // L: 23 24 + static void method3889(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = AbstractWorldMapIcon.getWorldMap().getMapArea(var0); + int var4 = MouseHandler.localPlayer.plane; + int var5 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; + int var6 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; + Coord var7 = new Coord(var4, var5, var6); + AbstractWorldMapIcon.getWorldMap().method6173(var3, var7, var1, var2); + } + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-30" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeShort(var1); + var2.packetBuffer.writeIntME(var0); + Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index d56cf0d40f..c8fdaa5fca 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,38 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("cf") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1193847607 + @ObfuscatedName("qt") + @ObfuscatedSignature( + descriptor = "Lm;" ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("f") + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("to") @ObfuscatedGetter( - intValue = 1014786241 + intValue = 847821177 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 2137823175 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1411898513 + intValue = 1588847929 ) @Export("quantity") int quantity; TileItem() { - } // L: 11 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lgd;", - garbageValue = "326918784" + descriptor = "(I)Lgl;", + garbageValue = "1291603774" ) @Export("getModel") protected final Model getModel() { - return class250.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 + return KeyHandler.ItemDefinition_get(this.id).getModel(this.quantity); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIIS)I", + garbageValue = "-1509" + ) + static int method2007(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 1113302bb1..4ddcb034ec 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,134 +4,222 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("bo") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -879678159 + intValue = 1321271985 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("j") - static byte[][][] field1111; - @ObfuscatedName("h") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("z") + @ObfuscatedName("n") + static byte[][][] field915; + @ObfuscatedName("w") + static byte[][][] field909; + @ObfuscatedName("o") + static int[][] field904; + @ObfuscatedName("r") @Export("Tiles_saturation") static int[] Tiles_saturation; - @ObfuscatedName("k") - static int[] field1095; - @ObfuscatedName("g") - static int[][][] field1101; - @ObfuscatedName("q") - static final int[] field1102; - @ObfuscatedName("s") - static final int[] field1107; - @ObfuscatedName("p") - static final int[] field1100; @ObfuscatedName("c") - static final int[] field1105; - @ObfuscatedName("n") - static final int[] field1106; - @ObfuscatedName("l") - static final int[] field1097; - @ObfuscatedName("w") + static final int[] field907; + @ObfuscatedName("i") + static final int[] field908; + @ObfuscatedName("m") + static final int[] field905; + @ObfuscatedName("b") + static final int[] field912; + @ObfuscatedName("z") + static final int[] field903; + @ObfuscatedName("d") + static final int[] field914; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 892658251 + intValue = -1747716653 ) - static int field1108; - @ObfuscatedName("a") + static int field913; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1828170801 + intValue = -589771949 ) - static int field1109; + static int field899; + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = 1644626137 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; static { - Tiles_heights = new int[4][105][105]; // L: 16 - Tiles_renderFlags = new byte[4][104][104]; // L: 17 - Tiles_minPlane = 99; // L: 18 - field1102 = new int[]{1, 2, 4, 8}; // L: 34 - field1107 = new int[]{16, 32, 64, 128}; // L: 35 - field1100 = new int[]{1, 0, -1, 0}; // L: 36 - field1105 = new int[]{0, -1, 0, 1}; - field1106 = new int[]{1, -1, -1, 1}; - field1097 = new int[]{-1, -1, 1, 1}; - field1108 = (int)(Math.random() * 17.0D) - 8; - field1109 = (int)(Math.random() * 33.0D) - 16; + Tiles_heights = new int[4][105][105]; + Tiles_renderFlags = new byte[4][104][104]; + Tiles_minPlane = 99; + field907 = new int[]{1, 2, 4, 8}; + field908 = new int[]{16, 32, 64, 128}; + field905 = new int[]{1, 0, -1, 0}; + field912 = new int[]{0, -1, 0, 1}; + field903 = new int[]{1, -1, -1, 1}; + field914 = new int[]{-1, -1, 1, 1}; + field913 = (int)(Math.random() * 17.0D) - 8; + field899 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Leu;", - garbageValue = "-1940168302" + descriptor = "(I)[Lja;", + garbageValue = "853934177" ) - @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 static GameBuild[] method1769() { + return new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE, GameBuild.WIP}; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "2117423398" + ) + static final void method1747(PacketBuffer var0) { + int var1 = 0; + var0.importIndex(); + + byte[] var10000; + int var2; + int var4; + int var5; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var5 = Players.Players_indices[var2]; + if ((Players.field1174[var5] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class249.method4826(var0); + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + Renderable.readPlayerUpdate(var0, var5); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); } 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)); + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var5 = Players.Players_indices[var2]; + if ((Players.field1174[var5] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class249.method4826(var0); + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + Renderable.readPlayerUpdate(var0, var5); + } + } + } } - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43 - return var1; // L: 44 - } - } + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)Lez;", - garbageValue = "107" - ) - @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)); + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var5 = Players.Players_emptyIndices[var2]; + if ((Players.field1174[var5] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class249.method4826(var0); + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class102.updateExternalPlayer(var0, var5)) { + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var5 = Players.Players_emptyIndices[var2]; + if ((Players.field1174[var5] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class249.method4826(var0); + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class102.updateExternalPlayer(var0, var5)) { + var10000 = Players.field1174; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var2 = 1; var2 < 2048; ++var2) { + var10000 = Players.field1174; + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var3 = Client.players[var2]; + if (var3 != null) { + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = 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("h") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1675810560" - ) - public static int[] method2154() { - int[] var0 = new int[KeyHandler.field274]; // L: 257 - - for (int var1 = 0; var1 < KeyHandler.field274; ++var1) { // L: 258 - var0[var1] = KeyHandler.field273[var1]; // L: 259 - } - - return var0; // L: 261 - } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 0f7a53bdd7..b7fd773e0e 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,174 +4,170 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kv") @Implements("Timer") public class Timer { - @ObfuscatedName("cd") - public static char field3780; - @ObfuscatedName("mt") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -581156997 + longValue = 68758219064422731L ) - @Export("selectedItemSlot") - static int selectedItemSlot; - @ObfuscatedName("f") + long field3785; + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -8319452105604280943L + longValue = -9128845049846382831L ) - long field3770; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = -4202680176653939475L - ) - long field3771; + long field3780; @ObfuscatedName("v") - public boolean field3772; - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = -6108273028306314795L - ) - long field3777; + public boolean field3781; @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -3021156974356860875L + longValue = -930718680271849775L ) - long field3774; - @ObfuscatedName("o") + long field3782; + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -4665176274502754377L + longValue = -2186555360260394021L ) - long field3775; - @ObfuscatedName("m") + long field3784; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -460386751 + longValue = 8669267677054780603L ) - int field3773; - @ObfuscatedName("r") + long field3788; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1685103385 + intValue = 1497157347 ) - int field3778; - @ObfuscatedName("h") + int field3786; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1772065697 - ) - int field3776; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1176466241 + intValue = -1042800783 ) int field3779; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1399840741 + ) + int field3787; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -626916419 + ) + int field3783; public Timer() { - this.field3770 = -1L; // L: 7 - this.field3771 = -1L; // L: 8 - this.field3772 = false; // L: 9 - this.field3777 = 0L; // L: 10 - this.field3774 = 0L; // L: 11 - this.field3775 = 0L; // L: 12 - this.field3773 = 0; // L: 13 - this.field3778 = 0; // L: 14 - this.field3776 = 0; // L: 15 - this.field3779 = 0; // L: 16 + this.field3785 = -1L; + this.field3780 = -1L; + this.field3781 = false; + this.field3782 = 0L; + this.field3784 = 0L; + this.field3788 = 0L; + this.field3786 = 0; + this.field3779 = 0; + this.field3787 = 0; + this.field3783 = 0; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1876708169" + garbageValue = "1486512703" ) - public void method5690() { - this.field3770 = ClientPacket.currentTimeMillis(); // L: 19 - } // L: 20 + public void method5657() { + this.field3785 = UrlRequester.method2125(); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-962261688" + garbageValue = "1053887599" ) - public void method5672() { - if (-1L != this.field3770) { // L: 23 - this.field3774 = ClientPacket.currentTimeMillis() - this.field3770; // L: 24 - this.field3770 = -1L; // L: 25 + public void method5658() { + if (this.field3785 != -1L) { + this.field3784 = UrlRequester.method2125() - this.field3785; + this.field3785 = -1L; } - } // L: 27 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-28" + descriptor = "(II)V", + garbageValue = "-537573102" ) - public void method5675(int var1) { - this.field3771 = ClientPacket.currentTimeMillis(); // L: 30 - this.field3773 = var1; // L: 31 - } // L: 32 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-95839674" - ) - public void method5676() { - if (this.field3771 != -1L) { // L: 35 - this.field3777 = ClientPacket.currentTimeMillis() - this.field3771; // L: 36 - this.field3771 = -1L; // L: 37 - } - - ++this.field3776; // L: 39 - this.field3772 = true; // L: 40 - } // L: 41 + public void method5662(int var1) { + this.field3780 = UrlRequester.method2125(); + this.field3786 = var1; + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "337371050" ) public void method5677() { - this.field3772 = false; // L: 44 - this.field3778 = 0; // L: 45 - } // L: 46 + if (-1L != this.field3780) { + this.field3782 = UrlRequester.method2125() - this.field3780; + this.field3780 = -1L; + } - @ObfuscatedName("o") + ++this.field3787; + this.field3781 = true; + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1992092142" + garbageValue = "962935655" ) - public void method5678() { - this.method5676(); // L: 49 - } // L: 50 + public void method5661() { + this.field3781 = false; + this.field3779 = 0; + } - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "646714111" + descriptor = "(I)V", + garbageValue = "-1319729393" + ) + public void method5666() { + this.method5677(); + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "774902222" ) @Export("write") public void write(Buffer var1) { - ClanChannel.method56(var1, this.field3774); // L: 53 - ClanChannel.method56(var1, this.field3777); // L: 54 - ClanChannel.method56(var1, this.field3775); // L: 55 - var1.writeShort(this.field3773); // L: 56 - var1.writeShort(this.field3778); - var1.writeShort(this.field3776); + class262.method4896(var1, this.field3784); + class262.method4896(var1, this.field3782); + class262.method4896(var1, this.field3788); + var1.writeShort(this.field3786); var1.writeShort(this.field3779); - } // L: 60 + var1.writeShort(this.field3787); + var1.writeShort(this.field3783); + } - @ObfuscatedName("e") + @ObfuscatedName("ju") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Loc;" + descriptor = "(IB)V", + garbageValue = "24" ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { // L: 57 - var2 = (RunException)var0; // L: 58 - var2.message = var2.message + ' ' + var1; // L: 59 - } else { - var2 = new RunException(var0, var1); // L: 61 - } + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (Huffman.loadInterface(var0)) { + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; - return var2; // L: 62 + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + } + } + + } } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 7d65e0d443..91a0a2b93b 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -3,34 +3,34 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("li") @Implements("TriBool") public class TriBool { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("TriBool_true") public static final TriBool TriBool_true; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lli;" ) @Export("TriBool_false") public static final TriBool TriBool_false; static { - TriBool_unknown = new TriBool(); // L: 4 - TriBool_true = new TriBool(); // L: 5 - TriBool_false = new TriBool(); // L: 6 + TriBool_unknown = new TriBool(); + TriBool_true = new TriBool(); + TriBool_false = new TriBool(); } TriBool() { - } // L: 8 + } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 8a0130c2ce..98d8e62fe3 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -4,16 +4,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dc") +@ObfuscatedName("cd") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("gf") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("f") + @ObfuscatedName("np") + @ObfuscatedSignature( + descriptor = "[Lio;" + ) + static Widget[] field1224; + @ObfuscatedName("s") @Export("url") final URL url; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("isDone0") volatile boolean isDone0; @ObfuscatedName("v") @@ -21,475 +23,49 @@ public class UrlRequest { volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; // L: 96 + this.url = var1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-1069253032" ) @Export("isDone") public boolean isDone() { - return this.isDone0; // L: 100 + return this.isDone0; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "669779460" + garbageValue = "1904791034" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "841550711" + descriptor = "(Ljy;Ljy;I)V", + garbageValue = "-909646221" ) - static final void method2520(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 48 - for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 49 - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 50 - class43.field307[0][var5][var4] = 127; // L: 51 - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var5 == var0 + var2 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; // L: 53 - } - - if (var4 == var1 && var4 > 0) { // L: 54 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var4 == var3 + var1 && var4 < 103) { // L: 55 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - - } // L: 59 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)J", - garbageValue = "1235169435" - ) - public static long method2516(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 52 + public static void method2141(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; + class406.SpotAnimationDefinition_modelArchive = var1; } - @ObfuscatedName("y") + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-79" + descriptor = "(IIB)V", + garbageValue = "0" ) - static void method2519(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 85 - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 86 - int var5 = 0; // L: 87 - if (var1 > var4.field937) { // L: 88 - var5 += var1 - var4.field937; - } else if (var1 < var4.x) { // L: 89 - var5 += var4.x - var1; - } - - if (var2 > var4.field944) { // L: 90 - var5 += var2 - var4.field944; - } else if (var2 < var4.y) { // L: 91 - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field939 && class4.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 92 - var5 -= 64; // L: 103 - if (var5 < 0) { // L: 104 - var5 = 0; - } - - int var6 = (var4.field939 - var5) * class4.clientPreferences.areaSoundEffectsVolume / var4.field939; // L: 105 - if (var4.stream1 == null) { // L: 106 - if (var4.soundEffectId >= 0) { // L: 107 - SoundEffect var7 = SoundEffect.readSoundEffect(class26.archive4, var4.soundEffectId, 0); // L: 108 - if (var7 != null) { // L: 109 - RawSound var8 = var7.toRawSound().resample(WorldMapAreaData.decimator); // L: 110 - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 111 - var9.setNumLoops(-1); // L: 112 - UserComparator7.pcmStreamMixer.addSubStream(var9); // L: 113 - var4.stream1 = var9; // L: 114 - } - } - } else { - var4.stream1.method936(var6); // L: 118 - } - - if (var4.stream2 == null) { // L: 119 - if (var4.soundEffectIds != null && (var4.field945 -= var3) <= 0) { // L: 120 - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 121 - SoundEffect var12 = SoundEffect.readSoundEffect(class26.archive4, var4.soundEffectIds[var11], 0); // L: 122 - if (var12 != null) { // L: 123 - RawSound var13 = var12.toRawSound().resample(WorldMapAreaData.decimator); // L: 124 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 125 - var10.setNumLoops(0); // L: 126 - UserComparator7.pcmStreamMixer.addSubStream(var10); // L: 127 - var4.stream2 = var10; // L: 128 - var4.field945 = var4.field941 + (int)(Math.random() * (double)(var4.field943 - var4.field941)); // L: 129 - } - } - } else { - var4.stream2.method936(var6); // L: 134 - if (!var4.stream2.hasNext()) { // L: 135 - var4.stream2 = null; // L: 136 - } - } - } else { - if (var4.stream1 != null) { // L: 93 - UserComparator7.pcmStreamMixer.removeSubStream(var4.stream1); // L: 94 - var4.stream1 = null; // L: 95 - } - - if (var4.stream2 != null) { // L: 97 - UserComparator7.pcmStreamMixer.removeSubStream(var4.stream2); // L: 98 - var4.stream2 = null; // L: 99 - } - } - } + static void method2136(int var0, int var1) { + if (Decimator.clientPreferences.musicVolume != 0 && var0 != -1) { + Players.method2022(class339.archive11, var0, 0, Decimator.clientPreferences.musicVolume, false); + Client.field647 = true; } - } // L: 140 - - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(IZZZS)Ljf;", - garbageValue = "-28511" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 2419 - if (JagexCache.JagexCache_dat2File != null) { // L: 2420 - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class369.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, WorldMapID.masterDisk, var0, var1, var2, var3); // L: 2421 } - - @ObfuscatedName("ht") - @ObfuscatedSignature( - descriptor = "(Lhj;I)V", - garbageValue = "1535496544" - ) - static final void method2511(class226 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7025 - int var2; - int var3; - int var4; - int var5; - int var6; - TileItem var35; - if (class226.field2687 == var0) { // L: 7026 - var2 = var1.method6643(); // L: 7027 - var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7028 - var4 = (var2 & 7) + class15.field128; // L: 7029 - var5 = var1.method6653(); // L: 7030 - var6 = var1.method6652(); // L: 7031 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7032 - var35 = new TileItem(); // L: 7033 - var35.id = var5; // L: 7034 - var35.quantity = var6; // L: 7035 - if (Client.groundItems[SoundSystem.Client_plane][var3][var4] == null) { // L: 7036 - Client.groundItems[SoundSystem.Client_plane][var3][var4] = new NodeDeque(); - } - - Client.groundItems[SoundSystem.Client_plane][var3][var4].addFirst(var35); // L: 7037 - class26.updateItemPile(var3, var4); // L: 7038 - } - - } else { - int var7; - if (class226.field2693 == var0) { // L: 7042 - var2 = var1.readUnsignedShort(); // L: 7043 - var3 = var1.method6652(); // L: 7044 - var4 = var1.method6653(); // L: 7045 - var5 = var1.method6643(); // L: 7046 - var6 = (var5 >> 4 & 7) + WorldMapSection0.field2047; // L: 7047 - var7 = (var5 & 7) + class15.field128; // L: 7048 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7049 - NodeDeque var42 = Client.groundItems[SoundSystem.Client_plane][var6][var7]; // L: 7050 - if (var42 != null) { // L: 7051 - for (TileItem var36 = (TileItem)var42.last(); var36 != null; var36 = (TileItem)var42.previous()) { // L: 7052 7053 7058 - if ((var4 & 32767) == var36.id && var2 == var36.quantity) { // L: 7054 - var36.quantity = var3; // L: 7055 - break; - } - } - - class26.updateItemPile(var6, var7); // L: 7060 - } - } - - } else { - int var8; - int var9; - if (class226.field2683 == var0) { // L: 7065 - var2 = var1.method6642(); // L: 7066 - var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7067 - var4 = (var2 & 7) + class15.field128; // L: 7068 - var5 = var1.method6651(); // L: 7069 - var6 = var1.method6643(); // L: 7070 - var7 = var6 >> 2; // L: 7071 - var8 = var6 & 3; // L: 7072 - var9 = Client.field682[var7]; // L: 7073 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7074 - class375.updatePendingSpawn(SoundSystem.Client_plane, var3, var4, var9, var5, var7, var8, 0, -1); // L: 7075 - } - - } else if (class226.field2684 == var0) { // L: 7079 - var2 = var1.method6642(); // L: 7080 - var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7081 - var4 = (var2 & 7) + class15.field128; // L: 7082 - var5 = var1.method6653(); // L: 7083 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7084 - NodeDeque var34 = Client.groundItems[SoundSystem.Client_plane][var3][var4]; // L: 7085 - if (var34 != null) { // L: 7086 - for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { // L: 7087 7088 7093 - if ((var5 & 32767) == var35.id) { // L: 7089 - var35.remove(); // L: 7090 - break; - } - } - - if (var34.last() == null) { // L: 7095 - Client.groundItems[SoundSystem.Client_plane][var3][var4] = null; - } - - class26.updateItemPile(var3, var4); // L: 7096 - } - } - - } else { - int var11; - if (class226.field2686 == var0) { // L: 7101 - var2 = var1.method6643(); // L: 7102 - var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7103 - var4 = (var2 & 7) + class15.field128; // L: 7104 - var5 = var1.readUnsignedByte(); // L: 7105 - var6 = var5 >> 2; // L: 7106 - var7 = var5 & 3; // L: 7107 - var8 = Client.field682[var6]; // L: 7108 - var9 = var1.method6652(); // L: 7109 - if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 7110 - if (var8 == 0) { // L: 7111 - BoundaryObject var33 = DevicePcmPlayerProvider.scene.method4058(SoundSystem.Client_plane, var3, var4); // L: 7112 - if (var33 != null) { // L: 7113 - var11 = Message.Entity_unpackID(var33.tag); // L: 7114 - if (var6 == 2) { // L: 7115 - var33.renderable1 = new DynamicObject(var11, 2, var7 + 4, SoundSystem.Client_plane, var3, var4, var9, false, var33.renderable1); // L: 7116 - var33.renderable2 = new DynamicObject(var11, 2, var7 + 1 & 3, SoundSystem.Client_plane, var3, var4, var9, false, var33.renderable2); // L: 7117 - } else { - var33.renderable1 = new DynamicObject(var11, var6, var7, SoundSystem.Client_plane, var3, var4, var9, false, var33.renderable1); // L: 7119 - } - } - } - - if (var8 == 1) { // L: 7122 - WallDecoration var43 = DevicePcmPlayerProvider.scene.method4059(SoundSystem.Client_plane, var3, var4); // L: 7123 - if (var43 != null) { // L: 7124 - var11 = Message.Entity_unpackID(var43.tag); // L: 7125 - if (var6 != 4 && var6 != 5) { // L: 7126 - if (var6 == 6) { // L: 7127 - var43.renderable1 = new DynamicObject(var11, 4, var7 + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1); - } else if (var6 == 7) { // L: 7128 - var43.renderable1 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1); - } else if (var6 == 8) { // L: 7129 - var43.renderable1 = new DynamicObject(var11, 4, var7 + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1); // L: 7130 - var43.renderable2 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable2); // L: 7131 - } - } else { - var43.renderable1 = new DynamicObject(var11, 4, var7, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1); - } - } - } - - if (var8 == 2) { // L: 7135 - GameObject var44 = DevicePcmPlayerProvider.scene.method4094(SoundSystem.Client_plane, var3, var4); // L: 7136 - if (var6 == 11) { // L: 7137 - var6 = 10; - } - - if (var44 != null) { // L: 7138 - var44.renderable = new DynamicObject(Message.Entity_unpackID(var44.tag), var6, var7, SoundSystem.Client_plane, var3, var4, var9, false, var44.renderable); - } - } - - if (var8 == 3) { // L: 7140 - FloorDecoration var45 = DevicePcmPlayerProvider.scene.getFloorDecoration(SoundSystem.Client_plane, var3, var4); // L: 7141 - if (var45 != null) { - var45.renderable = new DynamicObject(Message.Entity_unpackID(var45.tag), 22, var7, SoundSystem.Client_plane, var3, var4, var9, false, var45.renderable); // L: 7142 - } - } - } - - } else { - int var10; - if (class226.field2688 == var0) { // L: 7147 - var2 = var1.method6642(); // L: 7148 - var3 = var1.readUnsignedByte(); // L: 7149 - var4 = (var3 >> 4 & 7) + WorldMapSection0.field2047; // L: 7150 - var5 = (var3 & 7) + class15.field128; // L: 7151 - var6 = var1.readUnsignedShort(); // L: 7152 - var7 = var1.method6643(); // L: 7153 - var8 = var7 >> 4 & 15; // L: 7154 - var9 = var7 & 7; // L: 7155 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7156 - var10 = var8 + 1; // L: 7157 - if (class262.localPlayer.pathX[0] >= var4 - var10 && class262.localPlayer.pathX[0] <= var4 + var10 && class262.localPlayer.pathY[0] >= var5 - var10 && class262.localPlayer.pathY[0] <= var10 + var5 && class4.clientPreferences.areaSoundEffectsVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { // L: 7158 7159 - Client.soundEffectIds[Client.soundEffectCount] = var6; // L: 7160 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; // L: 7161 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 7162 - Client.soundEffects[Client.soundEffectCount] = null; // L: 7163 - Client.soundLocations[Client.soundEffectCount] = var8 + (var5 << 8) + (var4 << 16); // L: 7164 - ++Client.soundEffectCount; // L: 7165 - } - } - } - - if (class226.field2690 == var0) { // L: 7170 - var2 = var1.method6643(); // L: 7171 - var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7172 - var4 = (var2 & 7) + class15.field128; // L: 7173 - var5 = var1.readUnsignedByte(); // L: 7174 - var6 = var5 >> 2; // L: 7175 - var7 = var5 & 3; // L: 7176 - var8 = Client.field682[var6]; // L: 7177 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7178 - class375.updatePendingSpawn(SoundSystem.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7179 - } - - } else { - int var12; - int var14; - if (class226.field2691 == var0) { // L: 7183 - var2 = var1.readUnsignedShort(); // L: 7184 - var3 = var1.readUnsignedShort(); // L: 7185 - var4 = var1.method6642(); // L: 7186 - var5 = (var4 >> 4 & 7) + WorldMapSection0.field2047; // L: 7187 - var6 = (var4 & 7) + class15.field128; // L: 7188 - byte var38 = var1.method6750(); // L: 7189 - byte var39 = var1.method6750(); // L: 7190 - var9 = var1.method6642(); // L: 7191 - var10 = var9 >> 2; // L: 7192 - var11 = var9 & 3; // L: 7193 - var12 = Client.field682[var10]; // L: 7194 - byte var13 = var1.readByte(); // L: 7195 - var14 = var1.method6653(); // L: 7196 - byte var15 = var1.readByte(); // L: 7197 - int var16 = var1.method6651(); // L: 7198 - Player var17; - if (var3 == Client.localPlayerIndex) { // L: 7200 - var17 = class262.localPlayer; - } else { - var17 = Client.players[var3]; // L: 7201 - } - - if (var17 != null) { // L: 7202 - ObjectComposition var18 = Tiles.getObjectDefinition(var2); // L: 7203 - int var19; - int var20; - if (var11 != 1 && var11 != 3) { // L: 7206 - var19 = var18.sizeX; // L: 7211 - var20 = var18.sizeY; // L: 7212 - } else { - var19 = var18.sizeY; // L: 7207 - var20 = var18.sizeX; // L: 7208 - } - - int var21 = var5 + (var19 >> 1); // L: 7214 - int var22 = var5 + (var19 + 1 >> 1); // L: 7215 - int var23 = var6 + (var20 >> 1); // L: 7216 - int var24 = var6 + (var20 + 1 >> 1); // L: 7217 - int[][] var25 = Tiles.Tiles_heights[SoundSystem.Client_plane]; // L: 7218 - int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; // L: 7219 - int var27 = (var5 << 7) + (var19 << 6); // L: 7220 - int var28 = (var6 << 7) + (var20 << 6); // L: 7221 - Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7222 - if (var29 != null) { // L: 7223 - class375.updatePendingSpawn(SoundSystem.Client_plane, var5, var6, var12, -1, 0, 0, var14 + 1, var16 + 1); // L: 7224 - var17.animationCycleStart = var14 + Client.cycle; // L: 7225 - var17.animationCycleEnd = var16 + Client.cycle; // L: 7226 - var17.model0 = var29; // L: 7227 - var17.field1185 = var19 * 64 + var5 * 128; // L: 7228 - var17.field1197 = var20 * 64 + var6 * 128; // L: 7229 - var17.tileHeight2 = var26; // L: 7230 - byte var30; - if (var13 > var15) { // L: 7231 - var30 = var13; // L: 7232 - var13 = var15; // L: 7233 - var15 = var30; // L: 7234 - } - - if (var39 > var38) { // L: 7236 - var30 = var39; // L: 7237 - var39 = var38; // L: 7238 - var38 = var30; // L: 7239 - } - - var17.minX = var13 + var5; // L: 7241 - var17.maxX = var15 + var5; // L: 7242 - var17.minY = var6 + var39; // L: 7243 - var17.maxY = var6 + var38; // L: 7244 - } - } - } - - if (class226.field2689 == var0) { // L: 7248 - var2 = var1.method6757(); // L: 7249 - byte var37 = var1.method6619(); // L: 7250 - var4 = var1.method6651(); // L: 7251 - var5 = var1.method6653(); // L: 7252 - var6 = var1.method6644(); // L: 7253 - var7 = var1.method6652(); // L: 7254 - var8 = var1.readUnsignedByte(); // L: 7255 - var9 = (var8 >> 4 & 7) + WorldMapSection0.field2047; // L: 7256 - var10 = (var8 & 7) + class15.field128; // L: 7257 - var11 = var1.method6643(); // L: 7258 - byte var40 = var1.readByte(); // L: 7259 - int var41 = var1.method6644() * 4; // L: 7260 - var14 = var1.method6643() * 4; // L: 7261 - var3 = var37 + var9; // L: 7262 - var12 = var40 + var10; // L: 7263 - if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var3 >= 0 && var12 >= 0 && var3 < 104 && var12 < 104 && var7 != 65535) { // L: 7264 - var9 = var9 * 128 + 64; // L: 7265 - var10 = var10 * 128 + 64; // L: 7266 - var3 = var3 * 128 + 64; // L: 7267 - var12 = var12 * 128 + 64; // L: 7268 - Projectile var32 = new Projectile(var7, SoundSystem.Client_plane, var9, var10, ItemContainer.getTileHeight(var9, var10, SoundSystem.Client_plane) - var14, var4 + Client.cycle, var5 + Client.cycle, var6, var11, var2, var41); // L: 7269 - var32.setDestination(var3, var12, ItemContainer.getTileHeight(var3, var12, SoundSystem.Client_plane) - var41, var4 + Client.cycle); // L: 7270 - Client.projectiles.addFirst(var32); // L: 7271 - } - - } else if (class226.field2692 == var0) { // L: 7275 - var2 = var1.method6651(); // L: 7276 - var3 = var1.method6642(); // L: 7277 - var4 = (var3 >> 4 & 7) + WorldMapSection0.field2047; // L: 7278 - var5 = (var3 & 7) + class15.field128; // L: 7279 - var6 = var1.method6643(); // L: 7280 - var7 = var1.method6652(); // L: 7281 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7282 - var4 = var4 * 128 + 64; // L: 7283 - var5 = var5 * 128 + 64; // L: 7284 - GraphicsObject var31 = new GraphicsObject(var7, SoundSystem.Client_plane, var4, var5, ItemContainer.getTileHeight(var4, var5, SoundSystem.Client_plane) - var6, var2, Client.cycle); // L: 7285 - Client.graphicsObjects.addFirst(var31); // L: 7286 - } - - } - } - } - } - } - } - } // L: 7040 7063 7077 7099 7145 7181 7273 7288 7290 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 246c3a6366..0c0df60dd9 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -10,31 +10,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("cn") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("ri") - @ObfuscatedSignature( - descriptor = "Lbq;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("m") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lco;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("gq") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("thread") final Thread thread; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("isClosed") volatile boolean isClosed; @ObfuscatedName("v") @@ -42,123 +24,139 @@ public class UrlRequester implements Runnable { 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 - } // L: 21 + this.requests = new LinkedList(); + this.thread = new Thread(this); + this.thread.setPriority(1); + this.thread.start(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Ldc;", - garbageValue = "-1779738307" + descriptor = "(Ljava/net/URL;I)Lcd;", + garbageValue = "797764563" ) @Export("request") public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); // L: 71 - synchronized(this) { // L: 72 - this.requests.add(var2); // L: 73 - this.notify(); // L: 74 - return var2; // L: 76 + UrlRequest var2 = new UrlRequest(var1); + synchronized(this) { + this.requests.add(var2); + this.notify(); + return var2; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "256" + descriptor = "(B)V", + garbageValue = "-71" ) @Export("close") public void close() { - this.isClosed = true; // L: 80 + this.isClosed = true; try { - synchronized(this) { // L: 82 - this.notify(); // L: 83 - } // L: 84 + synchronized(this) { + this.notify(); + } - this.thread.join(); // L: 85 - } catch (InterruptedException var4) { // L: 87 + this.thread.join(); + } catch (InterruptedException var4) { } - } // L: 88 + } public void run() { - while (!this.isClosed) { // L: 24 + while (!this.isClosed) { try { UrlRequest var1; - synchronized(this) { // L: 27 - var1 = (UrlRequest)this.requests.poll(); // L: 28 - if (var1 == null) { // L: 29 + synchronized(this) { + var1 = (UrlRequest)this.requests.poll(); + if (var1 == null) { try { - this.wait(); // L: 31 - } catch (InterruptedException var13) { // L: 33 + this.wait(); + } catch (InterruptedException var13) { } continue; } } - DataInputStream var2 = null; // L: 37 - URLConnection var3 = null; // L: 38 + DataInputStream var2 = null; + URLConnection var3 = null; try { - var3 = var1.url.openConnection(); // L: 40 - var3.setConnectTimeout(5000); // L: 41 - var3.setReadTimeout(5000); // L: 42 - var3.setUseCaches(false); // L: 43 - var3.setRequestProperty("Connection", "close"); // L: 44 - int var7 = var3.getContentLength(); // L: 45 - if (var7 >= 0) { // L: 46 - byte[] var5 = new byte[var7]; // L: 47 - var2 = new DataInputStream(var3.getInputStream()); // L: 48 - var2.readFully(var5); // L: 49 - var1.response0 = var5; // L: 50 + var3 = var1.url.openConnection(); + var3.setConnectTimeout(5000); + var3.setReadTimeout(5000); + var3.setUseCaches(false); + var3.setRequestProperty("Connection", "close"); + int var7 = var3.getContentLength(); + if (var7 >= 0) { + byte[] var5 = new byte[var7]; + var2 = new DataInputStream(var3.getInputStream()); + var2.readFully(var5); + var1.response0 = var5; } - var1.isDone0 = true; // L: 52 - } catch (IOException var14) { // L: 54 - var1.isDone0 = true; // L: 55 + var1.isDone0 = true; + } catch (IOException var14) { + var1.isDone0 = true; } finally { - if (var2 != null) { // L: 58 + if (var2 != null) { var2.close(); } - if (var3 != null && var3 instanceof HttpURLConnection) { // L: 59 - ((HttpURLConnection)var3).disconnect(); // L: 60 + if (var3 != null && var3 instanceof HttpURLConnection) { + ((HttpURLConnection)var3).disconnect(); } } } catch (Exception var17) { - FriendsChat.RunException_sendStackTrace((String)null, var17); + BufferedSink.RunException_sendStackTrace((String)null, var17); } } } - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "117" + descriptor = "(B)J", + garbageValue = "-60" ) - public static int method2504(int var0) { - --var0; // L: 64 - var0 |= var0 >>> 1; // L: 65 - var0 |= var0 >>> 2; // L: 66 - var0 |= var0 >>> 4; // L: 67 - var0 |= var0 >>> 8; // L: 68 - var0 |= var0 >>> 16; // L: 69 - return var0 + 1; // L: 70 + public static final synchronized long method2125() { + long var0 = System.currentTimeMillis(); + if (var0 < GrandExchangeOfferNameComparator.field3625) { + class381.field4173 += GrandExchangeOfferNameComparator.field3625 - var0; + } + + GrandExchangeOfferNameComparator.field3625 = var0; + return class381.field4173 + var0; } - @ObfuscatedName("h") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "216480272" + descriptor = "(IB)Lio;", + garbageValue = "57" ) - static final int method2509(int var0, int var1) { - int var2 = AttackOption.method2378(var0 - 1, var1 - 1) + AttackOption.method2378(var0 + 1, var1 - 1) + AttackOption.method2378(var0 - 1, var1 + 1) + AttackOption.method2378(1 + var0, 1 + var1); // L: 830 - int var3 = AttackOption.method2378(var0 - 1, var1) + AttackOption.method2378(1 + var0, var1) + AttackOption.method2378(var0, var1 - 1) + AttackOption.method2378(var0, var1 + 1); // L: 831 - int var4 = AttackOption.method2378(var0, var1); // L: 832 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 833 + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = Huffman.loadInterface(var1); + if (!var3) { + return null; + } + } + + return Widget.Widget_interfaceComponents[var1][var2]; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-24" + ) + public static void method2126() { + PlayerComposition.PlayerAppearance_cachedModels.clear(); } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 56f9f14ba5..d58564bb4e 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,87 +3,94 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lm") @Implements("User") public class User implements Comparable { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Loh;" ) @Export("username") Username username; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Loh;" ) @Export("previousUsername") Username previousUsername; User() { - } // L: 7 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llf;I)I", - garbageValue = "-1545273649" + descriptor = "(Llm;I)I", + garbageValue = "2074675333" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.username.compareToTyped(var1.username); // L: 30 + return this.username.compareToTyped(var1.username); } - @ObfuscatedName("a") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Llc;", - garbageValue = "1609286013" + descriptor = "(I)Loh;", + garbageValue = "-1358894970" ) @Export("getUsername") public Username getUsername() { - return this.username; // L: 10 + return this.username; } - @ObfuscatedName("aw") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-507308651" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "126" ) @Export("getName") public String getName() { - return this.username == null ? "" : this.username.getName(); // L: 14 15 + return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1933928316" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "1" ) @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20 + return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("ad") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Llc;Llc;I)V", - garbageValue = "-2071487865" + descriptor = "(Loh;Loh;B)V", + garbageValue = "0" ) @Export("set") void set(Username var1, Username var2) { - if (var1 == null) { // L: 24 + if (var1 == null) { throw new NullPointerException(); } else { - this.username = var1; // L: 25 - this.previousUsername = var2; // L: 26 + this.username = var1; + this.previousUsername = var2; } - } // L: 27 + } public int compareTo(Object var1) { - return this.compareTo_user((User)var1); // L: 34 + return this.compareTo_user((User)var1); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IZIZI)V", + garbageValue = "-1915260580" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class15.World_worlds != null) { + class367.doWorldSorting(0, class15.World_worlds.length - 1, var0, var1, var2, var3); + } + } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 81eafd7154..6f4094ae95 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -1,41 +1,35 @@ 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("ng") +@ObfuscatedName("ne") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -82634641 - ) - public static int field4220; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator1(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Llf;Llf;I)I", - garbageValue = "652408691" + descriptor = "(Llm;Llm;I)I", + garbageValue = "-994030782" ) @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 + return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); } public boolean equals(Object var1) { - return super.equals(var1); // L: 22 + return super.equals(var1); + } + + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 5657304eba..f23dbe5593 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,36 +1,37 @@ +import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("cs") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("f") + @ObfuscatedName("aq") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("ak") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;I)I", - garbageValue = "-569162831" + descriptor = "(Llr;Llr;I)I", + garbageValue = "-2024062782" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 + if (Client.worldId == var1.world && var2.world == Client.worldId) { + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } else { - return this.compareUser(var1, var2); // L: 18 + return this.compareUser(var1, var2); } } @@ -38,68 +39,13 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V", - garbageValue = "89" + descriptor = "(Lbq;I)V", + garbageValue = "519737207" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - SecureRandomCallable.addChatMessage(var0, var1, var2, (String)null); + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class78.runScript(var0, 500000, 475000); } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Led;", - garbageValue = "1800688185" - ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 - return var1; // L: 28 - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Leh;", - garbageValue = "844202869" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 19 - if (var1 != null) { // L: 20 - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 21 - var1 = new StructComposition(); // L: 22 - if (var2 != null) { // L: 23 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 24 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 25 - return var1; // L: 26 - } - } - - @ObfuscatedName("kg") - static final void method2568(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11102 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11103 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 11105 - class4.clientPreferences.field1312 = var0; // L: 11107 - Actor.savePreferences(); // L: 11108 - } // L: 11109 } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 790772cb7a..d5a4ee7619 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,57 +1,35 @@ 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("nd") +@ObfuscatedName("op") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("ev") - @ObfuscatedGetter( - intValue = 1703708567 - ) - @Export("currentPort") - static int currentPort; - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator2(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Llf;Llf;I)I", - garbageValue = "-85390661" + descriptor = "(Llm;Llm;I)I", + garbageValue = "1583489232" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 - } - - public boolean equals(Object var1) { - return super.equals(var1); // L: 22 + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); // L: 18 + return this.compare_bridged((User)var1, (User)var2); } - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "173515967" - ) - public static int method6890(int var0) { - return class231.field2817[var0]; // L: 38 + public boolean equals(Object var1) { + return super.equals(var1); } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 553e7cfba8..97614bff99 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,59 +1,55 @@ 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("de") +@ObfuscatedName("cy") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("dm") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("lo") - @ObfuscatedGetter( - intValue = -350817607 + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ljy;" ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("f") + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator3(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;I)I", - garbageValue = "-462849378" + descriptor = "(Llr;Llr;I)I", + garbageValue = "1300011353" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.world != var1.world) { // L: 14 - return this.reversed ? var1.world - var2.world : var2.world - var1.world; // L: 15 + if (var2.world != var1.world) { + return this.reversed ? var1.world - var2.world : var2.world - var1.world; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIZIB)J", - garbageValue = "-13" + descriptor = "(IIS)I", + garbageValue = "14176" ) - @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: 68 - if (var3) { // L: 69 - var5 |= 65536L; + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; } - - return var5; // L: 70 } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 7c0f161a58..6e59e786d5 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -4,659 +4,191 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("co") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("ga") - @Export("regions") - static int[] regions; - @ObfuscatedName("f") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "[Lom;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator4(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;I)I", - garbageValue = "1741486756" + descriptor = "(Llr;Llr;I)I", + garbageValue = "1546969977" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 - } - - public boolean equals(Object var1) { - return super.equals(var1); // L: 22 + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } public int compare(Object var1, Object var2) { - return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 + return this.compare_bridged((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ay") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "61" + descriptor = "(Ljs;Ljava/lang/String;I)V", + garbageValue = "1444277374" ) - static int method2529(int var0, Script var1, boolean var2) { - if (var0 == 6900) { // L: 4261 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4262 - return 1; // L: 4263 - } else if (var0 == 6950) { // L: 4265 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4266 - return 1; // L: 4267 + static void method2143(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field682 += var2.groupCount; + } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1734558786" + ) + static void method2149() { + if (Client.renderSelf) { + ApproximateRouteStrategy.addPlayerToScene(MouseHandler.localPlayer, false); + } + + } + + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "70378358" + ) + static final int method2150() { + if (Decimator.clientPreferences.roofsHidden) { + return GrandExchangeEvent.Client_plane; } else { - return 2; // L: 4269 + int var0 = 3; + if (class116.cameraPitch < 310) { + int var1; + int var2; + if (Client.oculusOrbState == 1) { + var1 = KeyHandler.oculusOrbFocalPointX >> 7; + var2 = ArchiveDiskAction.oculusOrbFocalPointY >> 7; + } else { + var1 = MouseHandler.localPlayer.x >> 7; + var2 = MouseHandler.localPlayer.y >> 7; + } + + int var3 = ItemContainer.cameraX >> 7; + int var4 = WorldMapArchiveLoader.cameraZ >> 7; + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { + return GrandExchangeEvent.Client_plane; + } + + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { + return GrandExchangeEvent.Client_plane; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { + var0 = GrandExchangeEvent.Client_plane; + } + + int var5; + if (var1 > var3) { + var5 = var1 - var3; + } else { + var5 = var3 - var1; + } + + int var6; + if (var2 > var4) { + var6 = var2 - var4; + } else { + var6 = var4 - var2; + } + + int var7; + int var8; + if (var5 > var6) { + var7 = var6 * 65536 / var5; + var8 = 32768; + + while (var3 != var1) { + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { + var0 = GrandExchangeEvent.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { + var0 = GrandExchangeEvent.Client_plane; + } + } + } + } else if (var6 > 0) { + var7 = var5 * 65536 / var6; + var8 = 32768; + + while (var4 != var2) { + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { + var0 = GrandExchangeEvent.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { + var0 = GrandExchangeEvent.Client_plane; + } + } + } + } + } + + if (MouseHandler.localPlayer.x >= 0 && MouseHandler.localPlayer.y >= 0 && MouseHandler.localPlayer.x < 13312 && MouseHandler.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][MouseHandler.localPlayer.x >> 7][MouseHandler.localPlayer.y >> 7] & 4) != 0) { + var0 = GrandExchangeEvent.Client_plane; + } + + return var0; + } else { + return GrandExchangeEvent.Client_plane; + } } } - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(Lcl;IIIIII)V", - garbageValue = "-1284495098" - ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { // L: 4886 - if (var0 instanceof NPC) { // L: 4887 - NPCComposition var6 = ((NPC)var0).definition; // L: 4888 - if (var6.transforms != null) { // L: 4889 - var6 = var6.transform(); - } - - if (var6 == null) { // L: 4890 - return; - } - } - - int var76 = Players.Players_count; // L: 4892 - int[] var7 = Players.Players_indices; // L: 4893 - byte var8 = 0; // L: 4894 - int var10; - if (var1 < var76 && var0.playerCycle == Client.cycle && Canvas.method492((Player)var0)) { // L: 4895 - Player var9 = (Player)var0; // L: 4896 - if (var1 < var76) { // L: 4897 - var10 = var0.defaultHeight + 15; // L: 4898 - ClanChannel.worldToScreen(var0.x, var0.y, var10); // L: 4900 - AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4902 - byte var12 = 9; // L: 4903 - var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); // L: 4904 - var8 = 18; // L: 4905 - } - } - - int var77 = -2; // L: 4908 - int var17; - int var23; - int var24; - if (!var0.healthBars.method5364()) { // L: 4909 - var10 = var0.defaultHeight + 15; // L: 4910 - ClanChannel.worldToScreen(var0.x, var0.y, var10); // L: 4912 - - for (HealthBar var89 = (HealthBar)var0.healthBars.last(); var89 != null; var89 = (HealthBar)var0.healthBars.previous()) { // L: 4914 - HealthBarUpdate var81 = var89.get(Client.cycle); // L: 4915 - if (var81 == null) { // L: 4916 - if (var89.isEmpty()) { // L: 4974 - var89.remove(); - } - } else { - HealthBarDefinition var13 = var89.definition; // L: 4917 - SpritePixels var82 = var13.getBackSprite(); // L: 4918 - SpritePixels var83 = var13.getFrontSprite(); // L: 4919 - var17 = 0; // L: 4921 - int var84; - if (var82 != null && var83 != null) { // L: 4922 - if (var13.widthPadding * 2 < var83.subWidth) { // L: 4923 - var17 = var13.widthPadding; - } - - var84 = var83.subWidth - var17 * 2; // L: 4924 - } else { - var84 = var13.width; // L: 4926 - } - - int var18 = 255; // L: 4927 - boolean var85 = true; // L: 4928 - int var86 = Client.cycle - var81.cycle; // L: 4929 - int var87 = var84 * var81.health2 / var13.width; // L: 4930 - int var88; - int var94; - if (var81.cycleOffset > var86) { // L: 4931 - var88 = var13.field1607 == 0 ? 0 : var13.field1607 * (var86 / var13.field1607); // L: 4932 - var23 = var84 * var81.health / var13.width; // L: 4933 - var94 = var88 * (var87 - var23) / var81.cycleOffset + var23; // L: 4934 - } else { - var94 = var87; // L: 4937 - var88 = var81.cycleOffset + var13.int5 - var86; // L: 4938 - if (var13.int3 >= 0) { // L: 4939 - var18 = (var88 << 8) / (var13.int5 - var13.int3); - } - } - - if (var81.health2 > 0 && var94 < 1) { // L: 4941 - var94 = 1; - } - - if (var82 != null && var83 != null) { // L: 4942 - if (var84 == var94) { // L: 4943 - var94 += var17 * 2; - } else { - var94 += var17; // L: 4944 - } - - var88 = var82.subHeight; // L: 4945 - var77 += var88; // L: 4946 - var23 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4947 - var24 = var3 + Client.viewportTempY - var77; // L: 4948 - var23 -= var17; // L: 4949 - if (var18 >= 0 && var18 < 255) { // L: 4950 - var82.drawTransAt(var23, var24, var18); // L: 4951 - Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var94 + var23, var88 + var24); // L: 4952 - var83.drawTransAt(var23, var24, var18); // L: 4953 - } else { - var82.drawTransBgAt(var23, var24); // L: 4956 - Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var24 + var88); // L: 4957 - var83.drawTransBgAt(var23, var24); // L: 4958 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4960 - var77 += 2; // L: 4961 - } else { - var77 += 5; // L: 4964 - if (Client.viewportTempX > -1) { // L: 4965 - var88 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4966 - var23 = var3 + Client.viewportTempY - var77; // L: 4967 - Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var94, 5, 65280); // L: 4968 - Rasterizer2D.Rasterizer2D_fillRectangle(var94 + var88, var23, var84 - var94, 5, 16711680); // L: 4969 - } - - var77 += 2; // L: 4971 - } - } - } - } - - if (var77 == -2) { // L: 4977 - var77 += 7; - } - - var77 += var8; // L: 4978 - int var79; - if (var1 < var76) { // L: 4979 - Player var78 = (Player)var0; // L: 4980 - if (var78.isHidden) { // L: 4981 - return; - } - - if (var78.headIconPk != -1 || var78.headIconPrayer != -1) { // L: 4982 - var79 = var0.defaultHeight + 15; // L: 4983 - ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 4985 - if (Client.viewportTempX > -1) { // L: 4987 - if (var78.headIconPk != -1) { // L: 4988 - var77 += 25; // L: 4989 - ScriptFrame.headIconPkSprites[var78.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4990 - } - - if (var78.headIconPrayer != -1) { // L: 4992 - var77 += 25; // L: 4993 - class20.headIconPrayerSprites[var78.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4994 - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4998 - var79 = var0.defaultHeight + 15; // L: 4999 - ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 5001 - if (Client.viewportTempX > -1) { // L: 5003 - var77 += Skills.headIconHintSprites[1].subHeight; // L: 5004 - Skills.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 5005 - } - } - } else { - NPCComposition var93 = ((NPC)var0).definition; // L: 5010 - if (var93.transforms != null) { // L: 5011 - var93 = var93.transform(); - } - - if (var93.headIconPrayer >= 0 && var93.headIconPrayer < class20.headIconPrayerSprites.length) { // L: 5012 - var79 = var0.defaultHeight + 15; // L: 5013 - ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 5015 - if (Client.viewportTempX > -1) { // L: 5017 - class20.headIconPrayerSprites[var93.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5018 - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5021 - var79 = var0.defaultHeight + 15; // L: 5022 - ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 5024 - if (Client.viewportTempX > -1) { // L: 5026 - Skills.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var76 || !var0.field1253 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5029 5030 - var10 = var0.defaultHeight; // L: 5031 - ClanChannel.worldToScreen(var0.x, var0.y, var10); // L: 5033 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5035 - Client.overheadTextXOffsets[Client.overheadTextCount] = class309.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5036 - Client.overheadTextAscents[Client.overheadTextCount] = class309.fontBold12.ascent; // L: 5037 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5038 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5039 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5040 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5041 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5042 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5043 - ++Client.overheadTextCount; // L: 5044 - } - } - - for (var10 = 0; var10 < 4; ++var10) { // L: 5048 - var79 = var0.hitSplatCycles[var10]; // L: 5049 - int var90 = var0.hitSplatTypes[var10]; // L: 5050 - HitSplatDefinition var91 = null; // L: 5051 - int var14 = 0; // L: 5052 - if (var90 >= 0) { // L: 5053 - if (var79 <= Client.cycle) { // L: 5054 - continue; - } - - var91 = Decimator.method1171(var0.hitSplatTypes[var10]); // L: 5055 - var14 = var91.field1738; // L: 5056 - if (var91 != null && var91.transforms != null) { // L: 5057 - var91 = var91.transform(); // L: 5058 - if (var91 == null) { // L: 5059 - var0.hitSplatCycles[var10] = -1; // L: 5060 - continue; // L: 5061 - } - } - } else if (var79 < 0) { // L: 5065 - continue; - } - - int var15 = var0.hitSplatTypes2[var10]; // L: 5066 - HitSplatDefinition var16 = null; // L: 5067 - if (var15 >= 0) { // L: 5068 - var16 = Decimator.method1171(var15); // L: 5069 - if (var16 != null && var16.transforms != null) { // L: 5070 - var16 = var16.transform(); - } - } - - if (var79 - var14 <= Client.cycle) { // L: 5072 - if (var91 == null) { // L: 5073 - var0.hitSplatCycles[var10] = -1; // L: 5074 - } else { - var17 = var0.defaultHeight / 2; // L: 5077 - ClanChannel.worldToScreen(var0.x, var0.y, var17); // L: 5079 - if (Client.viewportTempX > -1) { // L: 5081 - if (var10 == 1) { // L: 5083 - Client.viewportTempY -= 20; // L: 5084 - } - - if (var10 == 2) { // L: 5086 - Client.viewportTempX -= 15; // L: 5087 - Client.viewportTempY -= 10; // L: 5088 - } - - if (var10 == 3) { // L: 5090 - Client.viewportTempX += 15; // L: 5091 - Client.viewportTempY -= 10; // L: 5092 - } - - SpritePixels var19 = null; // L: 5094 - SpritePixels var20 = null; // L: 5095 - SpritePixels var21 = null; // L: 5096 - SpritePixels var22 = null; // L: 5097 - var23 = 0; // L: 5098 - var24 = 0; // L: 5099 - int var25 = 0; // L: 5100 - int var26 = 0; // L: 5101 - int var27 = 0; // L: 5102 - int var28 = 0; // L: 5103 - int var29 = 0; // L: 5104 - int var30 = 0; // L: 5105 - SpritePixels var31 = null; // L: 5106 - SpritePixels var32 = null; // L: 5107 - SpritePixels var33 = null; // L: 5108 - SpritePixels var34 = null; // L: 5109 - int var35 = 0; // L: 5110 - int var36 = 0; // L: 5111 - int var37 = 0; // L: 5112 - int var38 = 0; // L: 5113 - int var39 = 0; // L: 5114 - int var40 = 0; // L: 5115 - int var41 = 0; // L: 5116 - int var42 = 0; // L: 5117 - int var43 = 0; // L: 5118 - var19 = var91.method2978(); // L: 5119 - int var44; - if (var19 != null) { // L: 5120 - var23 = var19.subWidth; // L: 5121 - var44 = var19.subHeight; // L: 5122 - if (var44 > var43) { // L: 5123 - var43 = var44; - } - - var27 = var19.xOffset; // L: 5124 - } - - var20 = var91.method3005(); // L: 5126 - if (var20 != null) { // L: 5127 - var24 = var20.subWidth; // L: 5128 - var44 = var20.subHeight; // L: 5129 - if (var44 > var43) { // L: 5130 - var43 = var44; - } - - var28 = var20.xOffset; // L: 5131 - } - - var21 = var91.method2980(); // L: 5133 - if (var21 != null) { // L: 5134 - var25 = var21.subWidth; // L: 5135 - var44 = var21.subHeight; // L: 5136 - if (var44 > var43) { // L: 5137 - var43 = var44; - } - - var29 = var21.xOffset; // L: 5138 - } - - var22 = var91.method2981(); // L: 5140 - if (var22 != null) { // L: 5141 - var26 = var22.subWidth; // L: 5142 - var44 = var22.subHeight; // L: 5143 - if (var44 > var43) { // L: 5144 - var43 = var44; - } - - var30 = var22.xOffset; // L: 5145 - } - - if (var16 != null) { // L: 5147 - var31 = var16.method2978(); // L: 5148 - if (var31 != null) { // L: 5149 - var35 = var31.subWidth; // L: 5150 - var44 = var31.subHeight; // L: 5151 - if (var44 > var43) { // L: 5152 - var43 = var44; - } - - var39 = var31.xOffset; // L: 5153 - } - - var32 = var16.method3005(); // L: 5155 - if (var32 != null) { // L: 5156 - var36 = var32.subWidth; // L: 5157 - var44 = var32.subHeight; // L: 5158 - if (var44 > var43) { // L: 5159 - var43 = var44; - } - - var40 = var32.xOffset; // L: 5160 - } - - var33 = var16.method2980(); // L: 5162 - if (var33 != null) { // L: 5163 - var37 = var33.subWidth; // L: 5164 - var44 = var33.subHeight; // L: 5165 - if (var44 > var43) { // L: 5166 - var43 = var44; - } - - var41 = var33.xOffset; // L: 5167 - } - - var34 = var16.method2981(); // L: 5169 - if (var34 != null) { // L: 5170 - var38 = var34.subWidth; // L: 5171 - var44 = var34.subHeight; // L: 5172 - if (var44 > var43) { // L: 5173 - var43 = var44; - } - - var42 = var34.xOffset; // L: 5174 - } - } - - Font var80 = var91.getFont(); // L: 5179 - if (var80 == null) { // L: 5180 - var80 = UserComparator10.fontPlain11; - } - - Font var45; - if (var16 != null) { // L: 5181 - var45 = var16.getFont(); // L: 5182 - if (var45 == null) { // L: 5183 - var45 = UserComparator10.fontPlain11; - } - } else { - var45 = UserComparator10.fontPlain11; // L: 5185 - } - - String var46 = null; // L: 5186 - String var47 = null; // L: 5187 - boolean var48 = false; // L: 5188 - int var49 = 0; // L: 5189 - var46 = var91.getString(var0.hitSplatValues[var10]); // L: 5190 - int var92 = var80.stringWidth(var46); // L: 5191 - if (var16 != null) { // L: 5192 - var47 = var16.getString(var0.hitSplatValues2[var10]); // L: 5193 - var49 = var45.stringWidth(var47); // L: 5194 - } - - int var50 = 0; // L: 5196 - int var51 = 0; // L: 5197 - if (var24 > 0) { // L: 5198 - if (var21 == null && var22 == null) { // L: 5199 - var50 = 1; // L: 5200 - } else { - var50 = var92 / var24 + 1; - } - } - - if (var16 != null && var36 > 0) { // L: 5202 5203 - if (var33 == null && var34 == null) { // L: 5204 - var51 = 1; // L: 5205 - } else { - var51 = var49 / var36 + 1; - } - } - - int var52 = 0; // L: 5208 - int var53 = var52; // L: 5209 - if (var23 > 0) { // L: 5210 - var52 += var23; - } - - var52 += 2; // L: 5211 - int var54 = var52; // L: 5212 - if (var25 > 0) { // L: 5213 - var52 += var25; - } - - int var55 = var52; // L: 5214 - int var56 = var52; // L: 5215 - int var57; - if (var24 > 0) { // L: 5216 - var57 = var24 * var50; // L: 5217 - var52 += var57; // L: 5218 - var56 += (var57 - var92) / 2; // L: 5219 - } else { - var52 += var92; // L: 5222 - } - - var57 = var52; // L: 5224 - if (var26 > 0) { // L: 5225 - var52 += var26; - } - - int var58 = 0; // L: 5226 - int var59 = 0; // L: 5227 - int var60 = 0; // L: 5228 - int var61 = 0; // L: 5229 - int var62 = 0; // L: 5230 - int var63; - if (var16 != null) { // L: 5231 - var52 += 2; // L: 5232 - var58 = var52; // L: 5233 - if (var35 > 0) { // L: 5234 - var52 += var35; - } - - var52 += 2; // L: 5235 - var59 = var52; // L: 5236 - if (var37 > 0) { // L: 5237 - var52 += var37; - } - - var60 = var52; // L: 5238 - var62 = var52; // L: 5239 - if (var36 > 0) { // L: 5240 - var63 = var51 * var36; // L: 5241 - var52 += var63; // L: 5242 - var62 += (var63 - var49) / 2; // L: 5243 - } else { - var52 += var49; // L: 5246 - } - - var61 = var52; // L: 5248 - if (var38 > 0) { // L: 5249 - var52 += var38; - } - } - - var63 = var0.hitSplatCycles[var10] - Client.cycle; // L: 5251 - int var64 = var91.field1733 - var63 * var91.field1733 / var91.field1738; // L: 5252 - int var65 = var63 * var91.field1744 / var91.field1738 + -var91.field1744; // L: 5253 - int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 5254 - int var67 = var65 + (var3 + Client.viewportTempY - 12); // L: 5255 - int var68 = var67; // L: 5256 - int var69 = var67 + var43; // L: 5257 - int var70 = var67 + var91.field1748 + 15; // L: 5258 - int var71 = var70 - var80.maxAscent; // L: 5259 - int var72 = var70 + var80.maxDescent; // L: 5260 - if (var71 < var67) { // L: 5261 - var68 = var71; - } - - if (var72 > var69) { // L: 5262 - var69 = var72; - } - - int var73 = 0; // L: 5263 - int var74; - int var75; - if (var16 != null) { // L: 5264 - var73 = var67 + var16.field1748 + 15; // L: 5265 - var74 = var73 - var45.maxAscent; // L: 5266 - var75 = var73 + var45.maxDescent; // L: 5267 - if (var74 < var68) { // L: 5268 - ; - } - - if (var75 > var69) { // L: 5269 - ; - } - } - - var74 = 255; // L: 5271 - if (var91.field1745 >= 0) { // L: 5272 - var74 = (var63 << 8) / (var91.field1738 - var91.field1745); - } - - if (var74 >= 0 && var74 < 255) { // L: 5273 - if (var19 != null) { // L: 5274 - var19.drawTransAt(var66 + var53 - var27, var67, var74); - } - - if (var21 != null) { // L: 5275 - var21.drawTransAt(var54 + var66 - var29, var67, var74); - } - - if (var20 != null) { // L: 5276 - for (var75 = 0; var75 < var50; ++var75) { // L: 5277 - var20.drawTransAt(var75 * var24 + (var55 + var66 - var28), var67, var74); // L: 5278 - } - } - - if (var22 != null) { // L: 5281 - var22.drawTransAt(var57 + var66 - var30, var67, var74); - } - - var80.drawAlpha(var46, var56 + var66, var70, var91.textColor, 0, var74); // L: 5282 - if (var16 != null) { // L: 5283 - if (var31 != null) { // L: 5284 - var31.drawTransAt(var58 + var66 - var39, var67, var74); - } - - if (var33 != null) { // L: 5285 - var33.drawTransAt(var66 + var59 - var41, var67, var74); - } - - if (var32 != null) { // L: 5286 - for (var75 = 0; var75 < var51; ++var75) { // L: 5287 - var32.drawTransAt(var75 * var36 + (var66 + var60 - var40), var67, var74); // L: 5288 - } - } - - if (var34 != null) { // L: 5291 - var34.drawTransAt(var61 + var66 - var42, var67, var74); - } - - var45.drawAlpha(var47, var66 + var62, var73, var16.textColor, 0, var74); // L: 5292 - } - } else { - if (var19 != null) { // L: 5296 - var19.drawTransBgAt(var53 + var66 - var27, var67); - } - - if (var21 != null) { // L: 5297 - var21.drawTransBgAt(var66 + var54 - var29, var67); - } - - if (var20 != null) { // L: 5298 - for (var75 = 0; var75 < var50; ++var75) { // L: 5299 - var20.drawTransBgAt(var75 * var24 + (var66 + var55 - var28), var67); // L: 5300 - } - } - - if (var22 != null) { // L: 5303 - var22.drawTransBgAt(var66 + var57 - var30, var67); - } - - var80.draw(var46, var66 + var56, var70, var91.textColor | -16777216, 0); // L: 5304 - if (var16 != null) { // L: 5305 - if (var31 != null) { // L: 5306 - var31.drawTransBgAt(var66 + var58 - var39, var67); - } - - if (var33 != null) { // L: 5307 - var33.drawTransBgAt(var66 + var59 - var41, var67); - } - - if (var32 != null) { // L: 5308 - for (var75 = 0; var75 < var51; ++var75) { // L: 5309 - var32.drawTransBgAt(var75 * var36 + (var66 + var60 - var40), var67); // L: 5310 - } - } - - if (var34 != null) { // L: 5313 - var34.drawTransBgAt(var66 + var61 - var42, var67); - } - - var45.draw(var47, var66 + var62, var73, var16.textColor | -16777216, 0); // L: 5314 - } - } - } - } - } - } - - } - } // L: 5319 } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 8768971ed0..d88b7c11dd 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -1,64 +1,101 @@ -import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("ch") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -580519893 - ) - static int field1442; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lof;" ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("f") + static IndexedSprite field1239; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;B)I", - garbageValue = "16" + descriptor = "(Llr;Llr;I)I", + garbageValue = "1892069062" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0) { // L: 14 - if (var2.world == 0) { // L: 15 + if (var1.world != 0) { + if (var2.world == 0) { return this.reversed ? -1 : 1; } } else if (var2.world != 0) { - return this.reversed ? 1 : -1; // L: 18 + return this.reversed ? 1 : -1; } - return this.compareUser(var1, var2); // L: 20 + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "1563764098" + descriptor = "(ILjy;IIIZB)V", + garbageValue = "45" ) - public static void method2543(Applet var0, String var1) { - class44.applet = var0; // L: 22 - if (var1 != null) { // L: 23 - class44.field309 = var1; + public static void method2162(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class234.musicPlayerStatus = 1; + class234.musicTrackArchive = var1; + class234.musicTrackGroupId = var2; + UserComparator6.musicTrackFileId = var3; + HorizontalAlignment.musicTrackVolume = var4; + EnumComposition.musicTrackBoolean = var5; + ClanChannel.pcmSampleLength = var0; + } + + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "(IZZZI)Ljs;", + garbageValue = "-1802786302" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; + if (JagexCache.JagexCache_dat2File != null) { + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, FriendsChat.JagexCache_idxFiles[var0], 1000000); } - } // L: 24 + return new Archive(var4, class307.masterDisk, var0, var1, var2, var3); + } + + @ObfuscatedName("ll") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "1210824872" + ) + static String method2167(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (SpotAnimationDefinition.field1660 != null) { + var3 = "/p=" + SpotAnimationDefinition.field1660; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + GrandExchangeOfferWorldComparator.clientLanguage + "/a=" + class407.field4313 + var3 + "/"; + } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 6b7178099c..24381fe588 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,95 +1,79 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dj") +@ObfuscatedName("cg") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lnt;" + @ObfuscatedName("rv") + @ObfuscatedGetter( + intValue = 149785585 ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; + static int field1265; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 353948357 + ) + @Export("clientType") + public static int clientType; @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 404387991 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("gn") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator6(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;I)I", - garbageValue = "2014862906" + descriptor = "(Llr;Llr;I)I", + garbageValue = "941348089" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { // L: 14 - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 15 + if (var1.world != 0 && var2.world != 0) { + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lfl;B)V", - garbageValue = "6" + descriptor = "(II)Lej;", + garbageValue = "624161398" ) - static final void method2580(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: 62 - for (var10 = 0; var10 < 8; ++var10) { // L: 63 - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { - int[] var10000 = var8[var1].flags[var9 + var2]; // L: 64 - var10000[var10 + var3] &= -16777217; - } - } - } - - Buffer var13 = new Buffer(var0); // L: 67 - - for (var10 = 0; var10 < 4; ++var10) { // L: 68 - for (int var11 = 0; var11 < 64; ++var11) { // L: 69 - for (int var12 = 0; var12 < 64; ++var12) { // L: 70 - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 71 - Huffman.loadTerrain(var13, var1, var2 + class143.method2815(var11 & 7, var12 & 7, var7), var3 + class171.method3614(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 72 - } else { - Huffman.loadTerrain(var13, 0, -1, -1, 0, 0, 0); // L: 74 - } - } - } - } - - } // L: 78 - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-675377144" - ) - static int method2585(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3547 - Client.logoutTimer = 250; // L: 3548 - return 1; // L: 3549 - } else if (var0 != 5631 && var0 != 5633) { // L: 3551 - if (var0 == 5632) { // L: 3555 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 26; // L: 3556 - return 1; // L: 3557 - } else { - return 2; // L: 3559 - } + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - UserComparator9.Interpreter_stringStackSize -= 2; // L: 3552 - return 1; // L: 3553 + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); + return var1; } } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 62f9c8ba55..b0b06c0581 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,62 +1,34 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("ct") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("qj") - @ObfuscatedSignature( - descriptor = "Lav;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("ep") - @ObfuscatedGetter( - intValue = 2052906641 - ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("nh") - @ObfuscatedGetter( - intValue = -455733963 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator7(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;B)I", - garbageValue = "8" + descriptor = "(Llr;Llr;I)I", + garbageValue = "-1964828739" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { // L: 14 - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 15 + if (var1.world != 0 && var2.world != 0) { + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1200768882" - ) - public static void method2539() { - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 69 - } // L: 70 } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 555524f254..81b4ebf0b9 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -3,80 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("cm") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("f") + @ObfuscatedName("qb") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;B)I", - garbageValue = "1" + descriptor = "(Llr;Llr;I)I", + garbageValue = "-1220128891" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world) { // L: 15 + if (Client.worldId == var1.world) { if (var2.world != Client.worldId) { - return this.reversed ? -1 : 1; // L: 16 + return this.reversed ? -1 : 1; } } else if (var2.world == Client.worldId) { - return this.reversed ? 1 : -1; // L: 19 + return this.reversed ? 1 : -1; } - return this.compareUser(var1, var2); // L: 21 + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)[Ljs;", - garbageValue = "2010413146" + descriptor = "(S)I", + garbageValue = "805" ) - static GameBuild[] method2538() { - return new GameBuild[]{GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE}; // L: 13 + static final int method2157() { + return ViewportMouse.ViewportMouse_y; } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Liv;I[B[BI)V", - garbageValue = "700891995" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3035 == null) { // L: 974 - if (var2 == null) { // L: 975 - return; // L: 981 - } - - var0.field3035 = new byte[11][]; // L: 976 - var0.field3036 = new byte[11][]; // L: 977 - var0.field3037 = new int[11]; // L: 978 - var0.field3038 = new int[11]; // L: 979 - } - - var0.field3035[var1] = var2; // L: 983 - if (var2 != null) { - var0.field3034 = true; // L: 984 - } else { - var0.field3034 = false; // L: 986 - - for (int var4 = 0; var4 < var0.field3035.length; ++var4) { // L: 987 - if (var0.field3035[var4] != null) { // L: 988 - var0.field3034 = true; // L: 989 - break; - } - } - } - - var0.field3036[var1] = var3; // L: 994 - } // L: 995 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 0cbcab4d96..57148e1566 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,575 +1,50 @@ 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("cp") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1946098059 + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lnv;" ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("f") + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; public UserComparator9(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lly;Lly;B)I", - garbageValue = "6" + descriptor = "(Llr;Llr;B)I", + garbageValue = "-90" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 16 + if (Client.worldId == var1.world && var2.world == Client.worldId) { + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } else { - return this.compareUser(var1, var2); // L: 18 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("e") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lns;II)V", - garbageValue = "798107312" + descriptor = "(CI)Z", + garbageValue = "1216220848" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; // L: 71 - Players.Players_pendingUpdateCount = 0; // L: 72 - AbstractArchive.method5160(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 & 128) != 0) { // L: 79 - var6 += var0.readUnsignedByte() << 8; - } - - method2561(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("m") - @ObfuscatedSignature( - descriptor = "(Lns;ILcj;II)V", - garbageValue = "1472974577" - ) - static final void method2561(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; // L: 453 - int var5; - if ((var3 & 4) != 0) { // L: 454 - var5 = var0.readUnsignedByte(); // L: 455 - byte[] var6 = new byte[var5]; // L: 456 - Buffer var7 = new Buffer(var6); // L: 457 - var0.method6821(var6, 0, var5); // L: 458 - Players.field1362[var1] = var7; // L: 459 - var2.read(var7); // L: 460 - } - - int var8; - int var9; - int var12; - int var13; - if ((var3 & 2) != 0) { // L: 462 - var5 = var0.readUnsignedByte(); // L: 463 - int var10; - int var14; - int var15; - if (var5 > 0) { // L: 464 - for (var13 = 0; var13 < var5; ++var13) { // L: 465 - var8 = -1; // L: 467 - var9 = -1; // L: 468 - var10 = -1; // L: 469 - var14 = var0.readUShortSmart(); // L: 470 - if (var14 == 32767) { // L: 471 - var14 = var0.readUShortSmart(); // L: 472 - var9 = var0.readUShortSmart(); // L: 473 - var8 = var0.readUShortSmart(); // L: 474 - var10 = var0.readUShortSmart(); // L: 475 - } else if (var14 != 32766) { // L: 477 - var9 = var0.readUShortSmart(); // L: 478 - } else { - var14 = -1; // L: 480 - } - - var15 = var0.readUShortSmart(); // L: 481 - var2.addHitSplat(var14, var9, var8, var10, Client.cycle, var15); // L: 482 - } - } - - var13 = var0.method6643(); // L: 485 - if (var13 > 0) { // L: 486 - for (var14 = 0; var14 < var13; ++var14) { // L: 487 - var8 = var0.readUShortSmart(); // L: 488 - var9 = var0.readUShortSmart(); // L: 489 - if (var9 != 32767) { // L: 490 - var10 = var0.readUShortSmart(); // L: 491 - var15 = var0.method6643(); // L: 492 - var12 = var9 > 0 ? var0.readUnsignedByte() : var15; // L: 493 - var2.addHealthBar(var8, Client.cycle, var9, var10, var15, var12); // L: 494 - } else { - var2.removeHealthBar(var8); // L: 496 - } - } - } - } - - if ((var3 & 2048) != 0) { // L: 500 - for (var5 = 0; var5 < 3; ++var5) { // L: 501 - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 512) != 0) { // L: 503 - var2.spotAnimation = var0.readUnsignedShort(); // L: 504 - var5 = var0.method6675(); // L: 505 - var2.field1263 = var5 >> 16; // L: 506 - var2.field1262 = (var5 & 65535) + Client.cycle; // L: 507 - var2.spotAnimationFrame = 0; // L: 508 - var2.spotAnimationFrameCycle = 0; // L: 509 - if (var2.field1262 > Client.cycle) { // L: 510 - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { // L: 511 - var2.spotAnimation = -1; - } - } - - if ((var3 & 8) != 0) { // L: 513 - var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 514 - if (var2.overheadText.charAt(0) == '~') { // L: 515 - var2.overheadText = var2.overheadText.substring(1); // L: 516 - UserComparator10.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 517 - } else if (var2 == class262.localPlayer) { // L: 519 - UserComparator10.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 520 - } - - var2.isAutoChatting = false; // L: 522 - var2.overheadTextColor = 0; // L: 523 - var2.overheadTextEffect = 0; // L: 524 - var2.overheadTextCyclesRemaining = 150; // L: 525 - } - - if ((var3 & 64) != 0) { // L: 527 - var5 = var0.method6653(); // L: 528 - PlayerType var16 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var0.method6644()); // L: 529 - boolean var19 = var0.method6644() == 1; // L: 530 - var8 = var0.method6644(); // L: 531 - var9 = var0.offset; // L: 532 - if (var2.username != null && var2.appearance != null) { // L: 533 - boolean var18 = false; // L: 534 - if (var16.isUser && DevicePcmPlayerProvider.friendSystem.isIgnored(var2.username)) { // L: 535 536 - var18 = true; - } - - if (!var18 && Client.field629 == 0 && !var2.isHidden) { // L: 538 - Players.field1373.offset = 0; // L: 539 - var0.method6821(Players.field1373.array, 0, var8); // L: 540 - Players.field1373.offset = 0; // L: 541 - String var11 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(Players.field1373))); // L: 542 - var2.overheadText = var11.trim(); // L: 543 - var2.overheadTextColor = var5 >> 8; // L: 544 - var2.overheadTextEffect = var5 & 255; // L: 545 - var2.overheadTextCyclesRemaining = 150; // L: 546 - var2.isAutoChatting = var19; // L: 547 - var2.field1253 = var2 != class262.localPlayer && var16.isUser && "" != Client.field642 && var11.toLowerCase().indexOf(Client.field642) == -1; // L: 548 - if (var16.isPrivileged) { // L: 550 - var12 = var19 ? 91 : 1; - } else { - var12 = var19 ? 90 : 2; // L: 551 - } - - if (var16.modIcon != -1) { // L: 552 - UserComparator10.addGameMessage(var12, MusicPatchPcmStream.method4743(var16.modIcon) + var2.username.getName(), var11); - } else { - UserComparator10.addGameMessage(var12, var2.username.getName(), var11); // L: 553 - } - } - } - - var0.offset = var8 + var9; // L: 556 - } - - if ((var3 & 16) != 0) { // L: 558 - var2.targetIndex = var0.method6652(); // L: 559 - if (var2.targetIndex == 65535) { // L: 560 - var2.targetIndex = -1; - } - } - - if ((var3 & 4096) != 0) { // L: 562 - Players.field1361[var1] = var0.method6619(); // L: 563 - } - - if ((var3 & 32) != 0) { // L: 565 - var5 = var0.method6651(); // L: 566 - if (var5 == 65535) { // L: 567 - var5 = -1; - } - - var13 = var0.readUnsignedByte(); // L: 568 - World.performPlayerAnimation(var2, var5, var13); // L: 569 - } - - if ((var3 & 8192) != 0) { // L: 571 - var2.field1264 = var0.readByte(); // L: 572 - var2.field1268 = var0.method6682(); // L: 573 - var2.field1265 = var0.readByte(); // L: 574 - var2.field1267 = var0.method6682(); // L: 575 - var2.field1276 = var0.method6653() + Client.cycle; // L: 576 - var2.field1269 = var0.method6652() + Client.cycle; // L: 577 - var2.field1270 = var0.method6653(); // L: 578 - if (var2.field1201) { // L: 579 - var2.field1264 += var2.tileX; // L: 580 - var2.field1268 += var2.tileY; // L: 581 - var2.field1265 += var2.tileX; // L: 582 - var2.field1267 += var2.tileY; // L: 583 - var2.pathLength = 0; // L: 584 - } else { - var2.field1264 += var2.pathX[0]; // L: 587 - var2.field1268 += var2.pathY[0]; // L: 588 - var2.field1265 += var2.pathX[0]; // L: 589 - var2.field1267 += var2.pathY[0]; // L: 590 - var2.pathLength = 1; // L: 591 - } - - var2.field1281 = 0; // L: 593 - } - - if ((var3 & 256) != 0) { // L: 595 - var4 = var0.method6619(); // L: 596 - } - - if ((var3 & 1) != 0) { // L: 598 - var2.field1280 = var0.method6652(); // L: 599 - if (var2.pathLength == 0) { // L: 600 - var2.orientation = var2.field1280; // L: 601 - var2.field1280 = -1; // L: 602 - } - } - - if (var2.field1201) { // L: 605 - if (var4 == 127) { // L: 606 - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var17; - if (var4 != -1) { // L: 609 - var17 = var4; - } else { - var17 = Players.field1361[var1]; // L: 610 - } - - var2.method2217(var2.tileX, var2.tileY, var17); // L: 611 - } - } - - } // L: 615 - - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1473289711" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 4524 - if (class262.localPlayer.x >> 7 == Client.destinationX && class262.localPlayer.y >> 7 == Client.destinationY) { // L: 4526 - Client.destinationX = 0; // L: 4527 - } - - class15.method238(); // L: 4530 - MouseHandler.method741(); // L: 4531 - DevicePcmPlayerProvider.addNpcsToScene(true); // L: 4532 - int var4 = Players.Players_count; // L: 4534 - int[] var5 = Players.Players_indices; // L: 4535 - - int var6; - for (var6 = 0; var6 < var4; ++var6) { // L: 4536 - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4537 - class160.addPlayerToScene(Client.players[var5[var6]], true); // L: 4538 - } - } - - DevicePcmPlayerProvider.addNpcsToScene(false); // L: 4541 - MusicPatchPcmStream.method4762(); // L: 4542 - - for (GraphicsObject var15 = (GraphicsObject)Client.graphicsObjects.last(); var15 != null; var15 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4544 4545 4552 - if (var15.plane == SoundSystem.Client_plane && !var15.isFinished) { // L: 4546 - if (Client.cycle >= var15.cycleStart) { // L: 4547 - var15.advance(Client.field683); // L: 4548 - if (var15.isFinished) { // L: 4549 - var15.remove(); - } else { - DevicePcmPlayerProvider.scene.drawEntity(var15.plane, var15.x, var15.y, var15.height, 60, var15, 0, -1L, false); // L: 4550 - } - } - } else { - var15.remove(); - } - } - - Interpreter.setViewportShape(var0, var1, var2, var3, true); // L: 4555 - var0 = Client.viewportOffsetX; // L: 4556 - var1 = Client.viewportOffsetY; // L: 4557 - var2 = Client.viewportWidth; // L: 4558 - var3 = Client.viewportHeight; // L: 4559 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4560 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4561 - int var16; - if (!Client.isCameraLocked) { // L: 4562 - var4 = Client.camAngleX; // L: 4563 - if (Client.field708 / 256 > var4) { // L: 4564 - var4 = Client.field708 / 256; - } - - if (Client.field871[4] && Client.field873[4] + 128 > var4) { // L: 4565 - var4 = Client.field873[4] + 128; - } - - var16 = Client.camAngleY & 2047; // L: 4566 - VerticalAlignment.method2889(FriendSystem.oculusOrbFocalPointX, class14.field124, VarbitComposition.oculusOrbFocalPointY, var4, var16, NetSocket.method2676(var4), var3); // L: 4567 - } - - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - if (!Client.isCameraLocked) { // L: 4570 - if (class4.clientPreferences.roofsHidden) { // L: 4573 - var16 = SoundSystem.Client_plane; // L: 4574 - } else { - label342: { - var6 = 3; // L: 4577 - if (class69.cameraPitch < 310) { // L: 4578 - label340: { - if (Client.oculusOrbState == 1) { // L: 4581 - var7 = FriendSystem.oculusOrbFocalPointX >> 7; // L: 4582 - var8 = VarbitComposition.oculusOrbFocalPointY >> 7; // L: 4583 - } else { - var7 = class262.localPlayer.x >> 7; // L: 4586 - var8 = class262.localPlayer.y >> 7; // L: 4587 - } - - var9 = ObjectSound.cameraX >> 7; // L: 4589 - var10 = Canvas.cameraZ >> 7; // L: 4590 - if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { // L: 4591 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 4595 - if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4599 - var6 = SoundSystem.Client_plane; - } - - if (var7 > var9) { // L: 4601 - var11 = var7 - var9; - } else { - var11 = var9 - var7; // L: 4602 - } - - if (var8 > var10) { // L: 4604 - var12 = var8 - var10; - } else { - var12 = var10 - var8; // L: 4605 - } - - int var13; - int var14; - if (var11 > var12) { // L: 4606 - var13 = var12 * 65536 / var11; // L: 4607 - var14 = 32768; // L: 4608 - - while (true) { - if (var7 == var9) { // L: 4609 - break label340; - } - - if (var9 < var7) { // L: 4610 - ++var9; - } else if (var9 > var7) { // L: 4611 - --var9; - } - - if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4612 - var6 = SoundSystem.Client_plane; - } - - var14 += var13; // L: 4613 - if (var14 >= 65536) { // L: 4614 - var14 -= 65536; // L: 4615 - if (var10 < var8) { // L: 4616 - ++var10; - } else if (var10 > var8) { // L: 4617 - --var10; - } - - if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4618 - var6 = SoundSystem.Client_plane; - } - } - } - } else { - if (var12 > 0) { // L: 4622 - var13 = var11 * 65536 / var12; // L: 4623 - var14 = 32768; // L: 4624 - - while (var8 != var10) { // L: 4625 - if (var10 < var8) { // L: 4626 - ++var10; - } else if (var10 > var8) { // L: 4627 - --var10; - } - - if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4628 - var6 = SoundSystem.Client_plane; - } - - var14 += var13; // L: 4629 - if (var14 >= 65536) { // L: 4630 - var14 -= 65536; // L: 4631 - if (var9 < var7) { // L: 4632 - ++var9; - } else if (var9 > var7) { // L: 4633 - --var9; - } - - if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4634 - var6 = SoundSystem.Client_plane; - } - } - } - } - break label340; - } - } - - var16 = SoundSystem.Client_plane; // L: 4596 - break label342; // L: 4597 - } - - var16 = SoundSystem.Client_plane; // L: 4592 - break label342; // L: 4593 - } - } - - if (class262.localPlayer.x >= 0 && class262.localPlayer.y >= 0 && class262.localPlayer.x < 13312 && class262.localPlayer.y < 13312) { // L: 4639 - if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][class262.localPlayer.x >> 7][class262.localPlayer.y >> 7] & 4) != 0) { // L: 4643 - var6 = SoundSystem.Client_plane; - } - - var16 = var6; // L: 4644 - } else { - var16 = SoundSystem.Client_plane; // L: 4640 - } - } - } - - var4 = var16; // L: 4646 - } else { - var4 = class106.method2372(); // L: 4648 - } - - var16 = ObjectSound.cameraX; // L: 4649 - var6 = class160.cameraY; // L: 4650 - var7 = Canvas.cameraZ; // L: 4651 - var8 = class69.cameraPitch; // L: 4652 - var9 = class32.cameraYaw; // L: 4653 - - for (var10 = 0; var10 < 5; ++var10) { // L: 4654 - if (Client.field871[var10]) { // L: 4655 - var11 = (int)(Math.random() * (double)(Client.field872[var10] * 2 + 1) - (double)Client.field872[var10] + Math.sin((double)Client.field875[var10] * ((double)Client.field867[var10] / 100.0D)) * (double)Client.field873[var10]); // L: 4656 - if (var10 == 0) { // L: 4657 - ObjectSound.cameraX += var11; - } - - if (var10 == 1) { // L: 4658 - class160.cameraY += var11; - } - - if (var10 == 2) { // L: 4659 - Canvas.cameraZ += var11; - } - - if (var10 == 3) { // L: 4660 - class32.cameraYaw = var11 + class32.cameraYaw & 2047; - } - - if (var10 == 4) { // L: 4661 - class69.cameraPitch += var11; // L: 4662 - if (class69.cameraPitch < 128) { // L: 4663 - class69.cameraPitch = 128; - } - - if (class69.cameraPitch > 383) { // L: 4664 - class69.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; // L: 4668 - var11 = MouseHandler.MouseHandler_y; // L: 4669 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4670 - var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4671 - var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4672 - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4674 - class25.method339(var10 - var0, var11 - var1); // L: 4675 - } else { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 4679 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 4680 - } - - class233.playPcmPlayers(); // L: 4683 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4684 - class233.playPcmPlayers(); // L: 4685 - var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4686 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4687 - DevicePcmPlayerProvider.scene.draw(ObjectSound.cameraX, class160.cameraY, Canvas.cameraZ, class69.cameraPitch, class32.cameraYaw, var4); // L: 4688 - Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4689 - class233.playPcmPlayers(); // L: 4690 - DevicePcmPlayerProvider.scene.clearTempGameObjects(); // L: 4691 - WorldMapDecoration.method3710(var0, var1, var2, var3); // L: 4692 - if (Client.hintArrowType == 2) { // L: 4694 - ClanChannel.worldToScreen((Client.hintArrowX - class15.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - WorldMapSprite.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4695 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4696 - Skills.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field683); // L: 4698 - Buddy.method5892(); // L: 4700 - ObjectSound.cameraX = var16; // L: 4702 - class160.cameraY = var6; // L: 4703 - Canvas.cameraZ = var7; // L: 4704 - class69.cameraPitch = var8; // L: 4705 - class32.cameraYaw = var9; // L: 4706 - if (Client.isLoading && Archive.method5061(true, false) == 0) { // L: 4707 - Client.isLoading = false; - } - - if (Client.isLoading) { // L: 4708 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4709 - class143.drawLoadingMessage("Loading - please wait.", false); // L: 4710 - } - - } // L: 4712 + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index e0f1bb79d6..c78d19e73f 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,31 +7,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lw") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 670105259 + intValue = -1333971131 ) @Export("capacity") final int capacity; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1072926919 + intValue = 1390558187 ) @Export("size") int size; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Llf;" + descriptor = "[Llm;" ) @Export("array") User[] array; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("previousUsernamesMap") HashMap previousUsernamesMap; @ObfuscatedName("k") @@ -39,303 +39,303 @@ public abstract class UserList { Comparator comparator; UserList(int var1) { - this.size = 0; // L: 9 - this.comparator = null; // L: 13 - this.capacity = var1; // L: 16 - this.array = this.newTypedArray(var1); // L: 17 - this.usernamesMap = new HashMap(var1 / 8); // L: 18 - this.previousUsernamesMap = new HashMap(var1 / 8); // L: 19 - } // L: 20 + this.size = 0; + this.comparator = null; + this.capacity = var1; + this.array = this.newTypedArray(var1); + this.usernamesMap = new HashMap(var1 / 8); + this.previousUsernamesMap = new HashMap(var1 / 8); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Llf;", - garbageValue = "1590299985" + descriptor = "(B)Llm;", + garbageValue = "-70" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)[Llf;", - garbageValue = "-1320557093" + descriptor = "(II)[Llm;", + garbageValue = "-2047984332" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1302559125" + garbageValue = "-1269447200" ) @Export("clear") public void clear() { - this.size = 0; // L: 23 - Arrays.fill(this.array, (Object)null); // L: 24 - this.usernamesMap.clear(); // L: 25 - this.previousUsernamesMap.clear(); // L: 26 - } // L: 27 + this.size = 0; + Arrays.fill(this.array, (Object)null); + this.usernamesMap.clear(); + this.previousUsernamesMap.clear(); + } - @ObfuscatedName("ab") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1883468906" + descriptor = "(B)I", + garbageValue = "-29" ) @Export("getSize") public int getSize() { - return this.size; // L: 30 + return this.size; } - @ObfuscatedName("aq") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1699409765" + garbageValue = "-1685001980" ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; // L: 34 - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Llc;I)Z", - garbageValue = "199834760" - ) - @Export("contains") - public boolean contains(Username var1) { - if (!var1.hasCleanName()) { // L: 38 - return false; - } else { - return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); // L: 39 40 - } + return this.capacity == this.size; } @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Llc;I)Llf;", - garbageValue = "-1523955611" + descriptor = "(Loh;S)Z", + garbageValue = "8323" + ) + @Export("contains") + public boolean contains(Username var1) { + if (!var1.hasCleanName()) { + return false; + } else { + return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Loh;S)Llm;", + garbageValue = "-27808" ) @Export("getByUsername") public User getByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); // L: 44 - return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46 + User var2 = this.getByCurrentUsername(var1); + return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("an") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Llc;B)Llf;", - garbageValue = "36" + descriptor = "(Loh;B)Llm;", + garbageValue = "-4" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 50 51 - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Llc;I)Llf;", - garbageValue = "-1982142563" - ) - @Export("getByPreviousUsername") - User getByPreviousUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56 + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Llc;B)Z", - garbageValue = "0" + descriptor = "(Loh;I)Llm;", + garbageValue = "2112259291" + ) + @Export("getByPreviousUsername") + User getByPreviousUsername(Username var1) { + return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Loh;I)Z", + garbageValue = "321750747" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); // L: 60 - if (var2 == null) { // L: 61 + User var2 = this.getByCurrentUsername(var1); + if (var2 == null) { return false; } else { - this.remove(var2); // L: 62 - return true; // L: 63 + this.remove(var2); + return true; } } - @ObfuscatedName("ac") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Llf;I)V", - garbageValue = "-2053720408" + descriptor = "(Llm;I)V", + garbageValue = "-499921951" ) @Export("remove") final void remove(User var1) { - int var2 = this.indexOf(var1); // L: 67 - if (var2 != -1) { // L: 68 - this.arrayRemove(var2); // L: 69 - this.mapRemove(var1); // L: 70 + int var2 = this.indexOf(var1); + if (var2 != -1) { + this.arrayRemove(var2); + this.mapRemove(var1); } - } // L: 71 + } - @ObfuscatedName("as") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Llc;I)Llf;", - garbageValue = "-557964613" + descriptor = "(Loh;I)Llm;", + garbageValue = "-1808910324" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { - return this.addLast(var1, (Username)null); // L: 74 - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Llc;Llc;I)Llf;", - garbageValue = "-1673270493" - ) - @Export("addLast") - User addLast(Username var1, Username var2) { - if (this.getByCurrentUsername(var1) != null) { // L: 78 - throw new IllegalStateException(); - } else { - User var3 = this.newInstance(); // L: 79 - var3.set(var1, var2); // L: 80 - this.arrayAddLast(var3); // L: 81 - this.mapPut(var3); // L: 82 - return var3; // L: 83 - } + return this.addLast(var1, (Username)null); } @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IB)Llf;", - garbageValue = "71" + descriptor = "(Loh;Loh;I)Llm;", + garbageValue = "781138766" + ) + @Export("addLast") + User addLast(Username var1, Username var2) { + if (this.getByCurrentUsername(var1) != null) { + throw new IllegalStateException(); + } else { + User var3 = this.newInstance(); + var3.set(var1, var2); + this.arrayAddLast(var3); + this.mapPut(var3); + return var3; + } + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(IS)Llm;", + garbageValue = "20668" ) @Export("get") public final User get(int var1) { - if (var1 >= 0 && var1 < this.size) { // L: 87 - return this.array[var1]; // L: 88 + if (var1 >= 0 && var1 < this.size) { + return this.array[var1]; } else { throw new ArrayIndexOutOfBoundsException(var1); } } - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-1240360308" ) @Export("sort") public final void sort() { - if (this.comparator == null) { // L: 92 - Arrays.sort(this.array, 0, this.size); // L: 93 + if (this.comparator == null) { + Arrays.sort(this.array, 0, this.size); } else { - Arrays.sort(this.array, 0, this.size, this.comparator); // L: 96 + Arrays.sort(this.array, 0, this.size, this.comparator); } - } // L: 98 + } - @ObfuscatedName("aa") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Llf;Llc;Llc;I)V", - garbageValue = "-63927803" + descriptor = "(Llm;Loh;Loh;I)V", + garbageValue = "1572286969" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { - this.mapRemove(var1); // L: 101 - var1.set(var2, var3); // L: 102 - this.mapPut(var1); // L: 103 - } // L: 104 + this.mapRemove(var1); + var1.set(var2, var3); + this.mapPut(var1); + } @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Llf;I)I", - garbageValue = "1618066383" + descriptor = "(Llm;B)I", + garbageValue = "1" ) @Export("indexOf") final int indexOf(User var1) { - for (int var2 = 0; var2 < this.size; ++var2) { // L: 107 - if (this.array[var2] == var1) { // L: 108 + for (int var2 = 0; var2 < this.size; ++var2) { + if (this.array[var2] == var1) { return var2; } } - return -1; // L: 110 + return -1; } - @ObfuscatedName("av") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Llf;I)V", - garbageValue = "1834723904" + descriptor = "(Llm;I)V", + garbageValue = "1035721597" ) @Export("mapRemove") final void mapRemove(User var1) { - if (this.usernamesMap.remove(var1.username) == null) { // L: 114 + if (this.usernamesMap.remove(var1.username) == null) { throw new IllegalStateException(); } else { if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); // L: 115 + this.previousUsernamesMap.remove(var1.previousUsername); } } - } // L: 116 + } - @ObfuscatedName("ax") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Llf;I)V", - garbageValue = "-1220748366" + descriptor = "(Llm;I)V", + garbageValue = "458070711" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; // L: 119 - } // L: 120 + this.array[++this.size - 1] = var1; + } - @ObfuscatedName("ar") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Llf;B)V", - garbageValue = "-79" + descriptor = "(Llm;I)V", + garbageValue = "1009007871" ) @Export("mapPut") final void mapPut(User var1) { - this.usernamesMap.put(var1.username, var1); // L: 123 - if (var1.previousUsername != null) { // L: 124 - User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); // L: 125 - if (var2 != null && var2 != var1) { // L: 126 - var2.previousUsername = null; // L: 127 + this.usernamesMap.put(var1.username, var1); + if (var1.previousUsername != null) { + User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); + if (var2 != null && var2 != var1) { + var2.previousUsername = null; } } - } // L: 130 + } - @ObfuscatedName("af") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-50" + descriptor = "(II)V", + garbageValue = "1497447217" ) @Export("arrayRemove") final void arrayRemove(int var1) { - --this.size; // L: 133 - if (var1 < this.size) { // L: 134 - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); // L: 135 + --this.size; + if (var1 < this.size) { + System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); } - } // L: 137 + } - @ObfuscatedName("bq") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1914389338" + descriptor = "(B)V", + garbageValue = "1" ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; // L: 143 - } // L: 144 + this.comparator = null; + } - @ObfuscatedName("bx") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "28" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "-2005608911" ) @Export("addComparator") public final void addComparator(Comparator var1) { - if (this.comparator == null) { // L: 147 - this.comparator = var1; // L: 148 - } else if (this.comparator instanceof AbstractUserComparator) { // L: 150 - ((AbstractUserComparator)this.comparator).addComparator(var1); // L: 151 + if (this.comparator == null) { + this.comparator = var1; + } else if (this.comparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.comparator).addComparator(var1); } - } // L: 153 + } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index b87c11aa2d..bb4fa5915d 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,120 +3,96 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("oh") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("name") String name; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lnb;)V" + descriptor = "(Ljava/lang/String;Lnf;)V" ) public Username(String var1, LoginType var2) { - this.name = var1; // L: 11 - String var4; - if (var1 == null) { // L: 15 - var4 = null; // L: 16 - } else { - int var5 = 0; // L: 19 + this.name = var1; + this.cleanName = class113.method2347(var1, var2); + } - int var6; - for (var6 = var1.length(); var5 < var6 && SpriteMask.method4777(var1.charAt(var5)); ++var5) { // L: 20 21 - } + public Username(String var1) { + this.name = var1; + this.cleanName = class113.method2347(var1, LoginType.oldscape); + } - while (var6 > var5 && SpriteMask.method4777(var1.charAt(var6 - 1))) { // L: 22 - --var6; - } - - int var7 = var6 - var5; // L: 23 - if (var7 >= 1 && var7 <= Friend.method5773(var2)) { // L: 24 - StringBuilder var8 = new StringBuilder(var7); // L: 28 - - for (int var9 = var5; var9 < var6; ++var9) { // L: 29 - char var10 = var1.charAt(var9); // L: 30 - if (Client.method1746(var10)) { // L: 31 - char var11 = WorldMapElement.method2732(var10); // L: 32 - if (var11 != 0) { // L: 33 - var8.append(var11); // L: 34 - } - } - } - - if (var8.length() == 0) { // L: 36 - var4 = null; // L: 37 - } else { - var4 = var8.toString(); // L: 40 - } - } else { - var4 = null; // L: 25 - } - } - - this.cleanName = var4; // L: 42 - } // L: 43 - - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-55" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1013055370" ) @Export("getName") public String getName() { - return this.name; // L: 46 + return this.name; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-10" ) - @Export("hasCleanName") - public boolean hasCleanName() { - return this.cleanName != null; // L: 50 + public String method7241() { + return this.cleanName; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llc;I)I", - garbageValue = "-928498828" + descriptor = "(I)Z", + garbageValue = "-808946176" + ) + @Export("hasCleanName") + public boolean hasCleanName() { + return this.cleanName != null; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Loh;I)I", + garbageValue = "-558094265" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 74 - return var1.cleanName == null ? 0 : 1; // L: 75 76 + if (this.cleanName == null) { + return var1.cleanName == null ? 0 : 1; } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 78 79 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 54 - Username var2 = (Username)var1; // L: 55 + if (var1 instanceof Username) { + Username var2 = (Username)var1; if (this.cleanName == null) { - return var2.cleanName == null; // L: 56 - } else if (var2.cleanName == null) { // L: 57 + return var2.cleanName == null; + } else if (var2.cleanName == null) { return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 58 59 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); } } else { - return false; // L: 61 + return false; } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 65 66 - } - - public String toString() { - return this.getName(); // L: 70 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 83 + return this.compareToTyped((Username)var1); + } + + public String toString() { + return this.getName(); } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 6968f84d60..d08712f098 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("lz") +@ObfuscatedName("la") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ly") + @ObfuscatedName("lb") @ObfuscatedSignature( - descriptor = "(I)Llc;", - garbageValue = "-1312829614" + descriptor = "(B)Loh;", + garbageValue = "-6" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index c6ab6ed776..5ea6981fd9 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -1,169 +1,189 @@ -import java.io.IOException; +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("ew") +@ObfuscatedName("ec") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("o") - static final int[] field1710; - @ObfuscatedName("ib") - @ObfuscatedGetter( - intValue = -1778547945 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; + @ObfuscatedName("n") + static final int[] field1690; + @ObfuscatedName("ah") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1244645657 + intValue = 596675709 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1956088267 + intValue = -958772483 ) @Export("startBit") public int startBit; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 147814917 + intValue = -1451989863 ) @Export("endBit") public int endBit; static { - VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - field1710 = new int[32]; // L: 15 - int var0 = 2; // L: 18 + VarbitDefinition_cached = new EvictingDualNodeHashTable(64); + field1690 = new int[32]; + int var0 = 2; - for (int var1 = 0; var1 < 32; ++var1) { // L: 19 - field1710[var1] = var0 - 1; // L: 20 - var0 += var0; // L: 21 + for (int var1 = 0; var1 < 32; ++var1) { + field1690[var1] = var0 - 1; + var0 += var0; } - } // L: 23 + } - VarbitComposition() { - } // L: 25 - - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-699123952" + descriptor = "(Lnv;I)V", + garbageValue = "2031758319" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 == 0) { // L: 40 - return; // L: 43 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 41 + this.decodeNext(var1, var2); } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "-59" + descriptor = "(Lnv;II)V", + garbageValue = "618846461" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 46 - this.baseVar = var1.readUnsignedShort(); // L: 47 - this.startBit = var1.readUnsignedByte(); // L: 48 - this.endBit = var1.readUnsignedByte(); // L: 49 + if (var2 == 1) { + this.baseVar = var1.readUnsignedShort(); + this.startBit = var1.readUnsignedByte(); + this.endBit = var1.readUnsignedByte(); } - } // L: 52 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llk;ZB)V", - garbageValue = "-27" + descriptor = "(CLkq;I)C", + garbageValue = "-80246180" ) - public static void method2928(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { // L: 60 - try { - NetCache.NetCache_socket.close(); // L: 62 - } catch (Exception var6) { // L: 64 + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { + return 'A'; } - NetCache.NetCache_socket = null; // L: 65 + if (var0 == 199) { + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } } - NetCache.NetCache_socket = var0; // L: 67 - class105.method2358(var1); // L: 68 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 69 - class34.NetCache_currentResponse = null; // L: 70 - class254.NetCache_responseArchiveBuffer = null; // L: 71 - NetCache.field3615 = 0; // L: 72 - - while (true) { - NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 74 - if (var2 == null) { // L: 75 - while (true) { - var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 81 - if (var2 == null) { // L: 82 - if (NetCache.field3618 != 0) { // L: 88 - try { - Buffer var7 = new Buffer(4); // L: 90 - var7.writeByte(4); // L: 91 - var7.writeByte(NetCache.field3618); // L: 92 - var7.writeShort(0); // L: 93 - NetCache.NetCache_socket.write(var7.array, 0, 4); // L: 94 - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); // L: 98 - } catch (Exception var4) { // L: 100 - } - - ++NetCache.NetCache_ioExceptions; // L: 101 - NetCache.NetCache_socket = null; // L: 102 - } - } - - NetCache.NetCache_loadTime = 0; // L: 105 - NetCache.field3604 = ClientPacket.currentTimeMillis(); // L: 106 - return; // L: 107 - } - - NetCache.NetCache_pendingWritesQueue.addLast(var2); // L: 83 - NetCache.NetCache_pendingWrites.put(var2, var2.key); // L: 84 - ++NetCache.NetCache_pendingWritesCount; // L: 85 - --NetCache.NetCache_pendingResponsesCount; // L: 86 - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key); // L: 76 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 77 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 78 + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; + } else if (var0 == 376) { + return 'Y'; + } else { + return var0; } } - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "264139195" + descriptor = "(I)V", + garbageValue = "-1974609510" ) - public static int method2935(int var0, int var1) { - return (-3 - var0 << 8) + var1; // L: 17 + public static void method2898() { + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.ItemDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 3c16e2bffb..1f48b3f568 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,68 +1,150 @@ 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("em") +@ObfuscatedName("ep") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("rt") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ly;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ljy;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("h") - public static short[] field1581; - @ObfuscatedName("dt") - @ObfuscatedGetter( - longValue = 7886092133437125099L - ) - static long field1586; @ObfuscatedName("v") @Export("persist") public boolean persist; static { - VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 + VarcInt_cached = new EvictingDualNodeHashTable(64); } VarcInt() { - this.persist = false; // L: 12 - } // L: 14 + this.persist = false; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;S)V", - garbageValue = "-1375" + descriptor = "(Lnv;I)V", + garbageValue = "1916559330" ) - void method2745(Buffer var1) { + void method2752(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 28 - if (var2 == 0) { // L: 29 - return; // L: 32 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.method2748(var1, var2); // L: 30 + this.method2743(var1, var2); } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "1509691720" + descriptor = "(Lnv;IB)V", + garbageValue = "0" ) - void method2748(Buffer var1, int var2) { - if (var2 == 2) { // L: 35 - this.persist = true; // L: 36 + void method2743(Buffer var1, int var2) { + if (var2 == 2) { + this.persist = true; } - } // L: 39 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-120" + ) + static void method2741() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } + } + + } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "([Lio;II)V", + garbageValue = "432677171" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !FloorUnderlayDefinition.isComponentHidden(var3))) { + int var5; + if (var3.type == 0) { + if (!var3.isIf3 && FloorUnderlayDefinition.isComponentHidden(var3) && var3 != Coord.mousedOverWidgetIf1) { + continue; + } + + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + var5 = var4.group; + if (Huffman.loadInterface(var5)) { + drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); + } + } + } + + if (var3.type == 6) { + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = HealthBarDefinition.runCs1(var3); + if (var7) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = World.SequenceDefinition_get(var5); + + for (var3.modelFrameCycle += Client.field555; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; AttackOption.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field3013 != 0 && !var3.isIf3) { + int var8 = var3.field3013 >> 16; + var5 = var3.field3013 << 16 >> 16; + var8 *= Client.field555; + var5 *= Client.field555; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + AttackOption.invalidateWidget(var3); + } + } + } + } + + } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index f47d6e5cc6..e1895a8331 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -10,227 +10,274 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("df") +@ObfuscatedName("ci") @Implements("Varcs") public class Varcs { - @ObfuscatedName("be") + @ObfuscatedName("hs") @ObfuscatedSignature( - descriptor = "[Loa;" + descriptor = "[Lom;" ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("da") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive12") - static Archive archive12; + @Export("crossSprites") + static SpritePixels[] crossSprites; @ObfuscatedName("v") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("map") Map map; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("strings") String[] strings; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -4374446863144258723L + longValue = 3907634474893374435L ) - long field1382; + long field1187; Varcs() { - this.unwrittenChanges = false; // L: 22 - int var1 = SecureRandomFuture.archive2.getGroupFileCount(19); // L: 26 - this.map = new HashMap(); // L: 27 - this.intsPersistence = new boolean[var1]; // L: 28 + this.unwrittenChanges = false; + int var1 = ItemLayer.archive2.getGroupFileCount(19); + this.map = new HashMap(); + this.intsPersistence = new boolean[var1]; int var2; - for (var2 = 0; var2 < var1; ++var2) { // L: 29 - VarcInt var3 = Interpreter.method2009(var2); // L: 30 - this.intsPersistence[var2] = var3.persist; // L: 31 + for (var2 = 0; var2 < var1; ++var2) { + VarcInt var3 = SecureRandomFuture.method1705(var2); + this.intsPersistence[var2] = var3.persist; } - var2 = 0; // L: 33 - if (SecureRandomFuture.archive2.method5031(15)) { // L: 34 - var2 = SecureRandomFuture.archive2.getGroupFileCount(15); // L: 35 + var2 = 0; + if (ItemLayer.archive2.method4956(15)) { + var2 = ItemLayer.archive2.getGroupFileCount(15); } - this.strings = new String[var2]; // L: 37 - this.read(); // L: 38 - } // L: 39 + this.strings = new String[var2]; + this.read(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "88" + descriptor = "(III)V", + garbageValue = "-394531953" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); // L: 42 + this.map.put(var1, var2); if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; // L: 43 + this.unwrittenChanges = true; } - } // L: 44 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-43" + descriptor = "(II)I", + garbageValue = "-175350009" ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); // L: 47 - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51 + Object var2 = this.map.get(var1); + return var2 instanceof Integer ? (Integer)var2 : -1; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-105" + garbageValue = "50" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); // L: 55 - } // L: 56 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "30" - ) - @Export("getString") - String getString(int var1) { - Object var2 = this.map.get(var1); // L: 59 - return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 + this.map.put(var1, var2); } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1951315477" + ) + @Export("getString") + String getString(int var1) { + Object var2 = this.map.get(var1); + return var2 instanceof String ? (String)var2 : ""; + } + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1842220205" + garbageValue = "1011470788" ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; // L: 67 - } // L: 68 + this.strings[var1] = var2; + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "921484764" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "22" ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; // L: 71 + return this.strings[var1]; } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1804190455" + garbageValue = "226820309" ) @Export("clearTransient") void clearTransient() { int var1; - for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 75 - if (!this.intsPersistence[var1]) { // L: 76 - this.map.remove(var1); // L: 77 + for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { + if (!this.intsPersistence[var1]) { + this.map.remove(var1); } } - for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 80 - this.strings[var1] = null; // L: 81 + for (var1 = 0; var1 < this.strings.length; ++var1) { + this.strings[var1] = null; } - } // L: 83 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ZI)Lnp;", - garbageValue = "609461646" + descriptor = "(ZB)Lnx;", + garbageValue = "-45" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return class262.getPreferencesFile("2", class182.field2114.name, var1); // L: 86 + return NPC.getPreferencesFile("2", MouseRecorder.field975.name, var1); } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1876168838" + garbageValue = "-833796350" ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); // L: 90 + AccessFile var1 = this.getPreferencesFile(true); try { - int var2 = 3; // L: 92 - int var3 = 0; // L: 93 - Iterator var4 = this.map.entrySet().iterator(); // L: 94 + int var2 = 3; + int var3 = 0; + Iterator var4 = this.map.entrySet().iterator(); while (var4.hasNext()) { - Entry var5 = (Entry)var4.next(); // L: 95 - int var6 = (Integer)var5.getKey(); // L: 97 - if (this.intsPersistence[var6]) { // L: 98 - Object var7 = var5.getValue(); // L: 99 - var2 += 3; // L: 100 - if (var7 instanceof Integer) { // L: 101 + Entry var5 = (Entry)var4.next(); + int var6 = (Integer)var5.getKey(); + if (this.intsPersistence[var6]) { + Object var7 = var5.getValue(); + var2 += 3; + if (var7 instanceof Integer) { var2 += 4; - } else if (var7 instanceof String) { // L: 102 - var2 += class44.stringCp1252NullTerminatedByteSize((String)var7); + } else if (var7 instanceof String) { + var2 += GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize((String)var7); } - ++var3; // L: 103 + ++var3; } } - Buffer var23 = new Buffer(var2); // L: 107 - var23.writeByte(2); // L: 108 - var23.writeShort(var3); // L: 109 - Iterator var24 = this.map.entrySet().iterator(); // L: 110 + Buffer var33 = new Buffer(var2); + var33.writeByte(2); + var33.writeShort(var3); + Iterator var34 = this.map.entrySet().iterator(); - while (var24.hasNext()) { - Entry var12 = (Entry)var24.next(); // L: 111 - int var13 = (Integer)var12.getKey(); - if (this.intsPersistence[var13]) { // L: 114 - var23.writeShort(var13); - Object var8 = var12.getValue(); - class375 var9 = class375.method6511(var8.getClass()); - var23.writeByte(var9.field4137); - class375.method6512(var8, var23); // L: 119 + label187: + while (true) { + Entry var21; + int var22; + do { + if (!var34.hasNext()) { + var1.write(var33.array, 0, var33.offset); + break label187; + } + + var21 = (Entry)var34.next(); + var22 = (Integer)var21.getKey(); + } while(!this.intsPersistence[var22]); + + var33.writeShort(var22); + Object var8 = var21.getValue(); + Class var10 = var8.getClass(); + class376[] var11 = new class376[]{class376.field4164, class376.field4163, class376.field4159}; + class376[] var12 = var11; + int var13 = 0; + + class376 var9; + class376 var14; + while (true) { + if (var13 >= var12.length) { + var9 = null; + break; + } + + var14 = var12[var13]; + if (var10 == var14.field4160) { + var9 = var14; + break; + } + + ++var13; } - } - var1.write(var23.array, 0, var23.offset); // L: 123 - } catch (Exception var21) { + var33.writeByte(var9.field4158); + Class var23 = var8.getClass(); + class376[] var15 = new class376[]{class376.field4164, class376.field4163, class376.field4159}; + class376[] var16 = var15; + int var17 = 0; + + while (true) { + if (var17 >= var16.length) { + var14 = null; + break; + } + + class376 var18 = var16[var17]; + if (var23 == var18.field4160) { + var14 = var18; + break; + } + + ++var17; + } + + if (var14 == null) { + throw new IllegalArgumentException(); + } + + class372 var35 = var14.field4162; + var35.vmethod6563(var8, var33); + } + } catch (Exception var31) { } finally { try { var1.close(); - } catch (Exception var20) { + } catch (Exception var30) { } } this.unwrittenChanges = false; - this.field1382 = ClientPacket.currentTimeMillis(); + this.field1187 = UrlRequester.method2125(); } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "124" + garbageValue = "0" ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 137 + AccessFile var1 = this.getPreferencesFile(false); - label228: { + label216: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -245,61 +292,61 @@ public class Varcs { Buffer var15 = new Buffer(var2); if (var15.array.length - var15.offset >= 1) { int var16 = var15.readUnsignedByte(); - if (var16 >= 0 && var16 <= 2) { - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { - var17 = var15.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var17) { - break label228; - } - - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class375[] var10 = new class375[]{class375.field4128, class375.field4134, class375.field4127}; - class375 var11 = (class375)Clock.findEnumerated(var10, var9); - Object var12 = var11.method6510(var15); // L: 160 - if (this.intsPersistence[var8]) { // L: 161 - this.map.put(var8, var12); // L: 162 - } - - ++var7; - } - } else { - var17 = var15.readUnsignedShort(); - - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readInt(); - if (this.intsPersistence[var8]) { // L: 171 - this.map.put(var8, var9); // L: 172 - } - } - - var7 = var15.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label228; - } - - var15.readUnsignedShort(); // L: 177 - var15.readStringCp1252NullTerminated(); - ++var8; // L: 176 - } - } + if (var16 < 0 || var16 > 2) { + return; } - return; // L: 187 + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { + var17 = var15.readUnsignedShort(); + var7 = 0; + + while (true) { + if (var7 >= var17) { + break label216; + } + + var8 = var15.readUnsignedShort(); + var9 = var15.readUnsignedByte(); + class376[] var10 = new class376[]{class376.field4164, class376.field4163, class376.field4159}; + class376 var11 = (class376)Huffman.findEnumerated(var10, var9); + Object var12 = var11.method6561(var15); + if (this.intsPersistence[var8]) { + this.map.put(var8, var12); + } + + ++var7; + } + } else { + var17 = var15.readUnsignedShort(); + + for (var7 = 0; var7 < var17; ++var7) { + var8 = var15.readUnsignedShort(); + var9 = var15.readInt(); + if (this.intsPersistence[var8]) { + this.map.put(var8, var9); + } + } + + var7 = var15.readUnsignedShort(); + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label216; + } + + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); + ++var8; + } + } } - } catch (Exception var26) { // L: 182 - break label228; + } catch (Exception var26) { + break label216; } finally { try { var1.close(); @@ -312,452 +359,403 @@ public class Varcs { } this.unwrittenChanges = false; - } // L: 190 + } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1424878016" + garbageValue = "-1657050632" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1382 < ClientPacket.currentTimeMillis() - 60000L) { + if (this.unwrittenChanges && this.field1187 < UrlRequester.method2125() - 60000L) { this.write(); } - } // L: 196 + } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "262947682" + garbageValue = "-1557805911" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lcs;IIB)V", - garbageValue = "-123" + descriptor = "(Ljy;II)Lif;", + garbageValue = "-1076750496" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; // L: 113 - Script var4; - int var20; - if (Message.isWorldMapEvent(var0.type)) { // L: 115 - Occluder.worldMapEvent = (WorldMapEvent)var3[0]; // L: 116 - WorldMapElement var5 = Archive.WorldMapElement_get(Occluder.worldMapEvent.mapElement); // L: 117 - var4 = StructComposition.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 118 + static MusicPatch method2062(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); + } + + @ObfuscatedName("t") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class307.base37Table[(int)(var6 - 37L * var0)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); + } } else { - var20 = (Integer)var3[0]; // L: 121 - var4 = class375.getScript(var20); // L: 122 + return null; } + } - if (var4 != null) { // L: 124 - ChatChannel.Interpreter_intStackSize = 0; // L: 127 - UserComparator9.Interpreter_stringStackSize = 0; // L: 128 - var20 = -1; // L: 129 - int[] var6 = var4.opcodes; // L: 130 - int[] var7 = var4.intOperands; // L: 131 - byte var8 = -1; // L: 132 - Interpreter.Interpreter_frameDepth = 0; // L: 133 - Interpreter.field963 = false; // L: 134 - boolean var9 = false; // L: 135 - int var10 = 0; // L: 136 - boolean var30 = false; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([Lag;II[I[II)V", + garbageValue = "2039199358" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; - label985: { - label986: { - try { - int var13; - try { - var30 = true; // L: 138 - class231.Interpreter_intLocals = new int[var4.localIntCount]; // L: 139 - int var11 = 0; // L: 140 - UrlRequester.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 141 - int var12 = 0; + while (var5 < var6) { + boolean var9 = true; - int var14; - String var21; - for (var13 = 1; var13 < var3.length; ++var13) { // L: 142 - if (var3[var13] instanceof Integer) { // L: 143 - var14 = (Integer)var3[var13]; // L: 144 - if (var14 == -2147483647) { // L: 145 - var14 = var0.mouseX; - } + int var10; + int var11; + int var12; + do { + --var6; - if (var14 == -2147483646) { // L: 146 - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { // L: 147 - var14 = var0.widget != null ? var0.widget.id * -464746545 * 363798319 : -1; - } - - if (var14 == -2147483644) { // L: 148 - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { // L: 149 - var14 = var0.widget != null ? var0.widget.childIndex * 1482836169 * 576999801 : -1; - } - - if (var14 == -2147483642) { // L: 150 - var14 = var0.dragTarget != null ? var0.dragTarget.id * -464746545 * 363798319 : -1; - } - - if (var14 == -2147483641) { // L: 151 - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1482836169 * 576999801 : -1; - } - - if (var14 == -2147483640) { // L: 152 - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { // L: 153 - var14 = var0.keyPressed; - } - - class231.Interpreter_intLocals[var11++] = var14; // L: 154 - } else if (var3[var13] instanceof String) { // L: 156 - var21 = (String)var3[var13]; // L: 157 - if (var21.equals("event_opbase")) { // L: 158 - var21 = var0.targetName; - } - - UrlRequester.Interpreter_stringLocals[var12++] = var21; // L: 159 - } + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; } - Interpreter.field966 = var0.field1154; // L: 163 - - while (true) { - ++var10; // L: 165 - if (var10 > var1) { // L: 166 - throw new RuntimeException(); - } - - ++var20; // L: 167 - int var33 = var6[var20]; - if (var33 >= 100) { // L: 168 - boolean var35; - if (var4.intOperands[var20] == 1) { // L: 386 - var35 = true; - } else { - var35 = false; // L: 387 - } - - var14 = class7.method88(var33, var4, var35); // L: 388 - switch(var14) { // L: 389 - case 0: - var30 = false; - break label985; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); // L: 392 - } - } else if (var33 == 0) { // L: 169 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7[var20]; // L: 170 - } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 173 - var13 = var7[var20]; // L: 174 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 175 - } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 178 - var13 = var7[var20]; // L: 179 - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 180 - class6.changeGameOptions(var13); // L: 181 - } else if (var33 == ScriptOpcodes.SCONST) { // L: 184 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 185 - } else if (var33 == ScriptOpcodes.JUMP) { // L: 188 - var20 += var7[var20]; // L: 189 - } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 192 - ChatChannel.Interpreter_intStackSize -= 2; // L: 193 - if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 194 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 197 - ChatChannel.Interpreter_intStackSize -= 2; // L: 198 - if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 199 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 202 - ChatChannel.Interpreter_intStackSize -= 2; // L: 203 - if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 204 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 207 - ChatChannel.Interpreter_intStackSize -= 2; // L: 208 - if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 209 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.RETURN) { // L: 212 - if (Interpreter.Interpreter_frameDepth == 0) { // L: 213 - var30 = false; - break; - } - - ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 214 - var4 = var40.script; // L: 215 - var6 = var4.opcodes; // L: 216 - var7 = var4.intOperands; // L: 217 - var20 = var40.pc; // L: 218 - class231.Interpreter_intLocals = var40.intLocals; // L: 219 - UrlRequester.Interpreter_stringLocals = var40.stringLocals; // L: 220 - } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 223 - var13 = var7[var20]; // L: 224 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ScriptFrame.getVarbit(var13); // L: 225 - } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 228 - var13 = var7[var20]; // L: 229 - Archive.method5060(var13, Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 230 - } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 233 - ChatChannel.Interpreter_intStackSize -= 2; // L: 234 - if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 235 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 238 - ChatChannel.Interpreter_intStackSize -= 2; // L: 239 - if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 240 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.ILOAD) { // L: 243 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class231.Interpreter_intLocals[var7[var20]]; // L: 244 - } else if (var33 == ScriptOpcodes.ISTORE) { // L: 247 - class231.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 248 - } else if (var33 == ScriptOpcodes.SLOAD) { // L: 251 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = UrlRequester.Interpreter_stringLocals[var7[var20]]; // L: 252 - } else if (var33 == ScriptOpcodes.SSTORE) { // L: 255 - UrlRequester.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 256 - } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 259 - var13 = var7[var20]; // L: 260 - UserComparator9.Interpreter_stringStackSize -= var13; // L: 261 - var21 = MouseRecorder.method2203(Interpreter.Interpreter_stringStack, UserComparator9.Interpreter_stringStackSize, var13); // L: 262 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var21; // L: 263 - } else if (var33 == ScriptOpcodes.POP_INT) { // L: 266 - --ChatChannel.Interpreter_intStackSize; // L: 267 - } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 270 - --UserComparator9.Interpreter_stringStackSize; // L: 271 - } else { - int var17; - if (var33 != ScriptOpcodes.INVOKE) { // L: 274 - if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 297 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class20.varcs.getInt(var7[var20]); // L: 298 - } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 301 - class20.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 302 - } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 305 - var13 = var7[var20] >> 16; // L: 306 - var14 = var7[var20] & 65535; // L: 307 - int var24 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 308 - if (var24 < 0 || var24 > 5000) { // L: 309 - throw new RuntimeException(); // L: 310 - } - - Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 312 - byte var25 = -1; // L: 313 - if (var14 == 105) { // L: 314 - var25 = 0; - } - - for (var17 = 0; var17 < var24; ++var17) { // L: 315 - Interpreter.Interpreter_arrays[var13][var17] = var25; - } - } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 318 - var13 = var7[var20]; // L: 319 - var14 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 320 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 321 - throw new RuntimeException(); // L: 322 - } - - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 324 - } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 327 - var13 = var7[var20]; // L: 328 - ChatChannel.Interpreter_intStackSize -= 2; // L: 329 - var14 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 330 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 331 - throw new RuntimeException(); // L: 332 - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 334 - } else { - String var22; - if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 337 - var22 = class20.varcs.getStringOld(var7[var20]); // L: 338 - if (var22 == null) { // L: 339 - var22 = "null"; - } - - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var22; // L: 340 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 343 - class20.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 344 - } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 347 - var22 = class20.varcs.getString(var7[var20]); // L: 348 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var22; // L: 349 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 352 - class20.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 353 - } else if (var33 == ScriptOpcodes.SWITCH) { // L: 356 - IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 357 - IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 358 - if (var37 != null) { // L: 359 - var20 += var37.integer; - } - } else { - Integer var39; - if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 362 - var39 = DirectByteArrayCopier.field3128.getTitleGroupValue(var7[var20]); // L: 363 - if (var39 == null) { // L: 364 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 365 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var39; // L: 368 - } - } else { - if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 372 - throw new IllegalStateException(); // L: 382 - } - - var39 = class10.field74.method6047(var7[var20]); // L: 373 - if (var39 == null) { // L: 374 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 375 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var39; // L: 378 - } - } - } - } - } else { - var13 = var7[var20]; // L: 275 - Script var36 = class375.getScript(var13); // L: 276 - int[] var15 = new int[var36.localIntCount]; // L: 277 - String[] var16 = new String[var36.localStringCount]; // L: 278 - - for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 279 - var15[var17] = Interpreter.Interpreter_intStack[var17 + (ChatChannel.Interpreter_intStackSize - var36.intArgumentCount)]; - } - - for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 280 - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (UserComparator9.Interpreter_stringStackSize - var36.stringArgumentCount)]; - } - - ChatChannel.Interpreter_intStackSize -= var36.intArgumentCount; // L: 281 - UserComparator9.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 282 - ScriptFrame var23 = new ScriptFrame(); // L: 283 - var23.script = var4; // L: 284 - var23.pc = var20; // L: 285 - var23.intLocals = class231.Interpreter_intLocals; // L: 286 - var23.stringLocals = UrlRequester.Interpreter_stringLocals; // L: 287 - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 288 - var4 = var36; // L: 289 - var6 = var36.opcodes; // L: 290 - var7 = var36.intOperands; // L: 291 - var20 = -1; // L: 292 - class231.Interpreter_intLocals = var15; // L: 293 - UrlRequester.Interpreter_stringLocals = var16; // L: 294 - } - } + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; } - } catch (Exception var31) { // L: 402 - var9 = true; // L: 403 - StringBuilder var27 = new StringBuilder(30); // L: 405 - var27.append("").append(var4.key).append(" "); // L: 406 - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 407 - var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var27.append("").append(var8); // L: 408 - FriendsChat.RunException_sendStackTrace(var27.toString(), var31); // L: 409 - var30 = false; - break label986; + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var6].id; + var12 = var8.id; } - } finally { - if (var30) { - if (Interpreter.field963) { // L: 413 - Interpreter.field951 = true; // L: 414 - } - while (Interpreter.field965.size() > 0) { // L: 416 - class106 var19 = (class106)Interpreter.field965.remove(0); // L: 417 - MouseHandler.widgetDefaultMenuAction(var19.method2375(), var19.method2360(), var19.method2367(), var19.method2363(), ""); - } - - if (Interpreter.field951) { // L: 420 - class20.method288(); // L: 421 - Interpreter.field951 = false; // L: 422 - Interpreter.field963 = false; // L: 423 - } - - if (!var9 && var2 > 0 && var10 >= var2) { - FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + if (var12 != var11) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; } + break; + } + if (var10 == 3) { + var9 = false; } } + } while(var9); - if (Interpreter.field963) { - Interpreter.field951 = true; + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } + + if (var12 != var11) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } } + } while(var9); - while (Interpreter.field965.size() > 0) { - class106 var41 = (class106)Interpreter.field965.remove(0); - MouseHandler.widgetDefaultMenuAction(var41.method2375(), var41.method2360(), var41.method2367(), var41.method2363(), ""); - } - - if (Interpreter.field951) { - class20.method288(); - Interpreter.field951 = false; - Interpreter.field963 = false; - } - - if (!var9 && var2 > 0 && var10 >= var2) { - FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; } - - if (Interpreter.field963) { - Interpreter.field951 = true; - } - - while (Interpreter.field965.size() > 0) { - class106 var26 = (class106)Interpreter.field965.remove(0); - MouseHandler.widgetDefaultMenuAction(var26.method2375(), var26.method2360(), var26.method2367(), var26.method2363(), ""); - } - - if (Interpreter.field951) { - class20.method288(); - Interpreter.field951 = false; - Interpreter.field963 = false; - } - - if (!var9 && var2 > 0 && var10 >= var2) { - FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; // L: 429 - } - - if (Interpreter.field963) { - Interpreter.field951 = true; - } - - while (Interpreter.field965.size() > 0) { - class106 var34 = (class106)Interpreter.field965.remove(0); - MouseHandler.widgetDefaultMenuAction(var34.method2375(), var34.method2360(), var34.method2367(), var34.method2363(), ""); // L: 418 - } - - if (Interpreter.field951) { - class20.method288(); - Interpreter.field951 = false; - Interpreter.field963 = false; - } - - if (!var9 && var2 > 0 && var10 >= var2) { // L: 425 - FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 426 } + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); } - } // L: 125 + + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1524264590" + ) + static int method2037(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var3 = UrlRequester.getWidget(var4); + } else { + var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + Interpreter.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + Interpreter.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; + AttackOption.invalidateWidget(var3); + return 1; + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + AttackOption.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + AttackOption.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + Interpreter.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + Interpreter.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + AttackOption.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + Tile.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == 1125) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FillMode var6 = (FillMode)Huffman.findEnumerated(ApproximateRouteStrategy.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + AttackOption.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + var3.field2991 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else if (var0 == 1128) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else { + return 2; + } + } + } + } + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(IIIILom;Liy;I)V", + garbageValue = "785407155" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + class144.redHintArrowSprite.method7116(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + class267.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + } + + } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index d35770cdd6..0c69ba03e9 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -1,102 +1,218 @@ -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("eb") +@ObfuscatedName("eg") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("VarpDefinition_archive") static AbstractArchive VarpDefinition_archive; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("VarpDefinition_cached") - static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1436014737 + intValue = 1459599171 ) @Export("type") public int type; static { - VarpDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 + VarpDefinition_cached = new EvictingDualNodeHashTable(64); } VarpDefinition() { - this.type = 0; // L: 13 - } // L: 15 + this.type = 0; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-383467418" + descriptor = "(Lnv;I)V", + garbageValue = "723580004" ) @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) { + return; } - this.decodeNext(var1, var2); // L: 36 + this.decodeNext(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "8" + descriptor = "(Lnv;II)V", + garbageValue = "-1873217499" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { // L: 41 + if (var2 == 5) { this.type = var1.readUnsignedShort(); } - } // L: 43 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IILfg;Lfy;I)Z", + garbageValue = "823697752" + ) + static final boolean method2715(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class161.directions[var6][var7] = 99; + class161.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class161.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class161.bufferY[var10001] = var1; + int[][] var12 = var3.flags; + + while (var11 != var18) { + var4 = class161.bufferX[var11]; + var5 = class161.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(1, var4, var5, var3)) { + SoundSystem.field219 = var4; + class161.field1896 = var5; + return true; + } + + int var15 = class161.distances[var16][var17] + 1; + if (var16 > 0 && class161.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { + class161.bufferX[var18] = var4 - 1; + class161.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class161.directions[var16 - 1][var17] = 2; + class161.distances[var16 - 1][var17] = var15; + } + + if (var16 < 127 && class161.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { + class161.bufferX[var18] = var4 + 1; + class161.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class161.directions[var16 + 1][var17] = 8; + class161.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class161.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class161.bufferX[var18] = var4; + class161.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class161.directions[var16][var17 - 1] = 1; + class161.distances[var16][var17 - 1] = var15; + } + + if (var17 < 127 && class161.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class161.bufferX[var18] = var4; + class161.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class161.directions[var16][var17 + 1] = 4; + class161.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class161.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) { + class161.bufferX[var18] = var4 - 1; + class161.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 - 1][var17 - 1] = 3; + class161.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 127 && var17 > 0 && class161.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) { + class161.bufferX[var18] = var4 + 1; + class161.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 + 1][var17 - 1] = 9; + class161.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 127 && class161.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) { + class161.bufferX[var18] = var4 - 1; + class161.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 - 1][var17 + 1] = 6; + class161.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 127 && var17 < 127 && class161.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) { + class161.bufferX[var18] = var4 + 1; + class161.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class161.directions[var16 + 1][var17 + 1] = 12; + class161.distances[var16 + 1][var17 + 1] = var15; + } + } + + SoundSystem.field219 = var4; + class161.field1896 = var5; + return false; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lcn;", - garbageValue = "1169872264" + descriptor = "(I)V", + garbageValue = "2099813697" ) - static ClientPreferences method2715() { - AccessFile var0 = null; // L: 95 - ClientPreferences var1 = new ClientPreferences(); // L: 96 + static void method2713() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + } - try { - var0 = class262.getPreferencesFile("", class182.field2114.name, false); // L: 98 - byte[] var2 = new byte[(int)var0.length()]; // L: 99 - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 100 101 104 - var4 = var0.read(var2, var3, var2.length - var3); // L: 102 - if (var4 == -1) { - throw new IOException(); // L: 103 - } - } - - var1 = new ClientPreferences(new Buffer(var2)); // L: 106 - } catch (Exception var6) { // L: 108 + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1467913465" + ) + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); } - try { - if (var0 != null) { // L: 110 - var0.close(); + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; } - } catch (Exception var5) { // L: 112 + + for (var7 = var4.ids.length; var7 < var1; ++var7) { + var5[var7] = -1; + var6[var7] = 0; + } + + var4.ids = var5; + var4.quantities = var6; } - return var1; // L: 113 + var4.ids[var1] = var2; + var4.quantities[var1] = var3; } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index d471bcc81f..34b2629d6b 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,299 +1,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("in") @Implements("Varps") public class Varps { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("Varps_temp") public static int[] Varps_temp; @ObfuscatedName("v") @Export("Varps_main") public static int[] Varps_main; + @ObfuscatedName("x") + public static short[][] field2914; + @ObfuscatedName("eb") + @Export("worldHost") + static String worldHost; static { - Varps_masks = new int[32]; // L: 6 - int var0 = 2; // L: 9 + Varps_masks = new int[32]; + int var0 = 2; - for (int var1 = 0; var1 < 32; ++var1) { // L: 10 - Varps_masks[var1] = var0 - 1; // L: 11 - var0 += var0; // L: 12 + for (int var1 = 0; var1 < 32; ++var1) { + Varps_masks[var1] = var0 - 1; + var0 += var0; } - Varps_temp = new int[4000]; // L: 16 - Varps_main = new int[4000]; // L: 17 + Varps_temp = new int[4000]; + Varps_main = new int[4000]; } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "1691710161" - ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - boolean var2 = false; // L: 37 - boolean var3 = false; // L: 38 - int var4 = 0; // L: 39 - int var5 = var0.length(); // L: 40 - int var6 = 0; - - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; // L: 70 - break; - } - - label83: { - char var7 = var0.charAt(var6); // L: 42 - if (var6 == 0) { // L: 43 - if (var7 == '-') { // L: 44 - var2 = true; // L: 45 - break label83; - } - - if (var7 == '+') { // L: 48 - break label83; - } - } - - int var9; - if (var7 >= '0' && var7 <= '9') { // L: 50 - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { // L: 51 - var9 = var7 - '7'; - } else { - if (var7 < 'a' || var7 > 'z') { // L: 52 - var1 = false; // L: 54 - break; - } - - var9 = var7 - 'W'; - } - - if (var9 >= 10) { // L: 57 - var1 = false; // L: 58 - break; // L: 59 - } - - if (var2) { // L: 61 - var9 = -var9; - } - - int var8 = var9 + var4 * 10; // L: 62 - if (var4 != var8 / 10) { // L: 63 - var1 = false; // L: 64 - break; // L: 65 - } - - var4 = var8; // L: 67 - var3 = true; // L: 68 - } - - ++var6; // L: 41 - } - - return var1; // L: 72 - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1613057014" - ) - static final void method4783() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { // L: 3960 - var0 = class262.localPlayer.x; // L: 3961 - var1 = class262.localPlayer.y; // L: 3962 - if (FriendSystem.oculusOrbFocalPointX - var0 < -500 || FriendSystem.oculusOrbFocalPointX - var0 > 500 || VarbitComposition.oculusOrbFocalPointY - var1 < -500 || VarbitComposition.oculusOrbFocalPointY - var1 > 500) { // L: 3963 - FriendSystem.oculusOrbFocalPointX = var0; // L: 3964 - VarbitComposition.oculusOrbFocalPointY = var1; // L: 3965 - } - - if (var0 != FriendSystem.oculusOrbFocalPointX) { // L: 3967 - FriendSystem.oculusOrbFocalPointX += (var0 - FriendSystem.oculusOrbFocalPointX) / 16; - } - - if (var1 != VarbitComposition.oculusOrbFocalPointY) { // L: 3968 - VarbitComposition.oculusOrbFocalPointY += (var1 - VarbitComposition.oculusOrbFocalPointY) / 16; - } - - var2 = FriendSystem.oculusOrbFocalPointX >> 7; // L: 3969 - var3 = VarbitComposition.oculusOrbFocalPointY >> 7; // L: 3970 - var4 = ItemContainer.getTileHeight(FriendSystem.oculusOrbFocalPointX, VarbitComposition.oculusOrbFocalPointY, SoundSystem.Client_plane); // L: 3971 - var5 = 0; // L: 3972 - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3973 - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3974 - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3975 - int var8 = SoundSystem.Client_plane; // L: 3976 - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3977 - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3978 - if (var9 > var5) { // L: 3979 - var5 = var9; - } - } - } - } - - var6 = var5 * 192; // L: 3983 - if (var6 > 98048) { // L: 3984 - var6 = 98048; - } - - if (var6 < 32768) { // L: 3985 - var6 = 32768; - } - - if (var6 > Client.field708) { // L: 3986 - Client.field708 += (var6 - Client.field708) / 24; - } else if (var6 < Client.field708) { // L: 3987 - Client.field708 += (var6 - Client.field708) / 80; - } - - class14.field124 = ItemContainer.getTileHeight(class262.localPlayer.x, class262.localPlayer.y, SoundSystem.Client_plane) - Client.camFollowHeight; // L: 3988 - } else if (Client.oculusOrbState == 1) { // L: 3990 - if (Client.field705 && class262.localPlayer != null) { // L: 3992 - var0 = class262.localPlayer.pathX[0]; // L: 3993 - var1 = class262.localPlayer.pathY[0]; // L: 3994 - if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { // L: 3995 - FriendSystem.oculusOrbFocalPointX = class262.localPlayer.x; // L: 3996 - var2 = ItemContainer.getTileHeight(class262.localPlayer.x, class262.localPlayer.y, SoundSystem.Client_plane) - Client.camFollowHeight; // L: 3997 - if (var2 < class14.field124) { // L: 3998 - class14.field124 = var2; - } - - VarbitComposition.oculusOrbFocalPointY = class262.localPlayer.y; // L: 3999 - Client.field705 = false; // L: 4000 - } - } - - short var10 = -1; // L: 4003 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 4004 - var10 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 4005 - var10 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 4006 - if (var10 == 0) { // L: 4007 - var10 = 1792; - } else if (var10 == 1024) { // L: 4008 - var10 = 1280; - } else { - var10 = 1536; // L: 4009 - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 4011 - if (var10 == 0) { // L: 4012 - var10 = 256; - } else if (var10 == 1024) { // L: 4013 - var10 = 768; - } else { - var10 = 512; // L: 4014 - } - } - - byte var11 = 0; // L: 4016 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 4017 - var11 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 4018 - var11 = 1; - } - - var2 = 0; // L: 4019 - if (var10 >= 0 || var11 != 0) { // L: 4020 - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 930603185 * -1091934127 : Client.oculusOrbNormalSpeed * 1556069133 * 1614384069; // L: 4021 - var2 *= 16; // L: 4022 - Client.field676 = var10; // L: 4023 - Client.field857 = var11; // L: 4024 - } - - if (Client.field699 < var2) { // L: 4026 - Client.field699 += var2 / 8; // L: 4027 - if (Client.field699 > var2) { // L: 4028 - Client.field699 = var2; - } - } else if (Client.field699 > var2) { // L: 4030 - Client.field699 = Client.field699 * 9 / 10; - } - - if (Client.field699 > 0) { // L: 4031 - var3 = Client.field699 / 16; // L: 4032 - if (Client.field676 >= 0) { // L: 4033 - var0 = Client.field676 - class32.cameraYaw & 2047; // L: 4034 - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 4035 - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 4036 - FriendSystem.oculusOrbFocalPointX += var3 * var4 / 65536; // L: 4037 - VarbitComposition.oculusOrbFocalPointY += var5 * var3 / 65536; // L: 4038 - } - - if (Client.field857 != 0) { // L: 4040 - class14.field124 += var3 * Client.field857; // L: 4041 - if (class14.field124 > 0) { // L: 4042 - class14.field124 = 0; - } - } - } else { - Client.field676 = -1; // L: 4046 - Client.field857 = -1; // L: 4047 - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 4049 - class35.method421(); // L: 4050 - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && UserComparator3.mouseCam) { // L: 4053 - var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 4054 - Client.camAngleDX = var0 * 2; // L: 4055 - Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -1895436129 * 1644112735; // L: 4056 - var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 4057 - Client.camAngleDY = var1 * 2; // L: 4058 - Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -356572869 * 1657999347; // L: 4059 - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 4062 - Client.camAngleDY += (-24 - Client.camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 4063 - Client.camAngleDY += (24 - Client.camAngleDY) / 2; - } else { - Client.camAngleDY /= 2; // L: 4064 - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4065 - Client.camAngleDX += (12 - Client.camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4066 - Client.camAngleDX += (-12 - Client.camAngleDX) / 2; - } else { - Client.camAngleDX /= 2; // L: 4067 - } - - Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4068 - Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4069 - } - - Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 4071 - Client.camAngleX += Client.camAngleDX / 2; // L: 4072 - if (Client.camAngleX < 128) { // L: 4073 - Client.camAngleX = 128; - } - - if (Client.camAngleX > 383) { // L: 4074 - Client.camAngleX = 383; - } - - } // L: 4075 } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index d32683fd6d..c393ecf753 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,44 +4,668 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("hf") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("f") + @ObfuscatedName("p") + public static short[][] field2498; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -530812609 + intValue = -135097513 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2129765855 + intValue = -1707092437 ) @Export("y") int y; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1401636457 + intValue = 283818839 ) @Export("z") int z; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1745933887 + intValue = 1464118601 ) @Export("magnitude") int magnitude; VertexNormal() { - } // L: 9 + } @ObfuscatedSignature( - descriptor = "(Lgv;)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 - } // L: 16 + this.x = var1.x; + this.y = var1.y; + this.z = var1.z; + this.magnitude = var1.magnitude; + } + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(Lbx;IIIIIB)V", + garbageValue = "2" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCComposition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { + var6 = var6.transform(); + } + + if (var6 == null) { + return; + } + } + + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + byte var8 = 0; + Player var10; + if (var1 < var75 && var0.playerCycle == Client.cycle) { + var10 = (Player)var0; + boolean var9; + if (Client.drawPlayerNames == 0) { + var9 = false; + } else if (var10 == MouseHandler.localPlayer) { + var9 = Message.method865(); + } else { + boolean var11 = class260.method4894(); + boolean var12; + if (!var11) { + var12 = (Client.drawPlayerNames & 1) != 0; + var11 = var12 && var10.isFriend(); + } + + var12 = var11; + if (!var11) { + boolean var13 = (Client.drawPlayerNames & 2) != 0; + var12 = var13 && var10.isFriendsChatMember(); + } + + var9 = var12; + } + + if (var9) { + Player var76 = (Player)var0; + if (var1 < var75) { + MusicPatchNode.method4684(var0, var0.defaultHeight + 15); + AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var91 = 9; + var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var91, 16777215, 0); + var8 = 18; + } + } + } + + int var87 = -2; + int var15; + int var22; + int var23; + if (!var0.healthBars.method5383()) { + MusicPatchNode.method4684(var0, var0.defaultHeight + 15); + + for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var94 = var88.get(Client.cycle); + if (var94 == null) { + if (var88.isEmpty()) { + var88.remove(); + } + } else { + HealthBarDefinition var95 = var88.definition; + SpritePixels var79 = var95.getBackSprite(); + SpritePixels var81 = var95.getFrontSprite(); + int var82 = 0; + if (var79 != null && var81 != null) { + if (var95.widthPadding * 2 < var81.subWidth) { + var82 = var95.widthPadding; + } + + var15 = var81.subWidth - var82 * 2; + } else { + var15 = var95.width; + } + + int var17 = 255; + boolean var83 = true; + int var84 = Client.cycle - var94.cycle; + int var85 = var15 * var94.health2 / var95.width; + int var86; + int var97; + if (var94.cycleOffset > var84) { + var86 = var95.field1585 == 0 ? 0 : var95.field1585 * (var84 / var95.field1585); + var22 = var15 * var94.health / var95.width; + var97 = var86 * (var85 - var22) / var94.cycleOffset + var22; + } else { + var97 = var85; + var86 = var94.cycleOffset + var95.int5 - var84; + if (var95.int3 >= 0) { + var17 = (var86 << 8) / (var95.int5 - var95.int3); + } + } + + if (var94.health2 > 0 && var97 < 1) { + var97 = 1; + } + + if (var79 != null && var81 != null) { + if (var97 == var15) { + var97 += var82 * 2; + } else { + var97 += var82; + } + + var86 = var79.subHeight; + var87 += var86; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var87; + var22 -= var82; + if (var17 >= 0 && var17 < 255) { + var79.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var86); + var81.drawTransAt(var22, var23, var17); + } else { + var79.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var97 + var22, var23 + var86); + var81.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var87 += 2; + } else { + var87 += 5; + if (Client.viewportTempX > -1) { + var86 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var87; + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var97, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var97 + var86, var22, var15 - var97, 5, 16711680); + } + + var87 += 2; + } + } + } + } + + if (var87 == -2) { + var87 += 7; + } + + var87 += var8; + if (var1 < var75) { + var10 = (Player)var0; + if (var10.isHidden) { + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { + MusicPatchNode.method4684(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var10.headIconPk != -1) { + var87 += 25; + UserComparator4.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + } + + if (var10.headIconPrayer != -1) { + var87 += 25; + StudioGame.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + MusicPatchNode.method4684(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var87 += SpotAnimationDefinition.headIconHintSprites[1].subHeight; + SpotAnimationDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + } + } + } else { + NPCComposition var89 = ((NPC)var0).definition; + if (var89.transforms != null) { + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < StudioGame.headIconPrayerSprites.length) { + MusicPatchNode.method4684(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + StudioGame.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + MusicPatchNode.method4684(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + SpotAnimationDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1079 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + MusicPatchNode.method4684(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = TaskHandler.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = TaskHandler.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; + Client.overheadText[Client.overheadTextCount] = var0.overheadText; + ++Client.overheadTextCount; + } + } + + for (int var78 = 0; var78 < 4; ++var78) { + int var90 = var0.hitSplatCycles[var78]; + int var92 = var0.hitSplatTypes[var78]; + HitSplatDefinition var96 = null; + int var14 = 0; + if (var92 >= 0) { + if (var90 <= Client.cycle) { + continue; + } + + var96 = ObjectComposition.method3044(var0.hitSplatTypes[var78]); + var14 = var96.field1716; + if (var96 != null && var96.transforms != null) { + var96 = var96.transform(); + if (var96 == null) { + var0.hitSplatCycles[var78] = -1; + continue; + } + } + } else if (var90 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var78]; + HitSplatDefinition var16 = null; + if (var15 >= 0) { + var16 = ObjectComposition.method3044(var15); + if (var16 != null && var16.transforms != null) { + var16 = var16.transform(); + } + } + + if (var90 - var14 <= Client.cycle) { + if (var96 == null) { + var0.hitSplatCycles[var78] = -1; + } else { + MusicPatchNode.method4684(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + if (var78 == 1) { + Client.viewportTempY -= 20; + } + + if (var78 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var78 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; + } + + SpritePixels var18 = null; + SpritePixels var19 = null; + SpritePixels var20 = null; + SpritePixels var21 = null; + var22 = 0; + var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + SpritePixels var30 = null; + SpritePixels var31 = null; + SpritePixels var32 = null; + SpritePixels var33 = null; + int var34 = 0; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + var18 = var96.method2970(); + int var43; + if (var18 != null) { + var22 = var18.subWidth; + var43 = var18.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var18.xOffset; + } + + var19 = var96.method2960(); + if (var19 != null) { + var23 = var19.subWidth; + var43 = var19.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var19.xOffset; + } + + var20 = var96.method2961(); + if (var20 != null) { + var24 = var20.subWidth; + var43 = var20.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var20.xOffset; + } + + var21 = var96.method2962(); + if (var21 != null) { + var25 = var21.subWidth; + var43 = var21.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var21.xOffset; + } + + if (var16 != null) { + var30 = var16.method2970(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var16.method2960(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var16.method2961(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var16.method2962(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var80 = var96.getFont(); + if (var80 == null) { + var80 = GrandExchangeOfferOwnWorldComparator.fontPlain11; + } + + Font var44; + if (var16 != null) { + var44 = var16.getFont(); + if (var44 == null) { + var44 = GrandExchangeOfferOwnWorldComparator.fontPlain11; + } + } else { + var44 = GrandExchangeOfferOwnWorldComparator.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var96.getString(var0.hitSplatValues[var78]); + int var93 = var80.stringWidth(var45); + if (var16 != null) { + var46 = var16.getString(var0.hitSplatValues2[var78]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var20 == null && var21 == null) { + var49 = 1; + } else { + var49 = var93 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; + int var52 = var51; + if (var22 > 0) { + var51 += var22; + } + + var51 += 2; + int var53 = var51; + if (var24 > 0) { + var51 += var24; + } + + int var54 = var51; + int var55 = var51; + int var56; + if (var23 > 0) { + var56 = var49 * var23; + var51 += var56; + var55 += (var56 - var93) / 2; + } else { + var51 += var93; + } + + var56 = var51; + if (var25 > 0) { + var51 += var25; + } + + int var57 = 0; + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; + int var62; + if (var16 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { + var51 += var34; + } + + var51 += 2; + var58 = var51; + if (var36 > 0) { + var51 += var36; + } + + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var50 * var35; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var78] - Client.cycle; + int var63 = var96.field1721 - var62 * var96.field1721 / var96.field1716; + int var64 = var62 * var96.field1722 / var96.field1716 + -var96.field1722; + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); + int var66 = var64 + (var3 + Client.viewportTempY - 12); + int var67 = var66; + int var68 = var42 + var66; + int var69 = var66 + var96.field1726 + 15; + int var70 = var69 - var80.maxAscent; + int var71 = var69 + var80.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var16 != null) { + var72 = var66 + var16.field1726 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var96.field1706 >= 0) { + var73 = (var62 << 8) / (var96.field1716 - var96.field1706); + } + + if (var73 >= 0 && var73 < 255) { + if (var18 != null) { + var18.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var20 != null) { + var20.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var19 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var19.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); + } + } + + if (var21 != null) { + var21.drawTransAt(var56 + var65 - var29, var66, var73); + } + + var80.drawAlpha(var45, var65 + var55, var69, var96.textColor, 0, var73); + if (var16 != null) { + if (var30 != null) { + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var58 + var65 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var35 * var74 + (var59 + var65 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); + } + } else { + if (var18 != null) { + var18.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var20 != null) { + var20.drawTransBgAt(var53 + var65 - var28, var66); + } + + if (var19 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); + } + } + + if (var21 != null) { + var21.drawTransBgAt(var56 + var65 - var29, var66); + } + + var80.draw(var45, var55 + var65, var69, var96.textColor | -16777216, 0); + if (var16 != null) { + if (var30 != null) { + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var65 + var58 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); + } + } + } + } + } + } + + } + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index d06a281676..109bf610ce 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,116 +4,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("ey") @Implements("VerticalAlignment") -public enum VerticalAlignment implements Enumerated -{ - @ObfuscatedName("f") +public enum VerticalAlignment implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Ley;" ) - field1679(2, 0), - @ObfuscatedName("e") + field1652(1, 0), + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Ley;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Ley;" ) - field1676(1, 2); + field1654(2, 2); - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1564632603 + intValue = 218657569 ) @Export("value") public final int value; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1142333755 + intValue = -149934733 ) @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; + this.id = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 23 + return this.id; } - @ObfuscatedName("hk") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-1250090587" + descriptor = "(Lhx;Log;I)Lhg;", + garbageValue = "1190419968" ) - static final void method2889(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var8 = var6 - 334; // L: 5476 - if (var8 < 0) { // L: 5477 - var8 = 0; - } else if (var8 > 100) { // L: 5478 - var8 = 100; + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = CollisionMap.method3205(); + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); } - int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 5479 - int var7 = var5 * var9 / 256; // L: 5480 - var8 = 2048 - var3 & 2047; // L: 5483 - var9 = 2048 - var4 & 2047; // L: 5484 - int var10 = 0; // L: 5485 - int var11 = 0; // L: 5486 - int var12 = var7; // L: 5487 - int var13; - int var14; - int var15; - if (var8 != 0) { // L: 5488 - var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5489 - var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5490 - var15 = var14 * var11 - var13 * var7 >> 16; // L: 5491 - var12 = var11 * var13 + var7 * var14 >> 16; // L: 5492 - var11 = var15; // L: 5493 - } - - if (var9 != 0) { // L: 5495 - var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 5496 - var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 5497 - var15 = var12 * var13 + var14 * var10 >> 16; // L: 5498 - var12 = var14 * var12 - var10 * var13 >> 16; // L: 5499 - var10 = var15; // L: 5500 - } - - ObjectSound.cameraX = var0 - var10; // L: 5502 - class160.cameraY = var1 - var11; // L: 5503 - Canvas.cameraZ = var2 - var12; // L: 5504 - class69.cameraPitch = var3; // L: 5505 - class32.cameraYaw = var4; // L: 5506 - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (FriendSystem.oculusOrbFocalPointX >> 7 != class262.localPlayer.x >> 7 || VarbitComposition.oculusOrbFocalPointY >> 7 != class262.localPlayer.y >> 7)) { // L: 5507 5508 - var13 = class262.localPlayer.plane; // L: 5509 - var14 = (FriendSystem.oculusOrbFocalPointX >> 7) + class15.baseX; // L: 5510 - var15 = (VarbitComposition.oculusOrbFocalPointY >> 7) + WorldMapSprite.baseY; // L: 5511 - PacketBufferNode var16 = InterfaceParent.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); // L: 5514 - var16.packetBuffer.writeShort(var14); // L: 5515 - var16.packetBuffer.method6659(Client.field704); // L: 5516 - var16.packetBuffer.method6640(var13); // L: 5517 - var16.packetBuffer.method6648(var15); // L: 5518 - Client.packetWriter.addNode(var16); // L: 5519 - } - - } // L: 5523 + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; + } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 2014781d14..a4c7dbb2c3 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -4,57 +4,123 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gd") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -859848203 + intValue = -719106667 ) @Export("ViewportMouse_x") - static int ViewportMouse_x; + public static int ViewportMouse_x; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1776794129 + intValue = -261124495 ) @Export("ViewportMouse_y") - static int ViewportMouse_y; - @ObfuscatedName("y") + public static int ViewportMouse_y; + @ObfuscatedName("j") @Export("ViewportMouse_false0") - static boolean ViewportMouse_false0; + public static boolean ViewportMouse_false0; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 403361141 + ) + static int field2477; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1964367721 + ) + static int field2478; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -203955225 + ) + static int field2479; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1161898267 + intValue = 558941443 ) - static int field2490; + static int field2480; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1061672799 + ) + static int field2481; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1931298313 + ) + static int field2482; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1274186293 + intValue = -751640175 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; + @ObfuscatedName("mg") + @ObfuscatedGetter( + intValue = -99233219 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; 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_entityTags = new long[1000]; // L: 18 + ViewportMouse_isInViewport = false; + ViewportMouse_x = 0; + ViewportMouse_y = 0; + ViewportMouse_false0 = false; + ViewportMouse_entityCount = 0; + ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("lu") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1871733181" + descriptor = "(Ljy;III)Lom;", + garbageValue = "-2110976883" ) - static void method4410(int var0) { - Client.oculusOrbState = var0; // L: 11669 - } // L: 11670 + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + if (!class290.method5208(var0, var1, var2)) { + return null; + } else { + SpritePixels var4 = new SpritePixels(); + var4.width = class398.SpriteBuffer_spriteWidth; + var4.height = class398.SpriteBuffer_spriteHeight; + var4.xOffset = class398.SpriteBuffer_xOffsets[0]; + var4.yOffset = class398.SpriteBuffer_yOffsets[0]; + var4.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class374.SpriteBuffer_spriteHeights[0]; + int var5 = var4.subWidth * var4.subHeight; + byte[] var6 = class398.SpriteBuffer_pixels[0]; + var4.pixels = new int[var5]; + + for (int var7 = 0; var7 < var5; ++var7) { + var4.pixels[var7] = class118.SpriteBuffer_spritePalette[var6[var7] & 255]; + } + + class398.SpriteBuffer_xOffsets = null; + class398.SpriteBuffer_yOffsets = null; + ClanChannelMember.SpriteBuffer_spriteWidths = null; + class374.SpriteBuffer_spriteHeights = null; + class118.SpriteBuffer_spritePalette = null; + class398.SpriteBuffer_pixels = null; + return var4; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)[Ljr;", + garbageValue = "8" + ) + public static StudioGame[] method4318() { + return new StudioGame[]{StudioGame.stellardawn, StudioGame.game5, StudioGame.game3, StudioGame.oldscape, StudioGame.runescape, StudioGame.game4}; + } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 2ac964a5af..186a26315b 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("bs") +@ObfuscatedName("ax") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("dimensions") int dimensions; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("entries") int entries; @ObfuscatedName("v") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("y") - int[] field482; @ObfuscatedName("j") - float[][] field479; - @ObfuscatedName("o") + int[] field263; + @ObfuscatedName("l") + float[][] field262; + @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); + this.dimensions = VorbisSample.readBits(16); + this.entries = VorbisSample.readBits(24); + this.lengthMap = new int[this.entries]; + boolean var1 = VorbisSample.readBit() != 0; int var2; int var3; int var5; - if (var1) { // L: 46 - var2 = 0; // L: 47 + if (var1) { + var2 = 0; - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52 - int var4 = VorbisSample.readBits(class5.iLog(this.entries - var2)); // L: 50 + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { + int var4 = VorbisSample.readBits(ItemLayer.iLog(this.entries - var2)); - for (var5 = 0; var5 < var4; ++var5) { // L: 51 + for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; // L: 56 + boolean var14 = VorbisSample.readBit() != 0; - for (var3 = 0; var3 < this.entries; ++var3) { // L: 57 - if (var14 && VorbisSample.readBit() == 0) { // L: 58 + for (var3 = 0; var3 < this.entries; ++var3) { + if (var14 && VorbisSample.readBit() == 0) { this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59 + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; } } } - this.method1112(); // 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.method735(); + var2 = VorbisSample.readBits(4); + if (var2 > 0) { + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); + var5 = VorbisSample.readBits(4) + 1; + boolean var6 = VorbisSample.readBit() != 0; int var7; - if (var2 == 1) { // L: 70 + if (var2 == 1) { var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; // L: 71 + var7 = this.entries * this.dimensions; } - this.field482 = new int[var7]; // L: 72 + this.field263 = new int[var7]; int var8; - for (var8 = 0; var8 < var7; ++var8) { // L: 73 - this.field482[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { + this.field263[var8] = VorbisSample.readBits(var5); } - this.field479 = new float[this.entries][this.dimensions]; // L: 74 + this.field262 = new float[this.entries][this.dimensions]; 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) { + for (var8 = 0; var8 < this.entries; ++var8) { + var9 = 0.0F; + var10 = 1; - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79 - int var12 = var8 / var10 % var7; // L: 80 - float var13 = (float)this.field482[var12] * var16 + var15 + var9; // L: 81 - this.field479[var8][var11] = var13; // L: 82 - if (var6) { // L: 83 + for (var11 = 0; var11 < this.dimensions; ++var11) { + int var12 = var8 / var10 % var7; + float var13 = (float)this.field263[var12] * var16 + var15 + var9; + this.field262[var8][var11] = var13; + if (var6) { var9 = var13; } - var10 *= var7; // L: 84 + var10 *= var7; } } } 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) { + var9 = 0.0F; + var10 = var8 * this.dimensions; - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 - float var17 = (float)this.field482[var10] * var16 + var15 + var9; // L: 93 - this.field479[var8][var11] = var17; // L: 94 - if (var6) { // L: 95 + for (var11 = 0; var11 < this.dimensions; ++var11) { + float var17 = (float)this.field263[var10] * var16 + var15 + var9; + this.field262[var8][var11] = var17; + if (var6) { var9 = var17; } - ++var10; // L: 96 + ++var10; } } } } - } // L: 101 + } - @ObfuscatedName("e") - void method1112() { - int[] var1 = new int[this.entries]; // L: 104 - int[] var2 = new int[33]; // L: 106 + @ObfuscatedName("t") + void method735() { + int[] var1 = new int[this.entries]; + int[] var2 = new int[33]; int var3; int var4; @@ -126,132 +126,132 @@ 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) { + var4 = this.lengthMap[var3]; + if (var4 != 0) { + var5 = 1 << 32 - var4; + var6 = var2[var4]; + var1[var3] = var6; int var12; - if ((var6 & var5) != 0) { // L: 114 - var7 = var2[var4 - 1]; // L: 115 + if ((var6 & var5) != 0) { + var7 = var2[var4 - 1]; } else { - var7 = var6 | var5; // L: 118 + var7 = var6 | var5; - 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) { + var12 = var2[var8]; + if (var12 != var6) { 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; + if ((var12 & var10) != 0) { + var2[var8] = var2[var8 - 1]; + break; } - var2[var8] = var12 | var10; // L: 128 + var2[var8] = var12 | var10; } } - var2[var4] = var7; // L: 134 + var2[var4] = var7; - 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) { + var12 = var2[var8]; + if (var12 == var6) { var2[var8] = var7; } } } } - this.keys = new int[8]; // L: 141 - int var11 = 0; // L: 142 + this.keys = new int[8]; + int var11 = 0; - for (var3 = 0; var3 < this.entries; ++var3) { // L: 143 - var4 = this.lengthMap[var3]; // L: 144 - if (var4 != 0) { // L: 145 - var5 = var1[var3]; // L: 146 - var6 = 0; // L: 147 + for (var3 = 0; var3 < this.entries; ++var3) { + var4 = this.lengthMap[var3]; + if (var4 != 0) { + var5 = var1[var3]; + var6 = 0; - for (var7 = 0; var7 < var4; ++var7) { // L: 148 - var8 = Integer.MIN_VALUE >>> var7; // L: 149 - if ((var5 & var8) != 0) { // L: 150 - if (this.keys[var6] == 0) { // L: 151 + for (var7 = 0; var7 < var4; ++var7) { + var8 = Integer.MIN_VALUE >>> var7; + if ((var5 & var8) != 0) { + if (this.keys[var6] == 0) { this.keys[var6] = var11; } - var6 = this.keys[var6]; // L: 152 + var6 = this.keys[var6]; } else { - ++var6; // L: 155 + ++var6; } - if (var6 >= this.keys.length) { // L: 157 - int[] var9 = new int[this.keys.length * 2]; // L: 158 + if (var6 >= this.keys.length) { + int[] var9 = new int[this.keys.length * 2]; - for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159 + for (var10 = 0; var10 < this.keys.length; ++var10) { var9[var10] = this.keys[var10]; } - this.keys = var9; // L: 160 + this.keys = var9; } - var8 >>>= 1; // L: 162 + var8 >>>= 1; } - this.keys[var6] = ~var3; // L: 164 - if (var6 >= var11) { // L: 165 + this.keys[var6] = ~var3; + if (var6 >= var11) { var11 = var6 + 1; } } } - } // L: 167 + } @ObfuscatedName("v") - int method1111() { + int method736() { 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) { } - return ~this.keys[var1]; // L: 172 + return ~this.keys[var1]; } - @ObfuscatedName("y") - float[] method1113() { - return this.field479[this.method1111()]; // L: 176 + @ObfuscatedName("j") + float[] method744() { + return this.field262[this.method736()]; } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 + int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; while (true) { - int var4 = var2; // L: 19 - int var5 = var1; // L: 20 + int var4 = var2; + int var5 = var1; int var6; - for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26 - if ((var5 & 1) != 0) { // L: 24 + for (var6 = 1; var5 > 1; var5 >>= 1) { + if ((var5 & 1) != 0) { var6 *= var4; } - var4 *= var4; // L: 25 + var4 *= var4; } int var3; - if (var5 == 1) { // L: 28 - var3 = var6 * var4; // L: 29 + if (var5 == 1) { + var3 = var4 * var6; } else { - var3 = var6; // L: 32 + var3 = var6; } - if (var3 <= var0) { // L: 34 - return var2; // L: 37 + if (var3 <= var0) { + return var2; } - --var2; // L: 35 + --var2; } } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index c3ffe1487b..c119057a71 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,321 +2,321 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("af") +@ObfuscatedName("d") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("f") - static final int[] field390; - @ObfuscatedName("e") + @ObfuscatedName("s") + static final int[] field172; + @ObfuscatedName("t") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("d") - static int[] field384; - @ObfuscatedName("z") - static int[] field394; - @ObfuscatedName("b") - static boolean[] field393; + @ObfuscatedName("x") + static int[] field177; + @ObfuscatedName("r") + static int[] field176; + @ObfuscatedName("p") + static boolean[] field170; @ObfuscatedName("v") - int[] field386; - @ObfuscatedName("y") + int[] field178; + @ObfuscatedName("j") @Export("multiplier") int multiplier; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("subclassBooks") int[][] subclassBooks; static { - field390 = 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 + field172 = new int[]{256, 128, 86, 64}; + VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } VorbisFloor() { - int var1 = VorbisSample.readBits(16); // L: 108 - if (var1 != 1) { // L: 109 - throw new RuntimeException(); // L: 110 + int var1 = VorbisSample.readBits(16); + if (var1 != 1) { + throw new RuntimeException(); } else { - int var2 = VorbisSample.readBits(5); // L: 112 - int var3 = 0; // L: 113 - this.partitionClassList = new int[var2]; // L: 114 + int var2 = VorbisSample.readBits(5); + int var3 = 0; + this.partitionClassList = new int[var2]; int var4; int var5; - for (var4 = 0; var4 < var2; ++var4) { // L: 115 - var5 = VorbisSample.readBits(4); // L: 116 - this.partitionClassList[var4] = var5; // L: 117 - if (var5 >= var3) { // L: 118 + for (var4 = 0; var4 < var2; ++var4) { + var5 = VorbisSample.readBits(4); + this.partitionClassList[var4] = var5; + if (var5 >= var3) { var3 = var5 + 1; } } - this.classDimensions = new int[var3]; // L: 120 - this.classSubClasses = new int[var3]; // L: 121 - this.classMasterbooks = new int[var3]; // L: 122 - this.subclassBooks = new int[var3][]; // L: 123 + this.classDimensions = new int[var3]; + this.classSubClasses = new int[var3]; + this.classMasterbooks = new int[var3]; + this.subclassBooks = new int[var3][]; int var7; - for (var4 = 0; var4 < var3; ++var4) { // L: 124 - this.classDimensions[var4] = VorbisSample.readBits(3) + 1; // L: 125 - var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); // L: 126 - if (var5 != 0) { // L: 127 + for (var4 = 0; var4 < var3; ++var4) { + this.classDimensions[var4] = VorbisSample.readBits(3) + 1; + var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); + if (var5 != 0) { this.classMasterbooks[var4] = VorbisSample.readBits(8); } - var5 = 1 << var5; // L: 128 - int[] var9 = new int[var5]; // L: 129 - this.subclassBooks[var4] = var9; // L: 130 + var5 = 1 << var5; + int[] var9 = new int[var5]; + this.subclassBooks[var4] = var9; - for (var7 = 0; var7 < var5; ++var7) { // L: 131 + for (var7 = 0; var7 < var5; ++var7) { var9[var7] = VorbisSample.readBits(8) - 1; } } - this.multiplier = VorbisSample.readBits(2) + 1; // L: 133 - var4 = VorbisSample.readBits(4); // L: 134 - var5 = 2; // L: 135 + this.multiplier = VorbisSample.readBits(2) + 1; + var4 = VorbisSample.readBits(4); + var5 = 2; int var6; - for (var6 = 0; var6 < var2; ++var6) { // L: 136 + for (var6 = 0; var6 < var2; ++var6) { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field386 = new int[var5]; // L: 137 - this.field386[0] = 0; // L: 138 - this.field386[1] = 1 << var4; // L: 139 - var5 = 2; // L: 140 + this.field178 = new int[var5]; + this.field178[0] = 0; + this.field178[1] = 1 << var4; + var5 = 2; - for (var6 = 0; var6 < var2; ++var6) { // L: 141 - var7 = this.partitionClassList[var6]; // L: 142 + for (var6 = 0; var6 < var2; ++var6) { + var7 = this.partitionClassList[var6]; - for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 - this.field386[var5++] = VorbisSample.readBits(var4); + for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { + this.field178[var5++] = VorbisSample.readBits(var4); } } - if (field384 == null || field384.length < var5) { // L: 145 - field384 = new int[var5]; // L: 146 - field394 = new int[var5]; // L: 147 - field393 = new boolean[var5]; // L: 148 + if (field177 == null || field177.length < var5) { + field177 = new int[var5]; + field176 = new int[var5]; + field170 = new boolean[var5]; } } - } // L: 150 - - @ObfuscatedName("v") - int method811(int var1, int var2, int var3, int var4, int var5) { - int var6 = var4 - var2; // L: 50 - int var7 = var3 - var1; // L: 51 - int var8 = var6 < 0 ? -var6 : var6; // L: 52 - int var9 = (var5 - var1) * var8; // L: 53 - int var10 = var9 / var7; // L: 54 - return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("y") - void method812(int var1, int var2, int var3, int var4, float[] var5, int var6) { - int var7 = var4 - var2; // L: 59 - int var8 = var3 - var1; // L: 60 - int var9 = var7 < 0 ? -var7 : var7; // L: 61 - int var10 = var7 / var8; // L: 62 - int var11 = var2; // L: 63 - int var12 = 0; // L: 64 - int var13 = var7 < 0 ? var10 - 1 : var10 + 1; // L: 65 - var9 -= (var10 < 0 ? -var10 : var10) * var8; // L: 66 - var5[var1] *= VorbisFloor_decibelStatics[var2]; // L: 67 - if (var3 > var6) { // L: 68 + @ObfuscatedName("v") + int method425(int var1, int var2, int var3, int var4, int var5) { + int var6 = var4 - var2; + int var7 = var3 - var1; + int var8 = var6 < 0 ? -var6 : var6; + int var9 = (var5 - var1) * var8; + int var10 = var9 / var7; + return var6 < 0 ? var2 - var10 : var10 + var2; + } + + @ObfuscatedName("j") + void method426(int var1, int var2, int var3, int var4, float[] var5, int var6) { + int var7 = var4 - var2; + int var8 = var3 - var1; + int var9 = var7 < 0 ? -var7 : var7; + int var10 = var7 / var8; + int var11 = var2; + int var12 = 0; + int var13 = var7 < 0 ? var10 - 1 : var10 + 1; + var9 -= (var10 < 0 ? -var10 : var10) * var8; + var5[var1] *= VorbisFloor_decibelStatics[var2]; + if (var3 > var6) { var3 = var6; } - for (int var14 = var1 + 1; var14 < var3; ++var14) { // L: 69 - var12 += var9; // L: 70 - if (var12 >= var8) { // L: 71 - var12 -= var8; // L: 72 - var11 += var13; // L: 73 + for (int var14 = var1 + 1; var14 < var3; ++var14) { + var12 += var9; + if (var12 >= var8) { + var12 -= var8; + var11 += var13; } else { - var11 += var10; // L: 76 + var11 += var10; } - var5[var14] *= VorbisFloor_decibelStatics[var11]; // L: 78 + var5[var14] *= VorbisFloor_decibelStatics[var11]; } - } // L: 80 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { - if (var1 < var2) { // L: 83 - int var3 = var1; // L: 84 - int var4 = field384[var1]; // L: 85 - int var5 = field394[var1]; // L: 86 - boolean var6 = field393[var1]; // L: 87 + if (var1 < var2) { + int var3 = var1; + int var4 = field177[var1]; + int var5 = field176[var1]; + boolean var6 = field170[var1]; - for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field384[var7]; // L: 89 - if (var8 < var4) { // L: 90 - field384[var3] = var8; // L: 91 - field394[var3] = field394[var7]; // L: 92 - field393[var3] = field393[var7]; // L: 93 - ++var3; // L: 94 - field384[var7] = field384[var3]; // L: 95 - field394[var7] = field394[var3]; // L: 96 - field393[var7] = field393[var3]; // L: 97 + for (int var7 = var1 + 1; var7 <= var2; ++var7) { + int var8 = field177[var7]; + if (var8 < var4) { + field177[var3] = var8; + field176[var3] = field176[var7]; + field170[var3] = field170[var7]; + ++var3; + field177[var7] = field177[var3]; + field176[var7] = field176[var3]; + field170[var7] = field170[var3]; } } - field384[var3] = var4; // L: 100 - field394[var3] = var5; // L: 101 - field393[var3] = var6; // L: 102 - this.VarbisFloor_sort(var1, var3 - 1); // L: 103 - this.VarbisFloor_sort(var3 + 1, var2); // L: 104 - } - } // L: 105 - - @ObfuscatedName("o") - @Export("readSubmapFloor") - boolean readSubmapFloor() { - boolean var1 = VorbisSample.readBit() != 0; // L: 153 - if (!var1) { // L: 154 - return false; - } else { - int var2 = this.field386.length; // L: 155 - - int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field384[var3] = this.field386[var3]; - } - - var3 = field390[this.multiplier - 1]; // L: 157 - int var4 = class5.iLog(var3 - 1); // L: 158 - field394[0] = VorbisSample.readBits(var4); // L: 159 - field394[1] = VorbisSample.readBits(var4); // L: 160 - int var5 = 2; // L: 161 - - for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 - int var7 = this.partitionClassList[var6]; // L: 163 - int var8 = this.classDimensions[var7]; // L: 164 - int var9 = this.classSubClasses[var7]; // L: 165 - int var10 = (1 << var9) - 1; // L: 166 - int var11 = 0; // L: 167 - if (var9 > 0) { // L: 168 - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1111(); - } - - for (int var12 = 0; var12 < var8; ++var12) { // L: 169 - int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 - var11 >>>= var9; // L: 171 - field394[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1111() : 0; // L: 172 - } - } - - return true; // L: 175 + field177[var3] = var4; + field176[var3] = var5; + field170[var3] = var6; + this.VarbisFloor_sort(var1, var3 - 1); + this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("m") - void method815(float[] var1, int var2) { - int var3 = this.field386.length; // L: 179 - int var4 = field390[this.multiplier - 1]; // L: 180 - boolean[] var5 = field393; // L: 181 - field393[1] = true; // L: 182 - var5[0] = true; // L: 183 + @ObfuscatedName("n") + @Export("readSubmapFloor") + boolean readSubmapFloor() { + boolean var1 = VorbisSample.readBit() != 0; + if (!var1) { + return false; + } else { + int var2 = this.field178.length; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + field177[var3] = this.field178[var3]; + } + + var3 = field172[this.multiplier - 1]; + int var4 = ItemLayer.iLog(var3 - 1); + field176[0] = VorbisSample.readBits(var4); + field176[1] = VorbisSample.readBits(var4); + int var5 = 2; + + for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { + int var7 = this.partitionClassList[var6]; + int var8 = this.classDimensions[var7]; + int var9 = this.classSubClasses[var7]; + int var10 = (1 << var9) - 1; + int var11 = 0; + if (var9 > 0) { + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method736(); + } + + for (int var12 = 0; var12 < var8; ++var12) { + int var13 = this.subclassBooks[var7][var11 & var10]; + var11 >>>= var9; + field176[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method736() : 0; + } + } + + return true; + } + } + + @ObfuscatedName("w") + void method429(float[] var1, int var2) { + int var3 = this.field178.length; + int var4 = field172[this.multiplier - 1]; + boolean[] var5 = field170; + field170[1] = true; + var5[0] = true; int var6; int var7; int var8; int var9; int var10; - for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method834(field384, var6); // L: 185 - var8 = method809(field384, var6); // L: 186 - var9 = this.method811(field384[var7], field394[var7], field384[var8], field394[var8], field384[var6]); // L: 187 - var10 = field394[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 = field393; // L: 193 - field393[var8] = true; // L: 195 - var14[var7] = true; // L: 196 - field393[var6] = true; // L: 197 - if (var10 >= var13) { // L: 198 - field394[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + for (var6 = 2; var6 < var3; ++var6) { + var7 = method441(field177, var6); + var8 = method424(field177, var6); + var9 = this.method425(field177[var7], field176[var7], field177[var8], field176[var8], field177[var6]); + var10 = field176[var6]; + int var11 = var4 - var9; + int var13 = (var11 < var9 ? var11 : var9) << 1; + if (var10 != 0) { + boolean[] var14 = field170; + field170[var8] = true; + var14[var7] = true; + field170[var6] = true; + if (var10 >= var13) { + field176[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field394[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field176[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field393[var6] = false; // L: 206 - field394[var6] = var9; // L: 207 + field170[var6] = false; + field176[var6] = var9; } } - this.VarbisFloor_sort(0, var3 - 1); // L: 210 - var6 = 0; // L: 211 - var7 = field394[0] * this.multiplier; // L: 212 + this.VarbisFloor_sort(0, var3 - 1); + var6 = 0; + var7 = field176[0] * this.multiplier; - for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field393[var8]) { // L: 214 - var9 = field384[var8]; // L: 215 - var10 = field394[var8] * this.multiplier; // L: 216 - this.method812(var6, var7, var9, var10, var1, var2); // L: 217 - if (var9 >= var2) { // L: 218 + for (var8 = 1; var8 < var3; ++var8) { + if (field170[var8]) { + var9 = field177[var8]; + var10 = field176[var8] * this.multiplier; + this.method426(var6, var7, var9, var10, var1, var2); + if (var9 >= var2) { return; } - var6 = var9; // L: 219 - var7 = var10; // L: 220 + var6 = var9; + var7 = var10; } } - float var16 = VorbisFloor_decibelStatics[var7]; // L: 223 + float var16 = VorbisFloor_decibelStatics[var7]; - for (var9 = var6; var9 < var2; ++var9) { // L: 224 + for (var9 = var6; var9 < var2; ++var9) { var1[var9] *= var16; } - } // L: 225 - - @ObfuscatedName("f") - static int method834(int[] var0, int var1) { - int var2 = var0[var1]; // L: 22 - int var3 = -1; // L: 23 - int var4 = Integer.MIN_VALUE; // L: 24 - - for (int var5 = 0; var5 < var1; ++var5) { // L: 25 - int var6 = var0[var5]; // L: 26 - if (var6 < var2 && var6 > var4) { // L: 27 - var3 = var5; // L: 28 - var4 = var6; // L: 29 - } - } - - return var3; // L: 32 } - @ObfuscatedName("e") - static int method809(int[] var0, int var1) { - int var2 = var0[var1]; // L: 36 - int var3 = -1; // L: 37 - int var4 = Integer.MAX_VALUE; // L: 38 + @ObfuscatedName("s") + static int method441(int[] var0, int var1) { + int var2 = var0[var1]; + int var3 = -1; + int var4 = Integer.MIN_VALUE; - for (int var5 = 0; var5 < var1; ++var5) { // L: 39 - int var6 = var0[var5]; // L: 40 - if (var6 > var2 && var6 < var4) { // L: 41 - var3 = var5; // L: 42 - var4 = var6; // L: 43 + for (int var5 = 0; var5 < var1; ++var5) { + int var6 = var0[var5]; + if (var6 < var2 && var6 > var4) { + var3 = var5; + var4 = var6; } } - return var3; // L: 46 + return var3; + } + + @ObfuscatedName("t") + static int method424(int[] var0, int var1) { + int var2 = var0[var1]; + int var3 = -1; + int var4 = Integer.MAX_VALUE; + + for (int var5 = 0; var5 < var1; ++var5) { + int var6 = var0[var5]; + if (var6 > var2 && var6 < var4) { + var3 = var5; + var4 = var6; + } + } + + return var3; } } diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index 60b3fa44a4..bee5f2b59d 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,42 +2,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("be") +@ObfuscatedName("aa") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("submaps") int submaps; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("mappingMux") int mappingMux; @ObfuscatedName("v") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("submapResidue") int[] submapResidue; VorbisMapping() { - VorbisSample.readBits(16); // L: 12 - this.submaps = VorbisSample.readBit() != 0 ? VorbisSample.readBits(4) + 1 : 1; // L: 13 - if (VorbisSample.readBit() != 0) { // L: 14 - VorbisSample.readBits(8); // L: 15 + VorbisSample.readBits(16); + this.submaps = VorbisSample.readBit() != 0 ? VorbisSample.readBits(4) + 1 : 1; + if (VorbisSample.readBit() != 0) { + VorbisSample.readBits(8); } - VorbisSample.readBits(2); // L: 18 - if (this.submaps > 1) { // L: 19 - this.mappingMux = VorbisSample.readBits(4); // L: 20 + VorbisSample.readBits(2); + if (this.submaps > 1) { + this.mappingMux = VorbisSample.readBits(4); } - this.submapFloor = new int[this.submaps]; // L: 22 - this.submapResidue = new int[this.submaps]; // L: 23 + this.submapFloor = new int[this.submaps]; + this.submapResidue = new int[this.submaps]; - for (int var1 = 0; var1 < this.submaps; ++var1) { // L: 24 - VorbisSample.readBits(8); // L: 25 - this.submapFloor[var1] = VorbisSample.readBits(8); // L: 26 - this.submapResidue[var1] = VorbisSample.readBits(8); // L: 27 + for (int var1 = 0; var1 < this.submaps; ++var1) { + VorbisSample.readBits(8); + this.submapFloor[var1] = VorbisSample.readBits(8); + this.submapResidue[var1] = VorbisSample.readBits(8); } - } // L: 29 + } } diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 77407c456e..d1c28abe4e 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,124 +2,124 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bb") +@ObfuscatedName("am") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("residueType") int residueType; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("begin") int begin; @ObfuscatedName("v") @Export("end") int end; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("partitionSize") int partitionSize; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("classifications") int classifications; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("classbook") int classbook; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("cascade") int[] cascade; VorbisResidue() { - this.residueType = VorbisSample.readBits(16); // L: 15 - this.begin = VorbisSample.readBits(24); // L: 16 - this.end = VorbisSample.readBits(24); // L: 17 - this.partitionSize = VorbisSample.readBits(24) + 1; // L: 18 - this.classifications = VorbisSample.readBits(6) + 1; // L: 19 - this.classbook = VorbisSample.readBits(8); // L: 20 - int[] var1 = new int[this.classifications]; // L: 21 + this.residueType = VorbisSample.readBits(16); + this.begin = VorbisSample.readBits(24); + this.end = VorbisSample.readBits(24); + this.partitionSize = VorbisSample.readBits(24) + 1; + this.classifications = VorbisSample.readBits(6) + 1; + this.classbook = VorbisSample.readBits(8); + int[] var1 = new int[this.classifications]; int var2; - for (var2 = 0; var2 < this.classifications; ++var2) { // L: 22 - int var3 = 0; // L: 23 - int var4 = VorbisSample.readBits(3); // L: 24 - boolean var5 = VorbisSample.readBit() != 0; // L: 25 - if (var5) { // L: 26 + for (var2 = 0; var2 < this.classifications; ++var2) { + int var3 = 0; + int var4 = VorbisSample.readBits(3); + boolean var5 = VorbisSample.readBit() != 0; + if (var5) { var3 = VorbisSample.readBits(5); } - var1[var2] = var3 << 3 | var4; // L: 27 + var1[var2] = var3 << 3 | var4; } - this.cascade = new int[this.classifications * 8]; // L: 29 + this.cascade = new int[this.classifications * 8]; - for (var2 = 0; var2 < this.classifications * 8; ++var2) { // L: 30 + for (var2 = 0; var2 < this.classifications * 8; ++var2) { this.cascade[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0 ? VorbisSample.readBits(8) : -1; } - } // L: 31 + } - @ObfuscatedName("f") - void method934(float[] var1, int var2, boolean var3) { + @ObfuscatedName("s") + void method544(float[] var1, int var2, boolean var3) { int var4; - for (var4 = 0; var4 < var2; ++var4) { // L: 34 + for (var4 = 0; var4 < var2; ++var4) { var1[var4] = 0.0F; } - if (!var3) { // L: 35 - var4 = VorbisSample.VorbisSample_codebooks[this.classbook].dimensions; // L: 36 - int var5 = this.end - this.begin; // L: 37 - int var6 = var5 / this.partitionSize; // L: 38 - int[] var7 = new int[var6]; // L: 39 + if (!var3) { + var4 = VorbisSample.VorbisSample_codebooks[this.classbook].dimensions; + int var5 = this.end - this.begin; + int var6 = var5 / this.partitionSize; + int[] var7 = new int[var6]; - for (int var8 = 0; var8 < 8; ++var8) { // L: 40 - int var9 = 0; // L: 41 + for (int var8 = 0; var8 < 8; ++var8) { + int var9 = 0; - while (var9 < var6) { // L: 42 + while (var9 < var6) { int var10; int var11; - if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1111(); // L: 45 + if (var8 == 0) { + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method736(); - for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 - if (var9 + var11 < var6) { // L: 47 + for (var11 = var4 - 1; var11 >= 0; --var11) { + if (var9 + var11 < var6) { var7[var9 + var11] = var10 % this.classifications; } - var10 /= this.classifications; // L: 48 + var10 /= this.classifications; } } - for (var10 = 0; var10 < var4; ++var10) { // L: 52 - var11 = var7[var9]; // L: 54 - int var12 = this.cascade[var8 + var11 * 8]; // L: 55 - if (var12 >= 0) { // L: 56 - int var13 = var9 * this.partitionSize + this.begin; // L: 57 - VorbisCodebook var14 = VorbisSample.VorbisSample_codebooks[var12]; // L: 58 + for (var10 = 0; var10 < var4; ++var10) { + var11 = var7[var9]; + int var12 = this.cascade[var8 + var11 * 8]; + if (var12 >= 0) { + int var13 = var9 * this.partitionSize + this.begin; + VorbisCodebook var14 = VorbisSample.VorbisSample_codebooks[var12]; int var15; - if (this.residueType == 0) { // L: 59 - var15 = this.partitionSize / var14.dimensions; // L: 60 + if (this.residueType == 0) { + var15 = this.partitionSize / var14.dimensions; - for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method1113(); // L: 62 + for (int var19 = 0; var19 < var15; ++var19) { + float[] var20 = var14.method744(); - for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 + for (int var18 = 0; var18 < var14.dimensions; ++var18) { var1[var13 + var19 + var18 * var15] += var20[var18]; } } } else { - var15 = 0; // L: 67 + var15 = 0; - while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method1113(); // L: 69 + while (var15 < this.partitionSize) { + float[] var16 = var14.method744(); - for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 - var1[var13 + var15] += var16[var17]; // L: 71 - ++var15; // L: 72 + for (int var17 = 0; var17 < var14.dimensions; ++var17) { + var1[var13 + var15] += var16[var17]; + ++var15; } } } } - ++var9; // L: 78 - if (var9 >= var6) { // L: 79 + ++var9; + if (var9 >= var6) { break; } } @@ -127,5 +127,5 @@ public class VorbisResidue { } } - } // L: 83 + } } diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index 09e7ac2f58..de1111d495 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,645 +3,645 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("au") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lbs;" + descriptor = "[Lax;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Laf;" + descriptor = "[Ld;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lbb;" + descriptor = "[Lam;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lbe;" + descriptor = "[Laa;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("u") - static boolean field502; - @ObfuscatedName("n") - static float[] field507; - @ObfuscatedName("l") - static float[] field495; - @ObfuscatedName("w") - static float[] field509; - @ObfuscatedName("a") - static float[] field510; - @ObfuscatedName("aw") - static float[] field511; - @ObfuscatedName("ak") - static float[] field518; - @ObfuscatedName("ad") - static float[] field513; - @ObfuscatedName("at") - static int[] field514; - @ObfuscatedName("ah") - static int[] field515; - @ObfuscatedName("f") - byte[][] field504; @ObfuscatedName("e") + static boolean field264; + @ObfuscatedName("z") + static float[] field286; + @ObfuscatedName("d") + static float[] field294; + @ObfuscatedName("y") + static float[] field288; + @ObfuscatedName("g") + static float[] field289; + @ObfuscatedName("ae") + static float[] field290; + @ObfuscatedName("an") + static float[] field291; + @ObfuscatedName("am") + static float[] field277; + @ObfuscatedName("al") + static int[] field266; + @ObfuscatedName("aq") + static int[] field267; + @ObfuscatedName("s") + byte[][] field285; + @ObfuscatedName("t") @Export("sampleRate") int sampleRate; @ObfuscatedName("v") @Export("sampleCount") int sampleCount; - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("start") int start; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("o") - boolean field501; - @ObfuscatedName("q") - float[] field503; - @ObfuscatedName("s") - int field508; - @ObfuscatedName("p") - int field490; + @ObfuscatedName("n") + boolean field270; @ObfuscatedName("c") - boolean field487; - @ObfuscatedName("az") + float[] field282; + @ObfuscatedName("i") + int field283; + @ObfuscatedName("m") + int field284; + @ObfuscatedName("b") + boolean field292; + @ObfuscatedName("aa") @Export("samples") byte[] samples; - @ObfuscatedName("ap") - int field517; - @ObfuscatedName("ag") - int field505; + @ObfuscatedName("ab") + int field296; + @ObfuscatedName("ax") + int field297; static { - field502 = false; // L: 28 + field264 = false; } VorbisSample(byte[] var1) { - this.read(var1); // L: 401 - } // L: 402 + this.read(var1); + } - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("read") void read(byte[] var1) { - Buffer var2 = new Buffer(var1); // L: 89 - this.sampleRate = var2.readInt(); // L: 90 - this.sampleCount = var2.readInt(); // L: 91 - this.start = var2.readInt(); // L: 92 - this.end = var2.readInt(); // L: 93 - if (this.end < 0) { // L: 94 - this.end = ~this.end; // L: 95 - this.field501 = true; // L: 96 + Buffer var2 = new Buffer(var1); + this.sampleRate = var2.readInt(); + this.sampleCount = var2.readInt(); + this.start = var2.readInt(); + this.end = var2.readInt(); + if (this.end < 0) { + this.end = ~this.end; + this.field270 = true; } - int var3 = var2.readInt(); // L: 98 - this.field504 = new byte[var3][]; // L: 99 + int var3 = var2.readInt(); + this.field285 = new byte[var3][]; - for (int var4 = 0; var4 < var3; ++var4) { // L: 100 - int var5 = 0; // L: 101 + for (int var4 = 0; var4 < var3; ++var4) { + int var5 = 0; int var6; do { - var6 = var2.readUnsignedByte(); // L: 103 - var5 += var6; // L: 104 - } while(var6 >= 255); // L: 105 + var6 = var2.readUnsignedByte(); + var5 += var6; + } while(var6 >= 255); - byte[] var7 = new byte[var5]; // L: 107 - var2.readBytes(var7, 0, var5); // L: 108 - this.field504[var4] = var7; // L: 109 + byte[] var7 = new byte[var5]; + var2.readBytes(var7, 0, var5); + this.field285[var4] = var7; } - } // L: 111 + } - @ObfuscatedName("m") - float[] method1148(int var1) { - VorbisSample_setData(this.field504[var1], 0); // L: 182 - readBit(); // L: 183 - int var2 = readBits(class5.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("w") + float[] method755(int var1) { + VorbisSample_setData(this.field285[var1], 0); + readBit(); + int var2 = readBits(ItemLayer.iLog(VorbisSample_mapping.length - 1)); + boolean var3 = VorbisSample_blockFlags[var2]; + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; + boolean var5 = false; + boolean var6 = false; + if (var3) { + var5 = readBit() != 0; + var6 = readBit() != 0; } - int var7 = var4 >> 1; // L: 193 + int var7 = var4 >> 1; 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) { + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); + var10 = VorbisSample_blockSize0 >> 1; } else { - var8 = 0; // L: 203 - var9 = var7; // L: 204 - var10 = var4 >> 1; // L: 205 + var8 = 0; + var9 = var7; + var10 = var4 >> 1; } 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) { + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); + var13 = VorbisSample_blockSize0 >> 1; } else { - var11 = var7; // L: 216 - var12 = var4; // L: 217 - var13 = var4 >> 1; // L: 218 + var11 = var7; + var12 = var4; + var13 = var4 >> 1; } - 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]]; + int var16 = var14.mappingMux; + int var17 = var14.submapFloor[var16]; + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); + boolean var45 = var15; - for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228 - VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229 - float[] var44 = field507; // L: 230 - var42.method934(var44, var4 >> 1, var45); // L: 231 + for (var17 = 0; var17 < var14.submaps; ++var17) { + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; + float[] var44 = field286; + var42.method544(var44, var4 >> 1, var45); } int var18; - if (!var15) { // L: 234 - var17 = var14.mappingMux; // L: 235 - var18 = var14.submapFloor[var17]; // L: 236 - VorbisSample_floors[var18].method815(field507, var4 >> 1); // L: 237 + if (!var15) { + var17 = var14.mappingMux; + var18 = var14.submapFloor[var17]; + VorbisSample_floors[var18].method429(field286, var4 >> 1); } int var19; - if (var15) { // L: 240 - for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 - field507[var17] = 0.0F; + if (var15) { + for (var17 = var4 >> 1; var17 < var4; ++var17) { + field286[var17] = 0.0F; } } else { - var17 = var4 >> 1; // L: 244 - var18 = var4 >> 2; // L: 245 - var19 = var4 >> 3; // L: 246 - float[] var20 = field507; // L: 247 + var17 = var4 >> 1; + var18 = var4 >> 2; + var19 = var4 >> 3; + float[] var20 = field286; int var21; - for (var21 = 0; var21 < var17; ++var21) { // L: 248 + for (var21 = 0; var21 < var17; ++var21) { var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { // L: 249 + for (var21 = var17; var21 < var4; ++var21) { var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field511 : field495; // L: 250 - float[] var22 = var3 ? field518 : field509; // L: 251 - float[] var23 = var3 ? field513 : field510; // L: 252 - int[] var24 = var3 ? field515 : field514; // L: 253 + float[] var40 = var3 ? field290 : field294; + float[] var22 = var3 ? field291 : field288; + float[] var23 = var3 ? field277 : field289; + int[] var24 = var3 ? field267 : field266; 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) { + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; + var28 = var40[var25 * 2]; + var29 = var40[var25 * 2 + 1]; + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; } 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) { + var26 = var20[var17 + var25 * 4 + 3]; + var27 = var20[var17 + var25 * 4 + 1]; + var28 = var20[var25 * 4 + 3]; + var29 = var20[var25 * 4 + 1]; + var20[var17 + var25 * 4 + 3] = var26 + var28; + var20[var17 + var25 * 4 + 1] = var27 + var29; + var30 = var40[var17 - 4 - var25 * 4]; + var31 = var40[var17 - 3 - var25 * 4]; + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = class5.iLog(var4 - 1); // L: 274 + var25 = ItemLayer.iLog(var4 - 1); 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) { + var47 = var4 >> var46 + 2; + var48 = 8 << var46; - 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) { + int var50 = var4 - var47 * var49 * 2; + int var51 = var4 - var47 * (var49 * 2 + 1); - 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) { + int var33 = var32 * 4; + float var34 = var20[var50 - 1 - var33]; + float var35 = var20[var50 - 3 - var33]; + float var36 = var20[var51 - 1 - var33]; + float var37 = var20[var51 - 3 - var33]; + var20[var50 - 1 - var33] = var34 + var36; + var20[var50 - 3 - var33] = var35 + var37; + float var38 = var40[var32 * var48]; + float var39 = var40[var32 * var48 + 1]; + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; } } } - for (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) { + var47 = var24[var46]; + if (var46 < var47) { + var48 = var46 * 8; + var49 = var47 * 8; + var30 = var20[var48 + 1]; + var20[var48 + 1] = var20[var49 + 1]; + var20[var49 + 1] = var30; + var30 = var20[var48 + 3]; + var20[var48 + 3] = var20[var49 + 3]; + var20[var49 + 3] = var30; + var30 = var20[var48 + 5]; + var20[var48 + 5] = var20[var49 + 5]; + var20[var49 + 5] = var30; + var30 = var20[var48 + 7]; + var20[var48 + 7] = var20[var49 + 7]; + var20[var49 + 7] = var30; } } - for (var46 = 0; var46 < var17; ++var46) { // L: 316 + for (var46 = 0; var46 < var17; ++var46) { 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) { + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; } - for (var46 = 0; var46 < var19; ++var46) { // L: 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) { + var27 = var23[var46 * 2]; + var28 = var23[var46 * 2 + 1]; + var29 = var20[var17 + var46 * 2]; + var30 = var20[var17 + var46 * 2 + 1]; + var31 = var20[var4 - 2 - var46 * 2]; + float var52 = var20[var4 - 1 - var46 * 2]; + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; } - for (var46 = 0; var46 < 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) { + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 341 + for (var46 = 0; var46 < var18; ++var46) { var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 342 + for (var46 = 0; var46 < var18; ++var46) { var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 343 + for (var46 = 0; var46 < var18; ++var46) { var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 344 + for (var46 = 0; var46 < var18; ++var46) { 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 = field507; // L: 347 + for (var46 = var8; var46 < var9; ++var46) { + var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); + var10000 = field286; 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 = field507; // L: 351 + for (var46 = var11; var46 < var12; ++var46) { + var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); + var10000 = field286; var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; // L: 354 - if (this.field508 > 0) { // L: 355 - var18 = var4 + this.field508 >> 2; // L: 356 - var41 = new float[var18]; // L: 357 + float[] var41 = null; + if (this.field283 > 0) { + var18 = var4 + this.field283 >> 2; + var41 = new float[var18]; int var43; - if (!this.field487) { // L: 358 - for (var19 = 0; var19 < this.field490; ++var19) { // L: 359 - var43 = var19 + (this.field508 >> 1); // L: 360 - var41[var19] += this.field503[var43]; // L: 361 + if (!this.field292) { + for (var19 = 0; var19 < this.field284; ++var19) { + var43 = var19 + (this.field283 >> 1); + var41[var19] += this.field282[var43]; } } - if (!var15) { // L: 364 - for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365 - var43 = var41.length - (var4 >> 1) + var19; // L: 366 - var41[var43] += field507[var19]; // L: 367 + if (!var15) { + for (var19 = var8; var19 < var4 >> 1; ++var19) { + var43 = var41.length - (var4 >> 1) + var19; + var41[var43] += field286[var19]; } } } - float[] var54 = this.field503; // L: 371 - this.field503 = field507; // L: 372 - field507 = var54; // L: 373 - this.field508 = var4; // L: 374 - this.field490 = var12 - (var4 >> 1); // L: 375 - this.field487 = var15; // L: 376 - return var41; // L: 377 + float[] var54 = this.field282; + this.field282 = field286; + field286 = var54; + this.field283 = var4; + this.field284 = var12 - (var4 >> 1); + this.field292 = var15; + return var41; } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "([I)Lar;" + descriptor = "([I)Lz;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { // L: 405 + if (var1 != null && var1[0] <= 0) { return null; } else { - if (this.samples == null) { // L: 406 - this.field508 = 0; // L: 407 - this.field503 = new float[VorbisSample_blockSize1]; // L: 408 - this.samples = new byte[this.sampleCount]; // L: 409 - this.field517 = 0; // L: 410 - this.field505 = 0; // L: 411 + if (this.samples == null) { + this.field283 = 0; + this.field282 = new float[VorbisSample_blockSize1]; + this.samples = new byte[this.sampleCount]; + this.field296 = 0; + this.field297 = 0; } - for (; this.field505 < this.field504.length; ++this.field505) { // L: 413 428 - if (var1 != null && var1[0] <= 0) { // L: 414 + for (; this.field297 < this.field285.length; ++this.field297) { + if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method1148(this.field505); // L: 415 - if (var2 != null) { // L: 416 - int var3 = this.field517; // L: 417 - int var4 = var2.length; // L: 418 - if (var4 > this.sampleCount - var3) { // L: 419 + float[] var2 = this.method755(this.field297); + if (var2 != null) { + int var3 = this.field296; + int var4 = var2.length; + if (var4 > this.sampleCount - var3) { 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) { + int var6 = (int)(128.0F + var2[var5] * 128.0F); + if ((var6 & -256) != 0) { var6 = ~var6 >> 31; } - this.samples[var3++] = (byte)(var6 - 128); // L: 423 + this.samples[var3++] = (byte)(var6 - 128); } - if (var1 != null) { // L: 425 - var1[0] -= var3 - this.field517; + if (var1 != null) { + var1[0] -= var3 - this.field296; } - this.field517 = var3; // L: 426 + this.field296 = var3; } } - this.field503 = 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.field501); // L: 433 + this.field282 = null; + byte[] var7 = this.samples; + this.samples = null; + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field270); } } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("float32Unpack") static float float32Unpack(int var0) { - int var1 = var0 & 2097151; // L: 47 - int var2 = var0 & Integer.MIN_VALUE; // L: 48 - int var3 = (var0 & 2145386496) >> 21; // L: 49 - if (var2 != 0) { // L: 50 + int var1 = var0 & 2097151; + int var2 = var0 & Integer.MIN_VALUE; + int var3 = (var0 & 2145386496) >> 21; + if (var2 != 0) { var1 = -var1; } - return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 + return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { - VorbisSample_bytes = var0; // L: 55 - VorbisSample_byteOffset = var1; // L: 56 - VorbisSample_bitOffset = 0; // L: 57 - } // L: 58 + VorbisSample_bytes = var0; + VorbisSample_byteOffset = var1; + VorbisSample_bitOffset = 0; + } @ObfuscatedName("v") @Export("readBit") static int readBit() { - int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 - ++VorbisSample_bitOffset; // L: 62 - VorbisSample_byteOffset += VorbisSample_bitOffset >> 3; // L: 63 - VorbisSample_bitOffset &= 7; // L: 64 - return var0; // L: 65 + int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; + ++VorbisSample_bitOffset; + VorbisSample_byteOffset += VorbisSample_bitOffset >> 3; + VorbisSample_bitOffset &= 7; + return var0; } - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("readBits") static int readBits(int var0) { - int var1 = 0; // L: 69 + int var1 = 0; int var2; int var3; - for (var2 = 0; var0 >= 8 - VorbisSample_bitOffset; var0 -= var3) { // L: 70 71 78 - var3 = 8 - VorbisSample_bitOffset; // L: 72 - int var4 = (1 << var3) - 1; // L: 73 - var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var4) << var2; // L: 74 - VorbisSample_bitOffset = 0; // L: 75 - ++VorbisSample_byteOffset; // L: 76 - var2 += var3; // L: 77 + for (var2 = 0; var0 >= 8 - VorbisSample_bitOffset; var0 -= var3) { + var3 = 8 - VorbisSample_bitOffset; + int var4 = (1 << var3) - 1; + var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var4) << var2; + VorbisSample_bitOffset = 0; + ++VorbisSample_byteOffset; + var2 += var3; } - if (var0 > 0) { // L: 80 - var3 = (1 << var0) - 1; // L: 81 - var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var3) << var2; // L: 82 - VorbisSample_bitOffset += var0; // L: 83 + if (var0 > 0) { + var3 = (1 << var0) - 1; + var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var3) << var2; + VorbisSample_bitOffset += var0; } - return var1; // L: 85 + return var1; } - @ObfuscatedName("o") - static void method1133(byte[] var0) { - VorbisSample_setData(var0, 0); // L: 114 - VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 - VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field507 = new float[VorbisSample_blockSize1]; // L: 117 + @ObfuscatedName("n") + static void method750(byte[] var0) { + VorbisSample_setData(var0, 0); + VorbisSample_blockSize0 = 1 << readBits(4); + VorbisSample_blockSize1 = 1 << readBits(4); + field286 = new float[VorbisSample_blockSize1]; int var1; int var2; int var3; int var4; int var5; - for (var1 = 0; var1 < 2; ++var1) { // L: 118 - var2 = var1 != 0 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 119 - var3 = var2 >> 1; // L: 120 - var4 = var2 >> 2; // L: 121 - var5 = var2 >> 3; // L: 122 - float[] var12 = new float[var3]; // L: 123 + for (var1 = 0; var1 < 2; ++var1) { + var2 = var1 != 0 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; + var3 = var2 >> 1; + var4 = var2 >> 2; + var5 = var2 >> 3; + float[] var12 = new float[var3]; - for (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 + for (int var7 = 0; var7 < var4; ++var7) { + var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); + var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); } - float[] var13 = new float[var3]; // L: 128 + float[] var13 = new float[var3]; - 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 + for (int var8 = 0; var8 < var4; ++var8) { + var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); } - float[] var14 = new float[var4]; // L: 133 + float[] var14 = new float[var4]; - 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 + for (int var9 = 0; var9 < var5; ++var9) { + var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); + var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); } - int[] var15 = new int[var5]; // L: 138 - int var10 = class5.iLog(var5 - 1); // L: 139 + int[] var15 = new int[var5]; + int var10 = ItemLayer.iLog(var5 - 1); - for (int var11 = 0; var11 < var5; ++var11) { // L: 140 - var15[var11] = class16.method245(var11, var10); + for (int var11 = 0; var11 < var5; ++var11) { + var15[var11] = Script.method1724(var11, var10); } - if (var1 != 0) { // L: 141 - field511 = var12; // L: 142 - field518 = var13; // L: 143 - field513 = var14; // L: 144 - field515 = var15; // L: 145 + if (var1 != 0) { + field290 = var12; + field291 = var13; + field277 = var14; + field267 = var15; } else { - field495 = var12; // L: 148 - field509 = var13; // L: 149 - field510 = var14; // L: 150 - field514 = var15; // L: 151 + field294 = var12; + field288 = var13; + field289 = var14; + field266 = var15; } } - var1 = readBits(8) + 1; // L: 154 - VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155 + var1 = readBits(8) + 1; + VorbisSample_codebooks = new VorbisCodebook[var1]; - for (var2 = 0; var2 < var1; ++var2) { // L: 156 + for (var2 = 0; var2 < var1; ++var2) { VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; // L: 158 + var2 = readBits(6) + 1; - for (var3 = 0; var3 < var2; ++var3) { // L: 159 + for (var3 = 0; var3 < var2; ++var3) { readBits(16); } - var2 = readBits(6) + 1; // L: 161 - VorbisSample_floors = new VorbisFloor[var2]; // L: 162 + var2 = readBits(6) + 1; + VorbisSample_floors = new VorbisFloor[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 163 + for (var3 = 0; var3 < var2; ++var3) { VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; // L: 164 - VorbisSample_residues = new VorbisResidue[var3]; // L: 165 + var3 = readBits(6) + 1; + VorbisSample_residues = new VorbisResidue[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 166 + for (var4 = 0; var4 < var3; ++var4) { VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; // L: 167 - VorbisSample_mappings = new VorbisMapping[var4]; // L: 168 + var4 = readBits(6) + 1; + VorbisSample_mappings = new VorbisMapping[var4]; - for (var5 = 0; var5 < var4; ++var5) { // L: 169 + for (var5 = 0; var5 < var4; ++var5) { 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; + VorbisSample_blockFlags = new boolean[var5]; + VorbisSample_mapping = new int[var5]; - 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) { + VorbisSample_blockFlags[var6] = readBit() != 0; + readBits(16); + readBits(16); + VorbisSample_mapping[var6] = readBits(8); } - } // L: 179 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljp;)Z" + descriptor = "(Ljy;)Z" ) - static boolean method1131(AbstractArchive var0) { - if (!field502) { // L: 381 - byte[] var1 = var0.takeFile(0, 0); // L: 382 - if (var1 == null) { // L: 383 + static boolean method751(AbstractArchive var0) { + if (!field264) { + byte[] var1 = var0.takeFile(0, 0); + if (var1 == null) { return false; } - method1133(var1); // L: 384 - field502 = true; // L: 385 + method750(var1); + field264 = true; } - return true; // L: 387 + return true; } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lbr;" + descriptor = "(Ljy;II)Lau;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1131(var0)) { // L: 391 - var0.tryLoadFile(var1, var2); // L: 392 - return null; // L: 393 + if (!method751(var0)) { + var0.tryLoadFile(var1, var2); + return null; } else { - byte[] var3 = var0.takeFile(var1, var2); // L: 395 - return var3 == null ? null : new VorbisSample(var3); // L: 396 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new VorbisSample(var3); } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 6fcef61290..e5add3d076 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -1,86 +1,278 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hd") +@ObfuscatedName("ha") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2070337173 + intValue = -1890656185 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -303392399 + intValue = -770294787 ) @Export("x") int x; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1106759041 + intValue = -1410244903 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -220475681 + intValue = -1632791677 ) @Export("orientation") int orientation; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -954278973 + intValue = 147642421 ) @Export("orientation2") int orientation2; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 249572435 + intValue = -1330395367 ) @Export("xOffset") int xOffset; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -354762285 + intValue = 1002752681 ) @Export("yOffset") int yOffset; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgy;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 1545388647907384621L + longValue = -2915729349709580649L ) @Export("tag") public long tag; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 423325183 + intValue = -718006153 ) @Export("flags") int flags; WallDecoration() { - this.tag = 0L; // L: 13 - this.flags = 0; // L: 14 - } // L: 16 + this.tag = 0L; + this.flags = 0; + } - @ObfuscatedName("f") - static double method4429(double var0) { - return Math.exp(var0 * -var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9 + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-231746881" + ) + public static void method4338(String var0, String var1, int var2, int var3) throws IOException { + DevicePcmPlayerProvider.idxCount = var3; + AttackOption.cacheGamebuild = var2; + + try { + ClientPreferences.operatingSystemName = System.getProperty("os.name"); + } catch (Exception var15) { + ClientPreferences.operatingSystemName = "Unknown"; + } + + WorldMapEvent.formattedOperatingSystemName = ClientPreferences.operatingSystemName.toLowerCase(); + + try { + class234.userHomeDirectory = System.getProperty("user.home"); + if (class234.userHomeDirectory != null) { + class234.userHomeDirectory = class234.userHomeDirectory + "/"; + } + } catch (Exception var14) { + } + + try { + if (WorldMapEvent.formattedOperatingSystemName.startsWith("win")) { + if (class234.userHomeDirectory == null) { + class234.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (class234.userHomeDirectory == null) { + class234.userHomeDirectory = System.getenv("HOME"); + } + + if (class234.userHomeDirectory != null) { + class234.userHomeDirectory = class234.userHomeDirectory + "/"; + } + } catch (Exception var13) { + } + + if (class234.userHomeDirectory == null) { + class234.userHomeDirectory = "~/"; + } + + BuddyRankComparator.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class234.userHomeDirectory, "/tmp/", ""}; + DirectByteArrayCopier.cacheSubPaths = new String[]{".jagex_cache_" + AttackOption.cacheGamebuild, ".file_store_" + AttackOption.cacheGamebuild}; + int var9 = 0; + + label127: + while (var9 < 4) { + JagexCache.cacheDir = Canvas.method125(var0, var1, var9); + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } + + File[] var5 = JagexCache.cacheDir.listFiles(); + if (var5 == null) { + break; + } + + File[] var6 = var5; + int var7 = 0; + + while (true) { + if (var7 >= var6.length) { + break label127; + } + + File var8 = var6[var7]; + if (!GraphicsObject.method1645(var8, false)) { + ++var9; + break; + } + + ++var7; + } + } + + ServerPacket.method4427(JagexCache.cacheDir); + + try { + File var4 = new File(class234.userHomeDirectory, "random.dat"); + int var11; + if (var4.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); + } else { + label109: + for (int var10 = 0; var10 < DirectByteArrayCopier.cacheSubPaths.length; ++var10) { + for (var11 = 0; var11 < BuddyRankComparator.cacheParentPaths.length; ++var11) { + File var12 = new File(BuddyRankComparator.cacheParentPaths[var11] + DirectByteArrayCopier.cacheSubPaths[var10] + File.separatorChar + "random.dat"); + if (var12.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var12, "rw", 25L), 24, 0); + break label109; + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var17 = new RandomAccessFile(var4, "rw"); + var11 = var17.read(); + var17.seek(0L); + var17.write(var11); + var17.seek(0L); + var17.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); + } + } catch (IOException var16) { + } + + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(SecureRandomCallable.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(SecureRandomCallable.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + FriendsChat.JagexCache_idxFiles = new BufferedFile[DevicePcmPlayerProvider.idxCount]; + + for (var9 = 0; var9 < DevicePcmPlayerProvider.idxCount; ++var9) { + FriendsChat.JagexCache_idxFiles[var9] = new BufferedFile(new AccessFile(SecureRandomCallable.getFile("main_file_cache.idx" + var9), "rw", 1048576L), 6000, 0); + } + + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1427059121" + ) + static int method4340(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1575511000" + ) + public static boolean method4339(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { + if (var0 != 0) { + char[] var1 = class303.cp1252AsciiExtension; + + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + } + + return false; + } else { + return true; + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-1382122671" + ) + static int method4337(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 2382397732..11236c458f 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -3,1364 +3,1374 @@ 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("iv") +@ObfuscatedName("io") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("r") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "[[Lio;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("Widget_archive") + static AbstractArchive Widget_archive; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lhw;" ) @Export("Widget_cachedSprites") - public static EvictingDualNodeHashTable Widget_cachedSprites; + static EvictingDualNodeHashTable Widget_cachedSprites; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("Widget_cachedModels") - public static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("g") + static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("Widget_cachedFonts") - public static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("t") + static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("Widget_cachedSpriteMasks") - public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("x") - public static boolean field2958; + static EvictingDualNodeHashTable Widget_cachedSpriteMasks; @ObfuscatedName("u") + public static boolean field2955; + @ObfuscatedName("e") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 363798319 + intValue = -1996852661 ) @Export("id") public int id; - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1482836169 + intValue = -1948690547 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -562774219 + intValue = 1560081371 ) @Export("type") public int type; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1974626303 + intValue = 1640727545 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1544814105 + intValue = 1069362067 ) @Export("contentType") public int contentType; - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 627320861 + intValue = 1123710663 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1854244357 + intValue = -463900241 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -95025113 + intValue = -170763861 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1904389547 + intValue = 1434396973 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 836624487 + intValue = -513241127 ) @Export("rawX") public int rawX; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1601596941 + intValue = 225529443 ) @Export("rawY") public int rawY; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 2139008707 + intValue = -2102410665 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1355473233 + intValue = -1913897155 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -66404377 + intValue = -332499741 ) @Export("x") public int x; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -2017763811 + intValue = 552380009 ) @Export("y") public int y; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1476009263 + intValue = 1408116923 ) @Export("width") public int width; - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 25115113 + intValue = 1272528565 ) @Export("height") public int height; - @ObfuscatedName("aq") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1087835647 + intValue = 1847409391 ) - public int field2977; - @ObfuscatedName("ae") + public int field2974; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 192749483 + intValue = 1505427003 ) - public int field2957; + public int field2975; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1196708861 + intValue = -759927677 ) @Export("parentId") public int parentId; - @ObfuscatedName("an") + @ObfuscatedName("az") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 976115909 + intValue = 1341100981 ) @Export("scrollX") public int scrollX; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -28685509 + intValue = -1262956443 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1727030445 + intValue = 13396411 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -2062739769 + intValue = 1927321653 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1286368221 + intValue = 66844485 ) @Export("color") public int color; @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -506797087 + intValue = 1152823329 ) @Export("color2") public int color2; - @ObfuscatedName("am") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1740449063 + intValue = 653941429 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1715490111 + intValue = 237992241 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @Export("fill") public boolean fill; - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lou;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ax") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1449839719 + intValue = 97041307 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ar") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -2085035941 + intValue = 1480271257 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1723133007 + intValue = -1529608337 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bq") - public boolean field2994; - @ObfuscatedName("bx") + @ObfuscatedName("bt") + public boolean field2991; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -241980903 + intValue = -2108501805 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bi") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1019565859 + intValue = 323350109 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bz") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1070860823 + intValue = 1630918777 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bb") + @ObfuscatedName("bv") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1470776531 + intValue = 753525735 ) @Export("outline") public int outline; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1555949609 + intValue = -1569235665 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("be") + @ObfuscatedName("bg") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("ba") + @ObfuscatedName("bw") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1769374205 + intValue = -1237275757 ) @Export("modelType") public int modelType; - @ObfuscatedName("br") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1676521399 + intValue = 981744205 ) @Export("modelId") public int modelId; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1490803313 + intValue = 2003366431 ) @Export("modelType2") int modelType2; - @ObfuscatedName("by") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1980636949 + intValue = 318960909 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -4788971 + intValue = -33810755 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bg") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1751751309 + intValue = 1553312229 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -958895997 + intValue = 1998903261 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bj") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -1127276269 + intValue = -2096572299 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bo") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -1281350053 + intValue = -1875119171 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bn") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 638768595 + intValue = 1078593123 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bu") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1289880071 + intValue = -1542513487 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bl") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 495124129 + intValue = -775690617 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bd") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 154966647 + intValue = 222244751 ) - public int field3011; + public int field3012; + @ObfuscatedName("bc") + @ObfuscatedGetter( + intValue = 1951424775 + ) + public int field3013; @ObfuscatedName("bp") - @ObfuscatedGetter( - intValue = 415113775 - ) - public int field2981; - @ObfuscatedName("bk") @Export("modelOrthog") public boolean modelOrthog; @ObfuscatedName("bh") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bf") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -455387 + intValue = -5465671 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cm") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1632678803 + intValue = 1446916169 ) @Export("fontId") public int fontId; - @ObfuscatedName("cx") + @ObfuscatedName("cl") @Export("text") public String text; - @ObfuscatedName("cq") + @ObfuscatedName("ce") @Export("text2") public String text2; - @ObfuscatedName("cz") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -1171015399 + intValue = -114777247 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cc") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1858738259 + intValue = 2062314829 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cu") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -264519941 + intValue = 1721788583 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cv") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1938227679 + intValue = -1196643207 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cf") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1590211597 + intValue = -1517443571 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cb") + @ObfuscatedName("cd") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cg") + @ObfuscatedName("co") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("ca") + @ObfuscatedName("cm") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cd") + @ObfuscatedName("ct") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ce") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -766759313 + intValue = -1724953039 ) @Export("flags") public int flags; @ObfuscatedName("cy") - public boolean field3034; - @ObfuscatedName("ct") - public byte[][] field3035; - @ObfuscatedName("ci") - public byte[][] field3036; + public boolean field3031; + @ObfuscatedName("cp") + public byte[][] field2987; @ObfuscatedName("cs") - public int[] field3037; - @ObfuscatedName("co") - public int[] field3038; - @ObfuscatedName("ck") + public byte[][] field3033; + @ObfuscatedName("cv") + public int[] field2993; + @ObfuscatedName("cg") + public int[] field3035; + @ObfuscatedName("cx") @Export("dataText") public String dataText; - @ObfuscatedName("cn") + @ObfuscatedName("cr") @Export("actions") public String[] actions; - @ObfuscatedName("ch") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("parent") public Widget parent; - @ObfuscatedName("du") + @ObfuscatedName("dk") @ObfuscatedGetter( - intValue = -1885239925 + intValue = 1233836703 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("db") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -933833781 + intValue = -639280281 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dm") + @ObfuscatedName("dn") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dh") + @ObfuscatedName("de") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("di") + @ObfuscatedName("dc") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("ds") + @ObfuscatedName("do") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("df") + @ObfuscatedName("dx") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dg") + @ObfuscatedName("dr") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dq") + @ObfuscatedName("da") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dz") + @ObfuscatedName("dw") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dc") + @ObfuscatedName("dj") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dt") + @ObfuscatedName("dm") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dp") + @ObfuscatedName("du") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("do") + @ObfuscatedName("dv") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dl") + @ObfuscatedName("db") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("de") + @ObfuscatedName("dh") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("dr") + @ObfuscatedName("di") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("dd") + @ObfuscatedName("ds") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dk") + @ObfuscatedName("dq") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dj") + @ObfuscatedName("dt") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dx") + @ObfuscatedName("dp") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dw") + @ObfuscatedName("dg") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dv") + @ObfuscatedName("dy") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("dy") + @ObfuscatedName("dl") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("da") + @ObfuscatedName("dd") @Export("onOp") public Object[] onOp; - @ObfuscatedName("dn") + @ObfuscatedName("dz") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("ei") + @ObfuscatedName("eu") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("ej") + @ObfuscatedName("eo") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ea") - public Object[] field3071; - @ObfuscatedName("ec") - public Object[] field3000; - @ObfuscatedName("el") + @ObfuscatedName("ef") + public Object[] field3067; + @ObfuscatedName("ek") + public Object[] field3068; + @ObfuscatedName("ev") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("en") + @ObfuscatedName("ex") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("et") - public Object[] field3075; - @ObfuscatedName("ex") - public Object[] field3076; - @ObfuscatedName("eb") + @ObfuscatedName("ee") + public Object[] field3074; + @ObfuscatedName("er") + public Object[] field3072; + @ObfuscatedName("el") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("ek") + @ObfuscatedName("eg") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("em") + @ObfuscatedName("ei") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("er") + @ObfuscatedName("ep") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ey") + @ObfuscatedName("ea") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("eg") - public Object[] field3082; - @ObfuscatedName("ep") + @ObfuscatedName("eb") + public Object[] field3078; + @ObfuscatedName("ed") @Export("cs1Instructions") public int[][] cs1Instructions; @ObfuscatedName("eq") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ev") + @ObfuscatedName("eh") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ee") + @ObfuscatedName("ej") @ObfuscatedGetter( - intValue = -1679183343 + intValue = -397970209 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("eu") + @ObfuscatedName("ey") @Export("spellName") public String spellName; - @ObfuscatedName("eo") + @ObfuscatedName("ew") @Export("buttonText") public String buttonText; - @ObfuscatedName("ew") + @ObfuscatedName("en") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ed") + @ObfuscatedName("ec") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("eh") + @ObfuscatedName("ez") @ObfuscatedGetter( - intValue = -1075326629 + intValue = 1754155315 ) @Export("itemId") public int itemId; - @ObfuscatedName("es") + @ObfuscatedName("et") @ObfuscatedGetter( - intValue = 1814169921 + intValue = -1249175763 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ez") + @ObfuscatedName("es") @ObfuscatedGetter( - intValue = 1965960865 + intValue = 281675057 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ef") + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = 209321267 + intValue = -99781977 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("fq") + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "[Liv;" + descriptor = "[Lio;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fm") + @ObfuscatedName("fw") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fl") + @ObfuscatedName("fz") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fv") + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = 798804461 + intValue = 578002571 ) - public int field3098; - @ObfuscatedName("fx") - @ObfuscatedGetter( - intValue = 327523393 - ) - public int field3089; - @ObfuscatedName("fo") - @ObfuscatedGetter( - intValue = 1440845135 - ) - public int field3100; - @ObfuscatedName("fc") - @ObfuscatedGetter( - intValue = -1749487493 - ) - public int field2971; + public int field3094; @ObfuscatedName("fg") @ObfuscatedGetter( - intValue = -80188581 + intValue = -358588347 + ) + public int field3095; + @ObfuscatedName("fp") + @ObfuscatedGetter( + intValue = -851225199 + ) + public int field3096; + @ObfuscatedName("fj") + @ObfuscatedGetter( + intValue = 85334139 + ) + public int field3097; + @ObfuscatedName("fc") + @ObfuscatedGetter( + intValue = -1432964963 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fe") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = -1217907707 + intValue = 972810775 ) @Export("cycle") public int cycle; - @ObfuscatedName("fs") - public int[] field3104; - @ObfuscatedName("fa") + @ObfuscatedName("fq") + public int[] field2966; + @ObfuscatedName("fv") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fn") + @ObfuscatedName("fa") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("ft") + @ObfuscatedName("fb") @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 - field2958 = false; // L: 35 + Widget_cachedSprites = new EvictingDualNodeHashTable(200); + Widget_cachedModels = new EvictingDualNodeHashTable(50); + Widget_cachedFonts = new EvictingDualNodeHashTable(20); + Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); + field2955 = false; } public Widget() { - this.isIf3 = false; // L: 36 - this.id = -1; // L: 37 - this.childIndex = -1; // L: 38 - this.buttonType = 0; // L: 40 - this.contentType = 0; // L: 41 - this.xAlignment = 0; // L: 42 - this.yAlignment = 0; // L: 43 - this.widthAlignment = 0; // L: 44 - this.heightAlignment = 0; // L: 45 - this.rawX = 0; // L: 46 - this.rawY = 0; // L: 47 - this.rawWidth = 0; // L: 48 - this.rawHeight = 0; // L: 49 - this.x = 0; // L: 50 - this.y = 0; // L: 51 - this.width = 0; // L: 52 - this.height = 0; // L: 53 - this.field2977 = 1; // L: 54 - this.field2957 = 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.field2994 = 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.field3011 = 0; // L: 92 - this.field2981 = 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.field3034 = 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.field3098 = -1; // L: 178 - this.field3089 = 0; // L: 179 - this.field3100 = 0; // L: 180 - this.field2971 = 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 - } // L: 711 + this.isIf3 = false; + this.id = -1; + this.childIndex = -1; + this.buttonType = 0; + this.contentType = 0; + this.xAlignment = 0; + this.yAlignment = 0; + this.widthAlignment = 0; + this.heightAlignment = 0; + this.rawX = 0; + this.rawY = 0; + this.rawWidth = 0; + this.rawHeight = 0; + this.x = 0; + this.y = 0; + this.width = 0; + this.height = 0; + this.field2974 = 1; + this.field2975 = 1; + this.parentId = -1; + this.isHidden = false; + this.scrollX = 0; + this.scrollY = 0; + this.scrollWidth = 0; + this.scrollHeight = 0; + this.color = 0; + this.color2 = 0; + this.mouseOverColor = 0; + this.mouseOverColor2 = 0; + this.fill = false; + this.fillMode = FillMode.SOLID; + this.transparencyTop = 0; + this.transparencyBot = 0; + this.lineWid = 1; + this.field2991 = false; + this.spriteId2 = -1; + this.spriteId = -1; + this.spriteAngle = 0; + this.spriteTiling = false; + this.outline = 0; + this.spriteShadow = 0; + this.modelType = 1; + this.modelId = -1; + this.modelType2 = 1; + this.modelId2 = -1; + this.sequenceId = -1; + this.sequenceId2 = -1; + this.modelOffsetX = 0; + this.modelOffsetY = 0; + this.modelAngleX = 0; + this.modelAngleY = 0; + this.modelAngleZ = 0; + this.modelZoom = 100; + this.field3012 = 0; + this.field3013 = 0; + this.modelOrthog = false; + this.modelTransparency = false; + this.itemQuantityMode = 2; + this.fontId = -1; + this.text = ""; + this.text2 = ""; + this.textLineHeight = 0; + this.textXAlignment = 0; + this.textYAlignment = 0; + this.textShadowed = false; + this.paddingX = 0; + this.paddingY = 0; + this.flags = 0; + this.field3031 = false; + this.dataText = ""; + this.parent = null; + this.dragZoneSize = 0; + this.dragThreshold = 0; + this.isScrollBar = false; + this.spellActionName = ""; + this.hasListener = false; + this.mouseOverRedirect = -1; + this.spellName = ""; + this.buttonText = "Ok"; + this.itemId = -1; + this.itemQuantity = 0; + this.modelFrame = 0; + this.modelFrameCycle = 0; + this.containsMouse = false; + this.isClicked = false; + this.field3094 = -1; + this.field3095 = 0; + this.field3096 = 0; + this.field3097 = 0; + this.rootIndex = -1; + this.cycle = -1; + this.noClickThrough = false; + this.noScrollThrough = false; + this.prioritizeMenuEntry = false; + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1168354029" + descriptor = "(Lnv;I)V", + garbageValue = "-878990627" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; // L: 256 - this.type = var1.readUnsignedByte(); // L: 257 - this.buttonType = var1.readUnsignedByte(); // L: 258 - this.contentType = var1.readUnsignedShort(); // L: 259 - this.rawX = var1.readShort(); // L: 260 - this.rawY = var1.readShort(); // L: 261 - this.rawWidth = var1.readUnsignedShort(); // L: 262 - this.rawHeight = var1.readUnsignedShort(); // L: 263 - this.transparencyTop = var1.readUnsignedByte(); // L: 264 - this.parentId = var1.readUnsignedShort(); // L: 265 - if (this.parentId == 65535) { // L: 266 + this.isIf3 = false; + this.type = var1.readUnsignedByte(); + this.buttonType = var1.readUnsignedByte(); + this.contentType = var1.readUnsignedShort(); + this.rawX = var1.readShort(); + this.rawY = var1.readShort(); + this.rawWidth = var1.readUnsignedShort(); + this.rawHeight = var1.readUnsignedShort(); + this.transparencyTop = var1.readUnsignedByte(); + this.parentId = var1.readUnsignedShort(); + if (this.parentId == 65535) { this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 267 + this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.readUnsignedShort(); // L: 268 - if (this.mouseOverRedirect == 65535) { // L: 269 + this.mouseOverRedirect = var1.readUnsignedShort(); + if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 270 + int var2 = var1.readUnsignedByte(); int var3; - if (var2 > 0) { // L: 271 - this.cs1Comparisons = new int[var2]; // L: 272 - this.cs1ComparisonValues = new int[var2]; // L: 273 + if (var2 > 0) { + this.cs1Comparisons = new int[var2]; + this.cs1ComparisonValues = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 274 - this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 275 - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 276 + for (var3 = 0; var3 < var2; ++var3) { + this.cs1Comparisons[var3] = var1.readUnsignedByte(); + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); } } - var3 = var1.readUnsignedByte(); // L: 279 + var3 = var1.readUnsignedByte(); int var4; int var5; int var6; - if (var3 > 0) { // L: 280 - this.cs1Instructions = new int[var3][]; // L: 281 + if (var3 > 0) { + this.cs1Instructions = new int[var3][]; - for (var4 = 0; var4 < var3; ++var4) { // L: 282 - var5 = var1.readUnsignedShort(); // L: 283 - this.cs1Instructions[var4] = new int[var5]; // L: 284 + for (var4 = 0; var4 < var3; ++var4) { + var5 = var1.readUnsignedShort(); + this.cs1Instructions[var4] = new int[var5]; - for (var6 = 0; var6 < var5; ++var6) { // L: 285 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 286 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 287 + for (var6 = 0; var6 < var5; ++var6) { + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); + if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 291 - this.scrollHeight = var1.readUnsignedShort(); // L: 292 - this.isHidden = var1.readUnsignedByte() == 1; // L: 293 + if (this.type == 0) { + this.scrollHeight = var1.readUnsignedShort(); + this.isHidden = var1.readUnsignedByte() == 1; } - if (this.type == 1) { // L: 295 - var1.readUnsignedShort(); // L: 296 - var1.readUnsignedByte(); // L: 297 + if (this.type == 1) { + var1.readUnsignedShort(); + var1.readUnsignedByte(); } - if (this.type == 2) { // L: 299 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 300 - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 301 - var4 = var1.readUnsignedByte(); // L: 302 - if (var4 == 1) { // L: 303 + if (this.type == 2) { + this.itemIds = new int[this.rawHeight * this.rawWidth]; + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + var4 = var1.readUnsignedByte(); + if (var4 == 1) { this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 304 - if (var5 == 1) { // L: 305 + var5 = var1.readUnsignedByte(); + if (var5 == 1) { this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 306 - if (var6 == 1) { // L: 307 + var6 = var1.readUnsignedByte(); + if (var6 == 1) { this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 308 - if (var7 == 1) { // L: 309 + int var7 = var1.readUnsignedByte(); + if (var7 == 1) { this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); // L: 310 - this.paddingY = var1.readUnsignedByte(); // L: 311 - this.inventoryXOffsets = new int[20]; // L: 312 - this.inventoryYOffsets = new int[20]; // L: 313 - this.inventorySprites = new int[20]; // L: 314 + this.paddingX = var1.readUnsignedByte(); + this.paddingY = var1.readUnsignedByte(); + this.inventoryXOffsets = new int[20]; + this.inventoryYOffsets = new int[20]; + this.inventorySprites = new int[20]; int var8; - for (var8 = 0; var8 < 20; ++var8) { // L: 315 - int var11 = var1.readUnsignedByte(); // L: 316 - if (var11 == 1) { // L: 317 - this.inventoryXOffsets[var8] = var1.readShort(); // L: 318 - this.inventoryYOffsets[var8] = var1.readShort(); // L: 319 - this.inventorySprites[var8] = var1.readInt(); // L: 320 + for (var8 = 0; var8 < 20; ++var8) { + int var11 = var1.readUnsignedByte(); + if (var11 == 1) { + this.inventoryXOffsets[var8] = var1.readShort(); + this.inventoryYOffsets[var8] = var1.readShort(); + this.inventorySprites[var8] = var1.readInt(); } else { - this.inventorySprites[var8] = -1; // L: 322 + this.inventorySprites[var8] = -1; } } - this.itemActions = new String[5]; // L: 324 + this.itemActions = new String[5]; - for (var8 = 0; var8 < 5; ++var8) { // L: 325 - String var9 = var1.readStringCp1252NullTerminated(); // L: 326 - if (var9.length() > 0) { // L: 327 - this.itemActions[var8] = var9; // L: 328 - this.flags |= 1 << var8 + 23; // L: 329 + for (var8 = 0; var8 < 5; ++var8) { + String var9 = var1.readStringCp1252NullTerminated(); + if (var9.length() > 0) { + this.itemActions[var8] = var9; + this.flags |= 1 << var8 + 23; } } } - if (this.type == 3) { // L: 333 - this.fill = var1.readUnsignedByte() == 1; // L: 334 + if (this.type == 3) { + this.fill = var1.readUnsignedByte() == 1; } - if (this.type == 4 || this.type == 1) { // L: 336 - this.textXAlignment = var1.readUnsignedByte(); // L: 337 - this.textYAlignment = var1.readUnsignedByte(); // L: 338 - this.textLineHeight = var1.readUnsignedByte(); // L: 339 - this.fontId = var1.readUnsignedShort(); // L: 340 - if (this.fontId == 65535) { // L: 341 + if (this.type == 4 || this.type == 1) { + this.textXAlignment = var1.readUnsignedByte(); + this.textYAlignment = var1.readUnsignedByte(); + this.textLineHeight = var1.readUnsignedByte(); + this.fontId = var1.readUnsignedShort(); + if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 342 + this.textShadowed = var1.readUnsignedByte() == 1; } - if (this.type == 4) { // L: 344 - this.text = var1.readStringCp1252NullTerminated(); // L: 345 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 346 + if (this.type == 4) { + this.text = var1.readStringCp1252NullTerminated(); + this.text2 = var1.readStringCp1252NullTerminated(); } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 348 + if (this.type == 1 || this.type == 3 || this.type == 4) { this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { // L: 349 - this.color2 = var1.readInt(); // L: 350 - this.mouseOverColor = var1.readInt(); // L: 351 - this.mouseOverColor2 = var1.readInt(); // L: 352 + if (this.type == 3 || this.type == 4) { + this.color2 = var1.readInt(); + this.mouseOverColor = var1.readInt(); + this.mouseOverColor2 = var1.readInt(); } - if (this.type == 5) { // L: 354 - this.spriteId2 = var1.readInt(); // L: 355 - this.spriteId = var1.readInt(); // L: 356 + if (this.type == 5) { + this.spriteId2 = var1.readInt(); + this.spriteId = var1.readInt(); } - if (this.type == 6) { // L: 358 - this.modelType = 1; // L: 359 - this.modelId = var1.readUnsignedShort(); // L: 360 - if (this.modelId == 65535) { // L: 361 + if (this.type == 6) { + this.modelType = 1; + this.modelId = var1.readUnsignedShort(); + if (this.modelId == 65535) { this.modelId = -1; } - this.modelType2 = 1; // L: 362 - this.modelId2 = var1.readUnsignedShort(); // L: 363 - if (this.modelId2 == 65535) { // L: 364 + this.modelType2 = 1; + this.modelId2 = var1.readUnsignedShort(); + if (this.modelId2 == 65535) { this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 365 - if (this.sequenceId == 65535) { // L: 366 + this.sequenceId = var1.readUnsignedShort(); + if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 367 - if (this.sequenceId2 == 65535) { // L: 368 + this.sequenceId2 = var1.readUnsignedShort(); + if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 369 - this.modelAngleX = var1.readUnsignedShort(); // L: 370 - this.modelAngleY = var1.readUnsignedShort(); // L: 371 + this.modelZoom = var1.readUnsignedShort(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); } - if (this.type == 7) { // L: 373 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 374 - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 375 - this.textXAlignment = var1.readUnsignedByte(); // L: 376 - this.fontId = var1.readUnsignedShort(); // L: 377 - if (this.fontId == 65535) { // L: 378 + if (this.type == 7) { + this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + this.textXAlignment = var1.readUnsignedByte(); + this.fontId = var1.readUnsignedShort(); + if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 379 - this.color = var1.readInt(); // L: 380 - this.paddingX = var1.readShort(); // L: 381 - this.paddingY = var1.readShort(); // L: 382 - var4 = var1.readUnsignedByte(); // L: 383 + this.textShadowed = var1.readUnsignedByte() == 1; + this.color = var1.readInt(); + this.paddingX = var1.readShort(); + this.paddingY = var1.readShort(); + var4 = var1.readUnsignedByte(); if (var4 == 1) { - this.flags |= 1073741824; // L: 384 + this.flags |= 1073741824; } - this.itemActions = new String[5]; // L: 385 + this.itemActions = new String[5]; - for (var5 = 0; var5 < 5; ++var5) { // L: 386 - String var10 = var1.readStringCp1252NullTerminated(); // L: 387 - if (var10.length() > 0) { // L: 388 - this.itemActions[var5] = var10; // L: 389 - this.flags |= 1 << var5 + 23; // L: 390 + for (var5 = 0; var5 < 5; ++var5) { + String var10 = var1.readStringCp1252NullTerminated(); + if (var10.length() > 0) { + this.itemActions[var5] = var10; + this.flags |= 1 << var5 + 23; } } } - if (this.type == 8) { // L: 394 - this.text = var1.readStringCp1252NullTerminated(); // L: 395 + if (this.type == 8) { + this.text = var1.readStringCp1252NullTerminated(); } - if (this.buttonType == 2 || this.type == 2) { // L: 397 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 398 - this.spellName = var1.readStringCp1252NullTerminated(); // L: 399 - var4 = var1.readUnsignedShort() & 63; // L: 400 - this.flags |= var4 << 11; // L: 401 + if (this.buttonType == 2 || this.type == 2) { + this.spellActionName = var1.readStringCp1252NullTerminated(); + this.spellName = var1.readStringCp1252NullTerminated(); + var4 = var1.readUnsignedShort() & 63; + this.flags |= var4 << 11; } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 403 - this.buttonText = var1.readStringCp1252NullTerminated(); // L: 404 - if (this.buttonText.length() == 0) { // L: 405 - if (this.buttonType == 1) { // L: 406 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { + this.buttonText = var1.readStringCp1252NullTerminated(); + if (this.buttonText.length() == 0) { + if (this.buttonType == 1) { this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 407 + if (this.buttonType == 4) { this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 408 + if (this.buttonType == 5) { this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 409 + if (this.buttonType == 6) { this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 412 - this.flags |= 4194304; // L: 413 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { + this.flags |= 4194304; } - if (this.buttonType == 6) { // L: 415 - this.flags |= 1; // L: 416 + if (this.buttonType == 6) { + this.flags |= 1; } - } // L: 418 + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lnt;B)V", - garbageValue = "1" + descriptor = "(Lnv;B)V", + garbageValue = "-113" ) @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); // L: 421 - this.isIf3 = true; // L: 422 - this.type = var1.readUnsignedByte(); // L: 423 - this.contentType = var1.readUnsignedShort(); // L: 424 - this.rawX = var1.readShort(); // L: 425 - this.rawY = var1.readShort(); // L: 426 - this.rawWidth = var1.readUnsignedShort(); // L: 427 - if (this.type == 9) { // L: 428 + var1.readUnsignedByte(); + this.isIf3 = true; + this.type = var1.readUnsignedByte(); + this.contentType = var1.readUnsignedShort(); + this.rawX = var1.readShort(); + this.rawY = var1.readShort(); + this.rawWidth = var1.readUnsignedShort(); + if (this.type == 9) { this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 429 + this.rawHeight = var1.readUnsignedShort(); } - this.widthAlignment = var1.readByte(); // L: 430 - this.heightAlignment = var1.readByte(); // L: 431 - this.xAlignment = var1.readByte(); // L: 432 - this.yAlignment = var1.readByte(); // L: 433 - this.parentId = var1.readUnsignedShort(); // L: 434 - if (this.parentId == 65535) { // L: 435 + this.widthAlignment = var1.readByte(); + this.heightAlignment = var1.readByte(); + this.xAlignment = var1.readByte(); + this.yAlignment = var1.readByte(); + this.parentId = var1.readUnsignedShort(); + if (this.parentId == 65535) { this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 436 + this.parentId += this.id & -65536; } - this.isHidden = var1.readUnsignedByte() == 1; // L: 437 - if (this.type == 0) { // L: 438 - this.scrollWidth = var1.readUnsignedShort(); // L: 439 - this.scrollHeight = var1.readUnsignedShort(); // L: 440 - this.noClickThrough = var1.readUnsignedByte() == 1; // L: 441 + this.isHidden = var1.readUnsignedByte() == 1; + if (this.type == 0) { + this.scrollWidth = var1.readUnsignedShort(); + this.scrollHeight = var1.readUnsignedShort(); + this.noClickThrough = var1.readUnsignedByte() == 1; } - if (this.type == 5) { // L: 443 - this.spriteId2 = var1.readInt(); // L: 444 - this.spriteAngle = var1.readUnsignedShort(); // L: 445 - this.spriteTiling = var1.readUnsignedByte() == 1; // L: 446 - this.transparencyTop = var1.readUnsignedByte(); // L: 447 - this.outline = var1.readUnsignedByte(); // L: 448 - this.spriteShadow = var1.readInt(); // L: 449 - this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 450 - this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 451 + if (this.type == 5) { + this.spriteId2 = var1.readInt(); + this.spriteAngle = var1.readUnsignedShort(); + this.spriteTiling = var1.readUnsignedByte() == 1; + this.transparencyTop = var1.readUnsignedByte(); + this.outline = var1.readUnsignedByte(); + this.spriteShadow = var1.readInt(); + this.spriteFlipV = var1.readUnsignedByte() == 1; + this.spriteFlipH = var1.readUnsignedByte() == 1; } - if (this.type == 6) { // L: 453 - this.modelType = 1; // L: 454 - this.modelId = var1.readUnsignedShort(); // L: 455 - if (this.modelId == 65535) { // L: 456 + if (this.type == 6) { + this.modelType = 1; + this.modelId = var1.readUnsignedShort(); + if (this.modelId == 65535) { this.modelId = -1; } - this.modelOffsetX = var1.readShort(); // L: 457 - this.modelOffsetY = var1.readShort(); // L: 458 - this.modelAngleX = var1.readUnsignedShort(); // L: 459 - this.modelAngleY = var1.readUnsignedShort(); // L: 460 - this.modelAngleZ = var1.readUnsignedShort(); // L: 461 - this.modelZoom = var1.readUnsignedShort(); // L: 462 - this.sequenceId = var1.readUnsignedShort(); // L: 463 - if (this.sequenceId == 65535) { // L: 464 + this.modelOffsetX = var1.readShort(); + this.modelOffsetY = var1.readShort(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); + this.modelAngleZ = var1.readUnsignedShort(); + this.modelZoom = var1.readUnsignedShort(); + this.sequenceId = var1.readUnsignedShort(); + if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 465 - var1.readUnsignedShort(); // L: 466 - if (this.widthAlignment != 0) { // L: 467 - this.field3011 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; + var1.readUnsignedShort(); + if (this.widthAlignment != 0) { + this.field3012 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 468 - var1.readUnsignedShort(); // L: 469 + if (this.heightAlignment != 0) { + var1.readUnsignedShort(); } } - if (this.type == 4) { // L: 472 - this.fontId = var1.readUnsignedShort(); // L: 473 - if (this.fontId == 65535) { // L: 474 + if (this.type == 4) { + this.fontId = var1.readUnsignedShort(); + if (this.fontId == 65535) { this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); // L: 475 - this.textLineHeight = var1.readUnsignedByte(); // L: 476 - this.textXAlignment = var1.readUnsignedByte(); // L: 477 - this.textYAlignment = var1.readUnsignedByte(); // L: 478 - this.textShadowed = var1.readUnsignedByte() == 1; // L: 479 - this.color = var1.readInt(); // L: 480 + this.text = var1.readStringCp1252NullTerminated(); + this.textLineHeight = var1.readUnsignedByte(); + this.textXAlignment = var1.readUnsignedByte(); + this.textYAlignment = var1.readUnsignedByte(); + this.textShadowed = var1.readUnsignedByte() == 1; + this.color = var1.readInt(); } - if (this.type == 3) { // L: 482 - this.color = var1.readInt(); // L: 483 - this.fill = var1.readUnsignedByte() == 1; // L: 484 - this.transparencyTop = var1.readUnsignedByte(); // L: 485 + if (this.type == 3) { + this.color = var1.readInt(); + this.fill = var1.readUnsignedByte() == 1; + this.transparencyTop = var1.readUnsignedByte(); } - if (this.type == 9) { // L: 487 - this.lineWid = var1.readUnsignedByte(); // L: 488 - this.color = var1.readInt(); // L: 489 - this.field2994 = var1.readUnsignedByte() == 1; // L: 490 + if (this.type == 9) { + this.lineWid = var1.readUnsignedByte(); + this.color = var1.readInt(); + this.field2991 = var1.readUnsignedByte() == 1; } - this.flags = var1.readMedium(); // L: 492 - this.dataText = var1.readStringCp1252NullTerminated(); // L: 493 - int var2 = var1.readUnsignedByte(); // L: 494 - if (var2 > 0) { // L: 495 - this.actions = new String[var2]; // L: 496 + this.flags = var1.readMedium(); + this.dataText = var1.readStringCp1252NullTerminated(); + int var2 = var1.readUnsignedByte(); + if (var2 > 0) { + this.actions = new String[var2]; - for (int var3 = 0; var3 < var2; ++var3) { // L: 497 + for (int var3 = 0; var3 < var2; ++var3) { this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); // L: 499 - this.dragThreshold = var1.readUnsignedByte(); // L: 500 - this.isScrollBar = var1.readUnsignedByte() == 1; // L: 501 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 502 - this.onLoad = this.readListener(var1); // L: 503 - this.onMouseOver = this.readListener(var1); // L: 504 - this.onMouseLeave = this.readListener(var1); // L: 505 - this.onTargetLeave = this.readListener(var1); // L: 506 - this.onTargetEnter = this.readListener(var1); // L: 507 - this.onVarTransmit = this.readListener(var1); // L: 508 - this.onInvTransmit = this.readListener(var1); // L: 509 - this.onStatTransmit = this.readListener(var1); // L: 510 - this.onTimer = this.readListener(var1); // L: 511 - this.onOp = this.readListener(var1); // L: 512 - this.onMouseRepeat = this.readListener(var1); // L: 513 - this.onClick = this.readListener(var1); // L: 514 - this.onClickRepeat = this.readListener(var1); // L: 515 - this.onRelease = this.readListener(var1); // L: 516 - this.onHold = this.readListener(var1); // L: 517 - this.onDrag = this.readListener(var1); // L: 518 - this.onDragComplete = this.readListener(var1); // L: 519 - this.onScroll = this.readListener(var1); // L: 520 - this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 521 - this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 522 - this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 523 - } // L: 524 + this.dragZoneSize = var1.readUnsignedByte(); + this.dragThreshold = var1.readUnsignedByte(); + this.isScrollBar = var1.readUnsignedByte() == 1; + this.spellActionName = var1.readStringCp1252NullTerminated(); + this.onLoad = this.readListener(var1); + this.onMouseOver = this.readListener(var1); + this.onMouseLeave = this.readListener(var1); + this.onTargetLeave = this.readListener(var1); + this.onTargetEnter = this.readListener(var1); + this.onVarTransmit = this.readListener(var1); + this.onInvTransmit = this.readListener(var1); + this.onStatTransmit = this.readListener(var1); + this.onTimer = this.readListener(var1); + this.onOp = this.readListener(var1); + this.onMouseRepeat = this.readListener(var1); + this.onClick = this.readListener(var1); + this.onClickRepeat = this.readListener(var1); + this.onRelease = this.readListener(var1); + this.onHold = this.readListener(var1); + this.onDrag = this.readListener(var1); + this.onDragComplete = this.readListener(var1); + this.onScroll = this.readListener(var1); + this.varTransmitTriggers = this.readListenerTriggers(var1); + this.invTransmitTriggers = this.readListenerTriggers(var1); + this.statTransmitTriggers = this.readListenerTriggers(var1); + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnt;I)[Ljava/lang/Object;", - garbageValue = "535834146" + descriptor = "(Lnv;I)[Ljava/lang/Object;", + garbageValue = "-2023401750" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 527 - if (var2 == 0) { // L: 528 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { return null; } else { - Object[] var3 = new Object[var2]; // L: 529 + Object[] var3 = new Object[var2]; - for (int var4 = 0; var4 < var2; ++var4) { // L: 530 - int var5 = var1.readUnsignedByte(); // L: 531 + for (int var4 = 0; var4 < var2; ++var4) { + int var5 = var1.readUnsignedByte(); if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 532 - } else if (var5 == 1) { // L: 533 + var3[var4] = new Integer(var1.readInt()); + } else if (var5 == 1) { var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 535 - return var3; // L: 536 + this.hasListener = true; + return var3; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnv;I)[I", + garbageValue = "-539742690" + ) + @Export("readListenerTriggers") + int[] readListenerTriggers(Buffer var1) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return null; + } else { + int[] var3 = new int[var2]; + + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = var1.readInt(); + } + + return var3; + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "59021697" + ) + @Export("swapItems") + public void swapItems(int var1, int var2) { + int var3 = this.itemIds[var2]; + this.itemIds[var2] = this.itemIds[var1]; + this.itemIds[var1] = var3; + var3 = this.itemQuantities[var2]; + this.itemQuantities[var2] = this.itemQuantities[var1]; + this.itemQuantities[var1] = var3; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ZB)Lom;", + garbageValue = "-125" + ) + @Export("getSprite") + public SpritePixels getSprite(boolean var1) { + field2955 = false; + int var2; + if (var1) { + var2 = this.spriteId; + } else { + var2 = this.spriteId2; + } + + if (var2 == -1) { + return null; + } else { + long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); + if (var5 != null) { + return var5; + } else { + var5 = ViewportMouse.SpriteBuffer_getSprite(SoundSystem.Widget_spritesArchive, var2, 0); + if (var5 == null) { + field2955 = true; + return null; + } else { + if (this.spriteFlipV) { + var5.flipVertically(); + } + + if (this.spriteFlipH) { + var5.flipHorizontally(); + } + + if (this.outline > 0) { + var5.pad(this.outline); + } + + if (this.outline >= 1) { + var5.outline(1); + } + + if (this.outline >= 2) { + var5.outline(16777215); + } + + if (this.spriteShadow != 0) { + var5.shadow(this.spriteShadow); + } + + Widget_cachedSprites.put(var5, var3); + return var5; + } + } + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Lkt;", + garbageValue = "-804215048" + ) + @Export("getFont") + public Font getFont() { + field2955 = false; + if (this.fontId == -1) { + return null; + } else { + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); + if (var1 != null) { + return var1; + } else { + var1 = class251.method4840(SoundSystem.Widget_spritesArchive, Login.Widget_fontsArchive, this.fontId, 0); + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); + } else { + field2955 = true; + } + + return var1; + } } } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnt;B)[I", - garbageValue = "-86" - ) - @Export("readListenerTriggers") - int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 540 - if (var2 == 0) { // L: 541 - return null; - } else { - int[] var3 = new int[var2]; // L: 542 - - for (int var4 = 0; var4 < var2; ++var4) { // L: 543 - var3[var4] = var1.readInt(); // L: 544 - } - - return var3; // L: 546 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-103507162" - ) - @Export("swapItems") - public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; // L: 550 - this.itemIds[var2] = this.itemIds[var1]; // L: 551 - this.itemIds[var1] = var3; // L: 552 - var3 = this.itemQuantities[var2]; // L: 553 - this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 554 - this.itemQuantities[var1] = var3; // L: 555 - } // L: 556 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(ZB)Loa;", - garbageValue = "32" - ) - @Export("getSprite") - public SpritePixels getSprite(boolean var1) { - field2958 = false; // L: 559 - int var2; - if (var1) { // L: 561 - var2 = this.spriteId; - } else { - var2 = this.spriteId2; // L: 562 - } - - if (var2 == -1) { // L: 563 - return null; - } else { - long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 564 - SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 565 - if (var5 != null) { // L: 566 - return var5; - } else { - var5 = Tile.SpriteBuffer_getSprite(class44.Widget_spritesArchive, var2, 0); // L: 567 - if (var5 == null) { // L: 568 - field2958 = true; // L: 569 - return null; // L: 570 - } else { - if (this.spriteFlipV) { // L: 572 - var5.flipVertically(); - } - - if (this.spriteFlipH) { // L: 573 - var5.flipHorizontally(); - } - - if (this.outline > 0) { // L: 574 - var5.pad(this.outline); - } - - if (this.outline >= 1) { // L: 575 - var5.outline(1); - } - - if (this.outline >= 2) { // L: 576 - var5.outline(16777215); - } - - if (this.spriteShadow != 0) { // L: 577 - var5.shadow(this.spriteShadow); - } - - Widget_cachedSprites.put(var5, var3); // L: 578 - return var5; // L: 579 - } - } - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)Lkj;", - garbageValue = "-1064213642" - ) - @Export("getFont") - public Font getFont() { - field2958 = false; // L: 583 - if (this.fontId == -1) { // L: 584 - return null; - } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 585 - if (var1 != null) { // L: 586 - return var1; - } else { - var1 = Bounds.method6034(class44.Widget_spritesArchive, ChatChannel.Widget_fontsArchive, this.fontId, 0); // L: 587 - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); // L: 588 - } else { - field2958 = true; // L: 589 - } - - return var1; // L: 590 - } - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IB)Loa;", - garbageValue = "39" + descriptor = "(II)Lom;", + garbageValue = "1502130498" ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field2958 = false; // L: 594 - if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 595 - int var2 = this.inventorySprites[var1]; // L: 596 - if (var2 == -1) { // L: 597 + field2955 = false; + if (var1 >= 0 && var1 < this.inventorySprites.length) { + int var2 = this.inventorySprites[var1]; + if (var2 == -1) { return null; } else { - SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 598 - if (var3 != null) { // L: 599 + SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); + if (var3 != null) { return var3; } else { - var3 = Tile.SpriteBuffer_getSprite(class44.Widget_spritesArchive, var2, 0); // L: 600 - if (var3 != null) { // L: 601 + var3 = ViewportMouse.SpriteBuffer_getSprite(SoundSystem.Widget_spritesArchive, var2, 0); + if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { - field2958 = true; // L: 602 + field2955 = true; } - return var3; // L: 603 + return var3; } } } else { @@ -1370,163 +1380,210 @@ public class Widget extends Node { @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lfm;IZLih;B)Lgd;", - garbageValue = "-1" + descriptor = "(Lfz;IZLih;B)Lgl;", + garbageValue = "-53" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field2958 = false; // L: 607 + field2955 = false; int var5; int var6; - if (var3) { // L: 610 - var5 = this.modelType2; // L: 611 - var6 = this.modelId2; // L: 612 + if (var3) { + var5 = this.modelType2; + var6 = this.modelId2; } else { - var5 = this.modelType; // L: 615 - var6 = this.modelId; // L: 616 + var5 = this.modelType; + var6 = this.modelId; } - if (var5 == 0) { // L: 618 + if (var5 == 0) { return null; - } else if (var5 == 1 && var6 == -1) { // L: 619 + } else if (var5 == 1 && var6 == -1) { return null; } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 620 - if (var7 == null) { // L: 621 + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); + if (var7 == null) { ModelData var8; - if (var5 == 1) { // L: 623 - var8 = ModelData.ModelData_get(class375.Widget_modelsArchive, var6, 0); // L: 624 - if (var8 == null) { // L: 625 - field2958 = true; // L: 626 - return null; // L: 627 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 629 - } - - if (var5 == 2) { // L: 631 - var8 = class248.getNpcDefinition(var6).getModelData(); // L: 632 - if (var8 == null) { // L: 633 - field2958 = true; // L: 634 - return null; // L: 635 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 637 - } - - if (var5 == 3) { // L: 639 - if (var4 == null) { // L: 640 + if (var5 == 1) { + var8 = ModelData.ModelData_get(UserComparator3.Widget_modelsArchive, var6, 0); + if (var8 == null) { + field2955 = true; return null; } - var8 = var4.getModelData(); // L: 641 - if (var8 == null) { // L: 642 - field2958 = true; // L: 643 - return null; // L: 644 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 646 + var7 = var8.toModel(64, 768, -50, -10, -50); } - if (var5 == 4) { // L: 648 - ItemComposition var9 = class250.ItemDefinition_get(var6); // L: 649 - var8 = var9.getModelData(10); // L: 650 - if (var8 == null) { // L: 651 - field2958 = true; // L: 652 - return null; // L: 653 + if (var5 == 2) { + var8 = UserComparator6.getNpcDefinition(var6).getModelData(); + if (var8 == null) { + field2955 = true; + return null; } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 655 + var7 = var8.toModel(64, 768, -50, -10, -50); } - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 657 + if (var5 == 3) { + if (var4 == null) { + return null; + } + + var8 = var4.getModelData(); + if (var8 == null) { + field2955 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 4) { + ItemComposition var9 = KeyHandler.ItemDefinition_get(var6); + var8 = var9.getModelData(10); + if (var8 == null) { + field2955 = true; + return null; + } + + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); + } + + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); } - if (var1 != null) { // L: 659 - var7 = var1.transformWidgetModel(var7, var2); // L: 660 + if (var1 != null) { + var7 = var1.transformWidgetModel(var7, var2); } - return var7; // L: 662 + return var7; } } - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ZI)Liq;", - garbageValue = "-1028341940" + descriptor = "(ZI)Liy;", + garbageValue = "61831850" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 666 + if (this.spriteId == -1) { var1 = false; } - int var2 = var1 ? this.spriteId * -1019565859 * -1228050571 : this.spriteId2 * -241980903 * 218370601; // L: 667 - if (var2 == -1) { // L: 668 + int var2 = var1 ? this.spriteId * 1120294389 * 323350109 : this.spriteId2 * 998115163 * -2108501805; + if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 669 - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 670 - if (var5 != null) { // L: 671 + long var3 = ((long)this.spriteShadow << 40) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); + if (var5 != null) { return var5; } else { - SpritePixels var6 = this.getSprite(var1); // L: 672 - if (var6 == null) { // L: 673 + SpritePixels var6 = this.getSprite(var1); + if (var6 == null) { return null; } else { - SpritePixels var7 = var6.copyNormalized(); // L: 674 - int[] var8 = new int[var7.subHeight]; // L: 675 - int[] var9 = new int[var7.subHeight]; // L: 676 + SpritePixels var7 = var6.copyNormalized(); + int[] var8 = new int[var7.subHeight]; + int[] var9 = new int[var7.subHeight]; - for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 677 - int var11 = 0; // L: 678 - int var12 = var7.subWidth; // L: 679 + for (int var10 = 0; var10 < var7.subHeight; ++var10) { + int var11 = 0; + int var12 = var7.subWidth; int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 680 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 681 - var11 = var13; // L: 682 + for (var13 = 0; var13 < var7.subWidth; ++var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var11 = var13; break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 686 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 687 - var12 = var13 + 1; // L: 688 + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var12 = var13 + 1; break; } } - var8[var10] = var11; // L: 692 - var9[var10] = var12 - var11; // L: 693 + var8[var10] = var11; + var9[var10] = var12 - var11; } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 695 - Widget_cachedSpriteMasks.put(var5, var3); // L: 696 - return var5; // L: 697 + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); + Widget_cachedSpriteMasks.put(var5, var3); + return var5; } } } } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)V", - garbageValue = "16904" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "634412101" ) @Export("setAction") public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { // L: 701 - String[] var3 = new String[var1 + 1]; // L: 702 - if (this.actions != null) { // L: 703 - for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 704 + if (this.actions == null || this.actions.length <= var1) { + String[] var3 = new String[var1 + 1]; + if (this.actions != null) { + for (int var4 = 0; var4 < this.actions.length; ++var4) { var3[var4] = this.actions[var4]; } } - this.actions = var3; // L: 706 + this.actions = var3; } - this.actions[var1] = var2; // L: 708 - } // L: 709 + this.actions[var1] = var2; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1835381046" + ) + public static void method4799() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3556 != 0) { + ArchiveDiskActionHandler.field3556 = 1; + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var3) { + } + } + + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "341363554" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + } + } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 383c657925..fc9a38adc2 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -3,332 +3,552 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bk") +@ObfuscatedName("ag") @Implements("World") public class World { - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "[Lbk;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1728801439 + intValue = 905296399 ) @Export("World_count") static int World_count; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1039031469 + intValue = 1830002793 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ldc;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("z") + @ObfuscatedName("ax") + static String field703; + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1045630855 + intValue = -992799563 + ) + static int field704; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1006045597 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 425898455 + intValue = -714166791 ) @Export("properties") int properties; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -372282787 + intValue = -660884907 ) @Export("population") int population; @ObfuscatedName("k") @Export("host") String host; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("activity") String activity; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1961893903 + intValue = 412963803 ) @Export("location") int location; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 724778095 + intValue = -653220775 ) @Export("index") int index; static { - World_count = 0; // L: 14 - World_listCount = 0; // L: 15 - World_sortOption2 = new int[]{1, 1, 1, 1}; // L: 16 - World_sortOption1 = new int[]{0, 1, 2, 3}; // L: 17 + World_count = 0; + World_listCount = 0; + World_sortOption2 = new int[]{1, 1, 1, 1}; + World_sortOption1 = new int[]{0, 1, 2, 3}; } World() { - } // L: 27 + } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1633198198" + garbageValue = "-454749985" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; // L: 247 + return (1 & this.properties) != 0; } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-896740127" + descriptor = "(B)Z", + garbageValue = "1" ) - boolean method1749() { - return (2 & this.properties) != 0; // L: 251 + boolean method1386() { + return (2 & this.properties) != 0; } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1876446967" + descriptor = "(B)Z", + garbageValue = "1" ) @Export("isPvp") boolean isPvp() { - return (4 & this.properties) != 0; // L: 255 + return (4 & this.properties) != 0; } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2071254222" + garbageValue = "2006116192" ) - boolean method1757() { - return (8 & this.properties) != 0; // L: 259 + boolean method1388() { + return (8 & this.properties) != 0; } @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1854711947" + garbageValue = "664504666" ) @Export("isDeadman") boolean isDeadman() { - return (536870912 & this.properties) != 0; // L: 263 + return (536870912 & this.properties) != 0; } - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "39105033" + garbageValue = "1093479426" ) @Export("isBeta") boolean isBeta() { - return (33554432 & this.properties) != 0; // L: 267 + return (33554432 & this.properties) != 0; } - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-31490" + descriptor = "(B)Z", + garbageValue = "-82" ) - boolean method1778() { - return (1073741824 & this.properties) != 0; // L: 271 + boolean method1408() { + return (1073741824 & this.properties) != 0; } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2001631546" + descriptor = "(II)Lfz;", + garbageValue = "-1904310882" ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; // L: 63 - int[] var3 = new int[4]; // L: 64 - var2[0] = var0; // L: 65 - var3[0] = var1; // L: 66 - int var4 = 1; // L: 67 - - for (int var5 = 0; var5 < 4; ++var5) { // L: 68 - if (World_sortOption1[var5] != var0) { // L: 69 - var2[var4] = World_sortOption1[var5]; // L: 70 - var3[var4] = World_sortOption2[var5]; // L: 71 - ++var4; // L: 72 - } - } - - World_sortOption1 = var2; // L: 75 - World_sortOption2 = var3; // L: 76 - FileSystem.sortWorlds(World_worlds, 0, World_worlds.length - 1, World_sortOption1, World_sortOption2); // L: 77 - } // L: 78 - - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(Lcl;IS)V", - garbageValue = "-356" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - if (var0.field1276 >= Client.cycle) { // L: 4089 - Messages.method2461(var0); - } else if (var0.field1269 >= Client.cycle) { // L: 4090 - WorldMapLabelSize.method3279(var0); + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - SoundCache.method930(var0); // L: 4091 - } + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4092 - var0.sequence = -1; // L: 4093 - var0.spotAnimation = -1; // L: 4094 - var0.field1276 = 0; // L: 4095 - var0.field1269 = 0; // L: 4096 - var0.x = var0.pathX[0] * 128 + var0.field1225 * 64; // L: 4097 - var0.y = var0.field1225 * 64 + var0.pathY[0] * 128; // L: 4098 - var0.method2263(); // L: 4099 + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; } + } - if (class262.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4101 4102 - var0.sequence = -1; // L: 4103 - var0.spotAnimation = -1; // L: 4104 - var0.field1276 = 0; // L: 4105 - var0.field1269 = 0; // L: 4106 - var0.x = var0.field1225 * 64 + var0.pathX[0] * 128; // L: 4107 - var0.y = var0.field1225 * 64 + var0.pathY[0] * 128; // L: 4108 - var0.method2263(); // L: 4109 - } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;B)V", + garbageValue = "-53" + ) + public static void method1403(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; + GrandExchangeOfferAgeComparator.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + } - if (var0.field1275 != 0) { // L: 4113 - if (var0.targetIndex != -1) { // L: 4114 - Object var2 = null; // L: 4115 - if (var0.targetIndex < 32768) { // L: 4116 - var2 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 4117 - var2 = Client.players[var0.targetIndex - 32768]; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1437037171" + ) + static void method1427(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { + int var5 = 0; + if (var1 > var4.field722) { + var5 += var1 - var4.field722; + } else if (var1 < var4.x) { + var5 += var4.x - var1; } - if (var2 != null) { // L: 4118 - int var3 = var0.x - ((Actor)var2).x; // L: 4119 - int var4 = var0.y - ((Actor)var2).y; // L: 4120 - if (var3 != 0 || var4 != 0) { // L: 4121 - var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; - } - } else if (var0.false0) { // L: 4123 - var0.targetIndex = -1; // L: 4124 - var0.false0 = false; // L: 4125 + if (var2 > var4.field723) { + var5 += var2 - var4.field723; + } else if (var2 < var4.y) { + var5 += var4.y - var2; } - } - if (var0.field1280 != -1 && (var0.pathLength == 0 || var0.field1242 > 0)) { // L: 4128 - var0.orientation = var0.field1280; // L: 4129 - var0.field1280 = -1; // L: 4130 - } - - int var5 = var0.orientation - var0.rotation & 2047; // L: 4132 - if (var5 == 0 && var0.false0) { // L: 4133 - var0.targetIndex = -1; // L: 4134 - var0.false0 = false; // L: 4135 - } - - if (var5 != 0) { // L: 4137 - ++var0.field1274; // L: 4138 - boolean var7; - if (var5 > 1024) { // L: 4139 - var0.rotation -= var0.field1275; // L: 4140 - var7 = true; // L: 4141 - if (var5 < var0.field1275 || var5 > 2048 - var0.field1275) { // L: 4142 - var0.rotation = var0.orientation; // L: 4143 - var7 = false; // L: 4144 + if (var5 - 64 <= var4.field718 && Decimator.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; } - if (var0.idleSequence == var0.movementSequence && (var0.field1274 > 25 || var7)) { // L: 4146 - if (var0.turnLeftSequence != -1) { // L: 4147 - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 4148 + int var6 = (var4.field718 - var5) * Decimator.clientPreferences.areaSoundEffectsVolume / var4.field718; + if (var4.stream1 == null) { + if (var4.soundEffectId >= 0) { + SoundEffect var7 = SoundEffect.readSoundEffect(InvDefinition.archive4, var4.soundEffectId, 0); + if (var7 != null) { + RawSound var8 = var7.toRawSound().resample(FloorOverlayDefinition.decimator); + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); + var9.setNumLoops(-1); + TileItem.pcmStreamMixer.addSubStream(var9); + var4.stream1 = var9; + } + } + } else { + var4.stream1.method557(var6); + } + + if (var4.stream2 == null) { + if (var4.soundEffectIds != null && (var4.field725 -= var3) <= 0) { + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); + SoundEffect var12 = SoundEffect.readSoundEffect(InvDefinition.archive4, var4.soundEffectIds[var11], 0); + if (var12 != null) { + RawSound var13 = var12.toRawSound().resample(FloorOverlayDefinition.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); + var10.setNumLoops(0); + TileItem.pcmStreamMixer.addSubStream(var10); + var4.stream2 = var10; + var4.field725 = var4.field727 + (int)(Math.random() * (double)(var4.field728 - var4.field727)); + } + } + } else { + var4.stream2.method557(var6); + if (!var4.stream2.hasNext()) { + var4.stream2 = null; } } } else { - var0.rotation += var0.field1275; // L: 4152 - var7 = true; // L: 4153 - if (var5 < var0.field1275 || var5 > 2048 - var0.field1275) { // L: 4154 - var0.rotation = var0.orientation; // L: 4155 - var7 = false; // L: 4156 + if (var4.stream1 != null) { + TileItem.pcmStreamMixer.removeSubStream(var4.stream1); + var4.stream1 = null; } - if (var0.idleSequence == var0.movementSequence && (var0.field1274 > 25 || var7)) { // L: 4158 - if (var0.turnRightSequence != -1) { // L: 4159 - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 4160 - } + if (var4.stream2 != null) { + TileItem.pcmStreamMixer.removeSubStream(var4.stream2); + var4.stream2 = null; } } - - var0.rotation &= 2047; // L: 4164 - } else { - var0.field1274 = 0; // L: 4166 } } - class0.method11(var0); // L: 4168 - } // L: 4169 + } - @ObfuscatedName("gq") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lcj;IIB)V", - garbageValue = "2" + descriptor = "(Lab;I)V", + garbageValue = "898281144" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 4371 - int var3 = WorldMapScaleHandler.SequenceDefinition_get(var1).field1894; // L: 4372 - if (var3 == 1) { // L: 4373 - var0.sequenceFrame = 0; // L: 4374 - var0.sequenceFrameCycle = 0; // L: 4375 - var0.sequenceDelay = var2; // L: 4376 - var0.field1258 = 0; // L: 4377 - } + public static final void method1428(PlayerProvider var0) { + class181.pcmPlayerProvider = var0; + } - if (var3 == 2) { // L: 4379 - var0.field1258 = 0; // L: 4380 + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "884458837" + ) + static int method1404(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MusicPatch.getWindowedMode(); + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + WorldMapLabelSize.setWindowedMode(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 5311) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 5312) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 5350) { + class1.Interpreter_stringStackSize -= 2; + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 5351) { + --class1.Interpreter_stringStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + Decimator.clientPreferences.windowMode = var3; + MilliClock.savePreferences(); + } + + return 1; } - } else if (var1 == -1 || var0.sequence == -1 || WorldMapScaleHandler.SequenceDefinition_get(var1).field1892 >= WorldMapScaleHandler.SequenceDefinition_get(var0.sequence).field1892) { // L: 4383 - var0.sequence = var1; // L: 4384 - var0.sequenceFrame = 0; // L: 4385 - var0.sequenceFrameCycle = 0; // L: 4386 - var0.sequenceDelay = var2; // L: 4387 - var0.field1258 = 0; // L: 4388 - var0.field1281 = var0.pathLength; // L: 4389 } + } - } // L: 4391 + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "-55" + ) + static int method1420(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Strings.loadWorlds() ? 1 : 0; + return 1; + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var9 = WorldMapAreaData.worldListStart(); + if (var9 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var9 = class112.getNextWorldListWorld(); + if (var9 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = null; + + for (var8 = 0; var8 < World_count; ++var8) { + if (var3 == class15.World_worlds[var8].id) { + var7 = class15.World_worlds[var8]; + break; + } + } + + if (var7 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; + User.sortWorldList(var3, var10, var8, var6); + return 1; + } else if (var0 != 6511) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = PacketBuffer.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = UserComparator6.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator6.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = PacketBuffer.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ClanChannel.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannel.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = PacketBuffer.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = KeyHandler.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = PacketBuffer.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = class101.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class101.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType & 3; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { + return 1; + } else if (var0 == 6522) { + --class1.Interpreter_stringStackSize; + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --class1.Interpreter_stringStackSize; + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6527) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field473; + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 >= 0 && var3 < World_count) { + var7 = class15.World_worlds[var3]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } + } + } + + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "(Lbx;I)V", + garbageValue = "974206995" + ) + static final void method1426(Actor var0) { + int var1 = Math.max(1, var0.field1073 - Client.cycle); + int var2 = var0.field1023 * 64 + var0.field1062 * 128; + int var3 = var0.field1023 * 64 + var0.field1064 * 128; + var0.x += (var2 - var0.x) / var1; + var0.y += (var3 - var0.y) / var1; + var0.field1078 = 0; + var0.orientation = var0.field1050; + } @ObfuscatedName("kp") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1994807431" + descriptor = "(II)V", + garbageValue = "-1663952017" ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - class233.method4541(); // L: 11436 - if (class289.friendsChat != null) { // L: 11437 - class289.friendsChat.invalidateIgnoreds(); // L: 11438 + static void method1425(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { + if ((long)var0 == (var1.key >> 48 & 65535L)) { + var1.remove(); + } } - } // L: 11440 + } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 7670e4bf67..9e8dbb474f 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,1443 +10,1439 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("mr") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmk;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lkt;" ) @Export("font") Font font; @ObfuscatedName("k") @Export("fonts") HashMap fonts; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "[Lof;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("t") + @ObfuscatedName("q") @Export("details") HashMap details; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "Lfa;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("u") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "Lfa;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lfa;" ) - WorldMapArea field4007; - @ObfuscatedName("s") + WorldMapArea field4036; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "Lfx;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmp;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -24822515 + intValue = 1628267317 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1439876257 + intValue = 1511757897 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 824727721 + intValue = 216670445 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -495123055 + intValue = -514238391 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("zoom") float zoom; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1381841547 + intValue = -1589960541 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 2081300499 + intValue = 83938015 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -2113167105 + intValue = -1937188867 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -702073087 + intValue = -1675873535 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1344926445 + intValue = -36251931 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 642877669 + intValue = 1664338223 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ag") + @ObfuscatedName("ax") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("ab") + @ObfuscatedName("au") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("aq") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 947484267 + intValue = -1955228711 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ae") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -2115600229 + intValue = 1605223935 ) @Export("flashCycle") int flashCycle; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -294067895 + intValue = -497325363 ) - int field4011; - @ObfuscatedName("an") + int field4055; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 987503049 + intValue = -1272167399 ) - int field4027; - @ObfuscatedName("al") + int field4056; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1736170551 + intValue = -2062078255 ) - int field4028; + int field4078; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 655380945 + intValue = -1022401913 ) - int field4022; - @ObfuscatedName("ac") + int field4058; + @ObfuscatedName("at") @ObfuscatedGetter( - longValue = -1876007755272833433L + longValue = 6861752418095551451L ) - long field3992; - @ObfuscatedName("as") + long field4071; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1902935505 + intValue = -670328439 ) - int field3996; - @ObfuscatedName("au") + int field4060; + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -2007971713 + intValue = 179997453 ) - int field4032; + int field4061; @ObfuscatedName("ay") - boolean field4033; - @ObfuscatedName("ai") + boolean field4062; + @ObfuscatedName("ag") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("av") + @ObfuscatedName("ai") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ax") + @ObfuscatedName("ad") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ar") - HashSet field4037; - @ObfuscatedName("af") + @ObfuscatedName("ac") + HashSet field4022; + @ObfuscatedName("aw") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bq") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -1319766615 + intValue = -159186499 ) - int field3999; - @ObfuscatedName("bi") + int field4068; + @ObfuscatedName("br") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bz") - List field4041; - @ObfuscatedName("bb") + @ObfuscatedName("by") + List field4070; + @ObfuscatedName("bv") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bv") - HashSet field4043; - @ObfuscatedName("bc") + @ObfuscatedName("bf") + HashSet field4072; + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lij;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("be") + @ObfuscatedName("bg") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("ba") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lom;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 451764491 + intValue = -201192225 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("br") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 2118190899 + intValue = 1460235991 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1403776455 + intValue = 1434985843 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("by") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 736851519 + intValue = 277175981 ) - int field4026; + int field4079; static { - fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 - fontNameVerdana13 = FontName.FontName_verdana13; // L: 47 - fontNameVerdana15 = FontName.FontName_verdana15; // L: 48 + fontNameVerdana11 = FontName.FontName_verdana11; + fontNameVerdana13 = FontName.FontName_verdana13; + fontNameVerdana15 = FontName.FontName_verdana15; } public WorldMap() { - this.worldMapTargetX = -1; // L: 60 - this.worldMapTargetY = -1; // L: 61 - this.worldMapDisplayWidth = -1; // L: 64 - this.worldMapDisplayHeight = -1; // L: 65 - this.worldMapDisplayX = -1; // L: 66 - this.worldMapDisplayY = -1; // L: 67 - this.maxFlashCount = 3; // L: 68 - this.cyclesPerFlash = 50; // L: 69 - this.perpetualFlash = false; // L: 70 - this.flashingElements = null; // L: 71 - this.flashCount = -1; // L: 72 - this.flashCycle = -1; // L: 73 - this.field4011 = -1; // L: 74 - this.field4027 = -1; // L: 75 - this.field4028 = -1; // L: 76 - this.field4022 = -1; // L: 77 - this.field4033 = true; // L: 81 - this.enabledElements = new HashSet(); // L: 84 - this.enabledCategories = new HashSet(); // L: 85 - this.enabledElementIds = new HashSet(); // L: 86 - this.field4037 = new HashSet(); // L: 87 - this.elementsDisabled = false; // L: 88 - this.field3999 = 0; // L: 89 - this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4043 = 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.field4026 = -1; // L: 101 + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; + this.worldMapDisplayWidth = -1; + this.worldMapDisplayHeight = -1; + this.worldMapDisplayX = -1; + this.worldMapDisplayY = -1; + this.maxFlashCount = 3; + this.cyclesPerFlash = 50; + this.perpetualFlash = false; + this.flashingElements = null; + this.flashCount = -1; + this.flashCycle = -1; + this.field4055 = -1; + this.field4056 = -1; + this.field4078 = -1; + this.field4058 = -1; + this.field4062 = true; + this.enabledElements = new HashSet(); + this.enabledCategories = new HashSet(); + this.enabledElementIds = new HashSet(); + this.field4022 = new HashSet(); + this.elementsDisabled = false; + this.field4068 = 0; + this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; + this.field4072 = new HashSet(); + this.mouseCoord = null; + this.showCoord = false; + this.minCachedTileX = -1; + this.minCachedTileY = -1; + this.field4079 = -1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljp;Lkj;Ljava/util/HashMap;[Lof;I)V", - garbageValue = "-1791711936" + descriptor = "(Ljy;Ljy;Ljy;Lkt;Ljava/util/HashMap;[Lof;I)V", + garbageValue = "834352167" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { - this.mapSceneSprites = var6; // L: 105 - this.WorldMap_archive = var1; // L: 106 - this.WorldMap_geographyArchive = var2; // L: 107 - this.WorldMap_groundArchive = var3; // L: 108 - this.font = var4; // L: 109 - this.fonts = new HashMap(); // L: 110 - this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); // L: 111 - this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112 - this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113 - this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114 - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2131.name); // L: 115 - int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 - this.details = new HashMap(var8.length); // L: 117 + this.mapSceneSprites = var6; + this.WorldMap_archive = var1; + this.WorldMap_geographyArchive = var2; + this.WorldMap_groundArchive = var3; + this.font = var4; + this.fonts = new HashMap(); + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); + this.cacheLoader = new WorldMapArchiveLoader(var1); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2117.name); + int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); + this.details = new HashMap(var8.length); - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 118 - Buffer var10 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var9])); // L: 119 - WorldMapArea var11 = new WorldMapArea(); // L: 120 - var11.read(var10, var8[var9]); // L: 121 - this.details.put(var11.getInternalName(), var11); // L: 122 - if (var11.getIsMain()) { // L: 123 - this.mainMapArea = var11; // L: 124 + for (int var9 = 0; var9 < var8.length; ++var9) { + Buffer var10 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var9])); + WorldMapArea var11 = new WorldMapArea(); + var11.read(var10, var8[var9]); + this.details.put(var11.getInternalName(), var11); + if (var11.getIsMain()) { + this.mainMapArea = var11; } } - this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4007 = null; // L: 128 - } // L: 129 + this.setCurrentMapArea(this.mainMapArea); + this.field4036 = null; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" + descriptor = "(I)V", + garbageValue = "-767540884" ) - public void method6239() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 - } // L: 135 + public void method6324() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIZIIIIB)V", - garbageValue = "4" + descriptor = "(IIZIIIII)V", + garbageValue = "-1961674095" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if (this.cacheLoader.isLoaded()) { // L: 138 - this.smoothZoom(); // L: 141 - this.scrollToTarget(); // L: 142 - if (var3) { // L: 143 - int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146 - int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147 - List var10 = this.worldMapManager.method3526(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148 - HashSet var11 = new HashSet(); // L: 149 + if (this.cacheLoader.isLoaded()) { + this.smoothZoom(); + this.scrollToTarget(); + if (var3) { + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); + List var10 = this.worldMapManager.method3480(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); WorldMapSection1.runScriptEvent(var14)) { // L: 150 163 - var13 = (AbstractWorldMapIcon)var12.next(); // L: 151 - var11.add(var13); // L: 153 - var14 = new ScriptEvent(); // L: 154 - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155 - var14.setArgs(new Object[]{var15, var1, var2}); // L: 156 - if (this.field4043.contains(var13)) { // L: 157 - var14.setType(17); // L: 158 + for (var12 = var10.iterator(); var12.hasNext(); UserComparator10.runScriptEvent(var14)) { + var13 = (AbstractWorldMapIcon)var12.next(); + var11.add(var13); + var14 = new ScriptEvent(); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); + var14.setArgs(new Object[]{var15, var1, var2}); + if (this.field4072.contains(var13)) { + var14.setType(17); } else { - var14.setType(15); // L: 161 + var14.setType(15); } } - var12 = this.field4043.iterator(); // L: 166 + var12 = this.field4072.iterator(); while (var12.hasNext()) { - var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 - if (!var11.contains(var13)) { // L: 169 - var14 = new ScriptEvent(); // L: 170 - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171 - var14.setArgs(new Object[]{var15, var1, var2}); // L: 172 - var14.setType(16); // L: 173 - WorldMapSection1.runScriptEvent(var14); // L: 174 + var13 = (AbstractWorldMapIcon)var12.next(); + if (!var11.contains(var13)) { + var14 = new ScriptEvent(); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); + var14.setArgs(new Object[]{var15, var1, var2}); + var14.setType(16); + UserComparator10.runScriptEvent(var14); } } - this.field4043 = var11; // L: 178 + this.field4072 = var11; } } - } // L: 139 144 179 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "-1544897880" - ) - public void method6133(int var1, int var2, boolean var3, boolean var4) { - long var5 = ClientPacket.currentTimeMillis(); // L: 182 - this.method6160(var1, var2, var4, var5); // L: 183 - if (this.hasTarget() || !var4 && !var3) { // L: 184 - this.method6138(); // L: 198 - } else { - if (var4) { // L: 185 - this.field4028 = var1; // L: 186 - this.field4022 = var2; // L: 187 - this.field4011 = this.centerTileX; // L: 188 - this.field4027 = this.centerTileY; // L: 189 - } - - if (this.field4011 != -1) { // L: 191 - int var7 = var1 - this.field4028; // L: 192 - int var8 = var2 - this.field4022; // L: 193 - this.setWorldMapPosition(this.field4011 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4027, false); // L: 194 - } - } - - if (var4) { // L: 200 - this.field3992 = var5; // L: 201 - this.field3996 = var1; // L: 202 - this.field4032 = var2; // L: 203 - } - - } // L: 205 + } @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIZZB)V", + garbageValue = "110" + ) + public void method6159(int var1, int var2, boolean var3, boolean var4) { + long var5 = UrlRequester.method2125(); + this.method6160(var1, var2, var4, var5); + if (this.hasTarget() || !var4 && !var3) { + this.method6164(); + } else { + if (var4) { + this.field4078 = var1; + this.field4058 = var2; + this.field4055 = this.centerTileX; + this.field4056 = this.centerTileY; + } + + if (this.field4055 != -1) { + int var7 = var1 - this.field4078; + int var8 = var2 - this.field4058; + this.setWorldMapPosition(this.field4055 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4056, false); + } + } + + if (var4) { + this.field4071 = var5; + this.field4060 = var1; + this.field4061 = var2; + } + + } + + @ObfuscatedName("l") void method6160(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea != null) { // L: 208 - int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209 - int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210 - this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211 - if (this.mouseCoord != null && var3) { // L: 212 - boolean var8 = Client.staffModLevel >= 2; // L: 215 - int var10; - int var11; - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 217 - int var14 = this.mouseCoord.x; // L: 218 - var10 = this.mouseCoord.y; // L: 219 - var11 = this.mouseCoord.plane; // L: 220 - PacketBufferNode var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); // L: 223 - var12.packetBuffer.writeShort(var14); // L: 224 - var12.packetBuffer.method6659(0); // L: 225 - var12.packetBuffer.method6640(var11); // L: 226 - var12.packetBuffer.method6648(var10); // L: 227 - Client.packetWriter.addNode(var12); // L: 228 + if (this.currentMapArea != null) { + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); + if (this.mouseCoord != null && var3) { + if (KitDefinition.method2779() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + class342.method6089(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); } else { - boolean var9 = true; // L: 232 - if (this.field4033) { // L: 233 - var10 = var1 - this.field3996; // L: 234 - var11 = var2 - this.field4032; // L: 235 - if (var4 - this.field3992 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 236 - var9 = false; // L: 237 + boolean var8 = true; + if (this.field4062) { + int var9 = var1 - this.field4060; + int var10 = var2 - this.field4061; + if (var4 - this.field4071 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { + var8 = false; } } - if (var9) { // L: 240 - PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2575, Client.packetWriter.isaacCipher); // L: 241 - var13.packetBuffer.writeIntME(this.mouseCoord.packed()); // L: 242 - Client.packetWriter.addNode(var13); // L: 243 - this.field3992 = 0L; // L: 244 + if (var8) { + PacketBufferNode var11 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2666, Client.packetWriter.isaacCipher); + var11.packetBuffer.method6701(this.mouseCoord.packed()); + Client.packetWriter.addNode(var11); + this.field4071 = 0L; } } } } else { - this.mouseCoord = null; // L: 249 + this.mouseCoord = null; } - } // L: 250 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "590329191" + ) + @Export("smoothZoom") + void smoothZoom() { + if (class367.field4127 != null) { + this.zoom = this.zoomTarget; + } else { + if (this.zoom < this.zoomTarget) { + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); + } + + if (this.zoom > this.zoomTarget) { + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); + } + + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-926352495" + ) + @Export("scrollToTarget") + void scrollToTarget() { + if (this.hasTarget()) { + int var1 = this.worldMapTargetX - this.centerTileX; + int var2 = this.worldMapTargetY - this.centerTileY; + if (var1 != 0) { + var1 /= Math.min(8, Math.abs(var1)); + } + + if (var2 != 0) { + var2 /= Math.min(8, Math.abs(var2)); + } + + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); + if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; + } + + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "1694217384" + ) + @Export("setWorldMapPosition") + final void setWorldMapPosition(int var1, int var2, boolean var3) { + this.centerTileX = var1; + this.centerTileY = var2; + UrlRequester.method2125(); + if (var3) { + this.method6164(); + } + + } @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1153461919" + garbageValue = "1587600388" ) - @Export("smoothZoom") - void smoothZoom() { - if (LoginPacket.field2800 != null) { // L: 253 - this.zoom = this.zoomTarget; // L: 254 - } else { - if (this.zoom < this.zoomTarget) { // L: 257 - this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 258 - } - - if (this.zoom > this.zoomTarget) { // L: 260 - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 261 - } - - } - } // L: 255 263 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1583682530" - ) - @Export("scrollToTarget") - void scrollToTarget() { - if (this.hasTarget()) { // L: 266 - int var1 = this.worldMapTargetX - this.centerTileX; // L: 269 - int var2 = this.worldMapTargetY - this.centerTileY; // L: 270 - if (var1 != 0) { // L: 271 - var1 /= Math.min(8, Math.abs(var1)); // L: 272 - } - - if (var2 != 0) { // L: 274 - var2 /= Math.min(8, Math.abs(var2)); // L: 275 - } - - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 277 - if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 278 - this.worldMapTargetX = -1; // L: 279 - this.worldMapTargetY = -1; // L: 280 - } - - } - } // L: 267 282 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-962488922" - ) - @Export("setWorldMapPosition") - final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; // L: 285 - this.centerTileY = var2; // L: 286 - ClientPacket.currentTimeMillis(); // L: 287 - if (var3) { - this.method6138(); // L: 288 - } - - } // L: 289 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "259207971" - ) - final void method6138() { - this.field4022 = -1; // L: 292 - this.field4028 = -1; // L: 293 - this.field4027 = -1; // L: 294 - this.field4011 = -1; // L: 295 - } // L: 296 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-89" - ) - @Export("hasTarget") - boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 299 + final void method6164() { + this.field4058 = -1; + this.field4078 = -1; + this.field4056 = -1; + this.field4055 = -1; } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIIB)Lfa;", - garbageValue = "-8" - ) - @Export("mapAreaAtCoord") - public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); // L: 303 - - WorldMapArea var5; - do { - if (!var4.hasNext()) { // L: 310 - return null; // L: 311 - } - - var5 = (WorldMapArea)var4.next(); // L: 304 - } while(!var5.containsCoord(var1, var2, var3)); // L: 306 - - return var5; // L: 307 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "2011089652" - ) - public void method6287(int var1, int var2, int var3, boolean var4) { - WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 315 - if (var5 == null) { // L: 316 - if (!var4) { // L: 317 - return; // L: 320 - } - - var5 = this.mainMapArea; // L: 318 - } - - boolean var6 = false; // L: 322 - if (var5 != this.field4007 || var4) { // L: 323 - this.field4007 = var5; // L: 324 - this.setCurrentMapArea(var5); // L: 325 - var6 = true; // L: 326 - } - - if (var6 || var4) { // L: 328 - this.jump(var1, var2, var3); // L: 329 - } - - } // L: 331 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "50" - ) - @Export("setCurrentMapAreaId") - public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); // L: 334 - if (var2 != null) { // L: 335 - this.setCurrentMapArea(var2); // L: 336 - } - - } // L: 338 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1020439482" - ) - @Export("currentMapAreaId") - public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 341 342 344 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)Lfa;", - garbageValue = "25" - ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; // L: 348 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "-1508783399" - ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 352 - this.initializeWorldMapManager(var1); // L: 355 - this.jump(-1, -1, -1); // L: 356 - } - } // L: 353 357 - @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "908397980" + descriptor = "(I)Z", + garbageValue = "-1605978196" ) - @Export("initializeWorldMapManager") - void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; // L: 360 - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 361 - this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 362 - } // L: 363 + @Export("hasTarget") + boolean hasTarget() { + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; + } - @ObfuscatedName("u") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lfa;Liw;Liw;ZI)V", - garbageValue = "-749408227" + descriptor = "(IIII)Lfa;", + garbageValue = "-1571038652" ) - public void method6147(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { // L: 366 - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 369 - this.initializeWorldMapManager(var1); // L: 370 + @Export("mapAreaAtCoord") + public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { + Iterator var4 = this.details.values().iterator(); + + WorldMapArea var5; + do { + if (!var4.hasNext()) { + return null; } - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 372 - this.jump(var2.plane, var2.x, var2.y); // L: 376 - } else { - this.jump(var3.plane, var3.x, var3.y); // L: 373 - } + var5 = (WorldMapArea)var4.next(); + } while(!var5.containsCoord(var1, var2, var3)); - } - } // L: 367 378 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2083556923" - ) - @Export("jump") - void jump(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 381 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 384 - if (var4 == null) { // L: 385 - var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 386 - } - - this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 388 - this.worldMapTargetX = -1; // L: 389 - this.worldMapTargetY = -1; // L: 390 - this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 391 - this.zoomTarget = this.zoom; // L: 392 - this.field4041 = null; // L: 393 - this.iconIterator = null; // L: 394 - this.worldMapManager.clearIcons(); // L: 395 - } - } // L: 382 396 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "1081774257" - ) - @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5) { - int[] var6 = new int[4]; // L: 399 - Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 400 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 401 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 402 - int var7 = this.cacheLoader.getPercentLoaded(); // L: 403 - if (var7 < 100) { // L: 404 - this.drawLoading(var1, var2, var3, var4, var7); // L: 405 - } else { - if (!this.worldMapManager.isLoaded()) { // L: 408 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 409 - if (!this.worldMapManager.isLoaded()) { // L: 410 - return; // L: 411 - } - } - - if (this.flashingElements != null) { // L: 414 - ++this.flashCycle; // L: 415 - if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 416 - this.flashCycle = 0; // L: 417 - ++this.flashCount; // L: 418 - } - - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 420 - this.flashingElements = null; // L: 421 - } - } - - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 424 - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 425 - 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: 426 - boolean var10; - if (!this.elementsDisabled) { // L: 427 - var10 = false; // L: 428 - if (var5 - this.field3999 > 100) { // L: 429 - this.field3999 = var5; // L: 430 - var10 = true; // L: 431 - } - - 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.field4037, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 433 - } - - this.method6151(var1, var2, var3, var4, var8, var9); // L: 435 - var10 = Client.staffModLevel >= 2; // L: 438 - if (var10 && this.showCoord && this.mouseCoord != null) { // L: 440 - this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); - } - - this.worldMapDisplayWidth = var8; // L: 441 - this.worldMapDisplayHeight = var9; // L: 442 - this.worldMapDisplayX = var1; // L: 443 - this.worldMapDisplayY = var2; // L: 444 - Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 445 - } - } // L: 406 446 + return var5; + } @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIIIII)Z", - garbageValue = "-38980544" + descriptor = "(IIIZI)V", + garbageValue = "-2118667028" ) - boolean method6142(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.sprite == null) { // L: 449 - return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 450 - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 451 - return true; - } else if (this.field4026 != Client.field798) { - return true; // L: 452 - } else if (var3 <= 0 && var4 <= 0) { // L: 453 - return var3 + var1 < var5 || var2 + var4 < var6; // L: 454 - } else { - return true; // L: 455 + public void method6162(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); + if (var5 == null) { + if (!var4) { + return; } - } else { - return true; + + var5 = this.mainMapArea; + } + + boolean var6 = false; + if (var5 != this.field4036 || var4) { + this.field4036 = var5; + this.setCurrentMapArea(var5); + var6 = true; + } + + if (var6 || var4) { + this.jump(var1, var2, var3); + } + + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-124" + ) + @Export("setCurrentMapAreaId") + public void setCurrentMapAreaId(int var1) { + WorldMapArea var2 = this.getMapArea(var1); + if (var2 != null) { + this.setCurrentMapArea(var2); + } + + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "5" + ) + @Export("currentMapAreaId") + public int currentMapAreaId() { + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)Lfa;", + garbageValue = "389979735" + ) + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lfa;I)V", + garbageValue = "-925447984" + ) + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { + this.initializeWorldMapManager(var1); + this.jump(-1, -1, -1); + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lfa;I)V", + garbageValue = "-346448501" + ) + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { + this.currentMapArea = var1; + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); + this.cacheLoader.reset(this.currentMapArea.getInternalName()); + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lfa;Lij;Lij;ZB)V", + garbageValue = "1" + ) + public void method6173(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { + this.initializeWorldMapManager(var1); + } + + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { + this.jump(var2.plane, var2.x, var2.y); + } else { + this.jump(var3.plane, var3.x, var3.y); + } + } } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "166660592" + descriptor = "(IIII)V", + garbageValue = "1555313666" ) - void method6151(int var1, int var2, int var3, int var4, int var5, int var6) { - if (LoginPacket.field2800 != null) { // L: 459 - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 460 - int var8 = var3 + 512; // L: 461 - int var9 = var4 + 512; // L: 462 - float var10 = 1.0F; // L: 463 - var8 = (int)((float)var8 / var10); // L: 464 - var9 = (int)((float)var9 / var10); // L: 465 - int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 466 - int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 467 - int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 468 - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 469 - if (this.method6142(var8, var9, var13, var14, var3, var4)) { // L: 470 - if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 471 - Arrays.fill(this.sprite.pixels, 0); // L: 474 - } else { - this.sprite = new SpritePixels(var8, var9); // L: 472 - } - - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 475 - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 476 - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 477 - LoginPacket.field2800.method5247(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 478 - this.field4026 = Client.field798; // L: 479 - var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 480 - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 481 + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); + if (var4 == null) { + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); } - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 483 - if (var10 == 1.0F) { // L: 484 - this.sprite.method7035(var13, var14, 192); // L: 485 + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); + this.zoomTarget = this.zoom; + this.field4070 = null; + this.iconIterator = null; + this.worldMapManager.clearIcons(); + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "977483777" + ) + @Export("draw") + public void draw(int var1, int var2, int var3, int var4, int var5) { + int[] var6 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var6); + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); + int var7 = this.cacheLoader.getPercentLoaded(); + if (var7 < 100) { + this.drawLoading(var1, var2, var3, var4, var7); + } else { + if (!this.worldMapManager.isLoaded()) { + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { + return; + } + } + + if (this.flashingElements != null) { + ++this.flashCycle; + if (this.flashCycle % this.cyclesPerFlash == 0) { + this.flashCycle = 0; + ++this.flashCount; + } + + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { + this.flashingElements = null; + } + } + + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); + this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); + if (!this.elementsDisabled) { + boolean var10 = false; + if (var5 - this.field4068 > 100) { + this.field4068 = var5; + var10 = true; + } + + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4022, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); + } + + this.method6177(var1, var2, var3, var4, var8, var9); + if (KitDefinition.method2779() && this.showCoord && this.mouseCoord != null) { + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; + this.worldMapDisplayHeight = var9; + this.worldMapDisplayX = var1; + this.worldMapDisplayY = var2; + Rasterizer2D.Rasterizer2D_setClipArray(var6); + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIIIIII)Z", + garbageValue = "-718694746" + ) + boolean method6176(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { + return true; + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { + return true; + } else if (this.field4079 != Client.field679) { + return true; + } else if (var3 <= 0 && var4 <= 0) { + return var3 + var1 < var5 || var2 + var4 < var6; } else { - this.sprite.method7038(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 488 + return true; + } + } else { + return true; + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-2075631263" + ) + void method6177(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class367.field4127 != null) { + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); + int var8 = var3 + 512; + int var9 = var4 + 512; + float var10 = 1.0F; + var8 = (int)((float)var8 / var10); + var9 = (int)((float)var9 / var10); + int var11 = this.getDisplayX() - var5 / 2 - var7; + int var12 = this.getDisplayY() - var6 / 2 - var7; + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); + if (this.method6176(var8, var9, var13, var14, var3, var4)) { + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { + Arrays.fill(this.sprite.pixels, 0); + } else { + this.sprite = new SpritePixels(var8, var9); + } + + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; + class367.field4127.method5184(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4079 = Client.field679; + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); + } + + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); + if (var10 == 1.0F) { + this.sprite.method7108(var13, var14, 192); + } else { + this.sprite.method7111(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); } } - } // L: 491 + } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-2047077811" + garbageValue = "140400878" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { // L: 494 - if (!this.worldMapManager.isLoaded()) { // L: 497 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 498 - if (!this.worldMapManager.isLoaded()) { // L: 499 - return; // L: 500 + if (this.cacheLoader.isLoaded()) { + if (!this.worldMapManager.isLoaded()) { + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { + return; } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 503 + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); } - } // L: 495 504 + } - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1733790373" + garbageValue = "-1620372095" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); // L: 507 - } // L: 508 + this.zoomTarget = this.getZoomFromPercentage(var1); + } - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "-263376647" + garbageValue = "-1769013766" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { - byte var6 = 20; // L: 511 - int var7 = var3 / 2 + var1; // L: 512 - int var8 = var4 / 2 + var2 - 18 - var6; // L: 513 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 514 - Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 515 - Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 516 - this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); // L: 517 - } // L: 518 + byte var6 = 20; + int var7 = var3 / 2 + var1; + int var8 = var4 / 2 + var2 - 18 - var6; + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); + this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); + } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)F", - garbageValue = "10" + descriptor = "(II)F", + garbageValue = "1543658498" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { // L: 521 + if (var1 == 25) { return 1.0F; - } else if (var1 == 37) { // L: 522 + } else if (var1 == 37) { return 1.5F; - } else if (var1 == 50) { // L: 523 + } else if (var1 == 50) { return 2.0F; - } else if (var1 == 75) { // L: 524 + } else if (var1 == 75) { return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; // L: 525 526 + return var1 == 100 ? 4.0F : 8.0F; } } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-801808132" - ) - @Export("getZoomLevel") - public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { // L: 530 - return 25; - } else if (1.5D == (double)this.zoomTarget) { // L: 531 - return 37; - } else if ((double)this.zoomTarget == 2.0D) { // L: 532 - return 50; - } else if ((double)this.zoomTarget == 3.0D) { - return 75; // L: 533 - } else { - return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 534 535 - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1078712730" - ) - @Export("loadCache") - public void loadCache() { - this.cacheLoader.load(); // L: 539 - } // L: 540 - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "114" - ) - @Export("isCacheLoaded") - public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); // L: 543 - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)Lfa;", - garbageValue = "1247262475" - ) - @Export("getMapArea") - public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); // L: 547 - - WorldMapArea var3; - do { - if (!var2.hasNext()) { - return null; // L: 555 - } - - var3 = (WorldMapArea)var2.next(); // L: 548 - } while(var3.getId() != var1); // L: 550 - - return var3; // L: 551 - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "902836069" - ) - @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 559 - this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 562 - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 563 - } - } // L: 560 564 - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-462808636" - ) - @Export("setWorldMapPositionTargetInstant") - public void setWorldMapPositionTargetInstant(int var1, int var2) { - if (this.currentMapArea != null) { // L: 567 - this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 570 - this.worldMapTargetX = -1; // L: 571 - this.worldMapTargetY = -1; // L: 572 - } - } // L: 568 573 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1944417243" - ) - @Export("jumpToSourceCoord") - public void jumpToSourceCoord(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 576 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 579 - if (var4 != null) { // L: 580 - this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 581 - } - - } - } // L: 577 583 - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-2114706132" - ) - @Export("jumpToSourceCoordInstant") - public void jumpToSourceCoordInstant(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 586 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 589 - if (var4 != null) { // L: 590 - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 591 - } - - } - } // L: 587 593 - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-407384794" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 596 597 599 - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1052524051" - ) - @Export("getDisplayY") - public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 603 604 606 - } - @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Liw;", - garbageValue = "680807554" + descriptor = "(B)I", + garbageValue = "22" ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 610 611 613 - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-12956" - ) - @Export("getDisplayWith") - public int getDisplayWith() { - return this.worldMapDisplayWidth; // L: 617 + @Export("getZoomLevel") + public int getZoomLevel() { + if (1.0D == (double)this.zoomTarget) { + return 25; + } else if (1.5D == (double)this.zoomTarget) { + return 37; + } else if ((double)this.zoomTarget == 2.0D) { + return 50; + } else if (3.0D == (double)this.zoomTarget) { + return 75; + } else { + return 4.0D == (double)this.zoomTarget ? 100 : 200; + } } @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "16" + descriptor = "(I)V", + garbageValue = "1736140350" ) - @Export("getDisplayHeight") - public int getDisplayHeight() { - return this.worldMapDisplayHeight; // L: 621 + @Export("loadCache") + public void loadCache() { + this.cacheLoader.load(); + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1712051970" + ) + @Export("isCacheLoaded") + public boolean isCacheLoaded() { + return this.cacheLoader.isLoaded(); } @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "69" + descriptor = "(IB)Lfa;", + garbageValue = "7" + ) + @Export("getMapArea") + public WorldMapArea getMapArea(int var1) { + Iterator var2 = this.details.values().iterator(); + + WorldMapArea var3; + do { + if (!var2.hasNext()) { + return null; + } + + var3 = (WorldMapArea)var2.next(); + } while(var3.getId() != var1); + + return var3; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1075263275" + ) + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1419028073" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1360916582" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); + if (var4 != null) { + this.setWorldMapPositionTarget(var4[0], var4[1]); + } + + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1730971686" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); + if (var4 != null) { + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); + } + + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1319880480" + ) + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "781654358" + ) + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)Lij;", + garbageValue = "1507150151" + ) + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1065031113" + ) + @Export("getDisplayWith") + public int getDisplayWith() { + return this.worldMapDisplayWidth; + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1987745916" + ) + @Export("getDisplayHeight") + public int getDisplayHeight() { + return this.worldMapDisplayHeight; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1952469234" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { - if (var1 >= 1) { // L: 625 - this.maxFlashCount = var1; // L: 626 + if (var1 >= 1) { + this.maxFlashCount = var1; } - } // L: 628 + } @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2107849699" + garbageValue = "2145927046" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { - this.maxFlashCount = 3; // L: 631 - } // L: 632 + this.maxFlashCount = 3; + } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2136117532" + descriptor = "(IB)V", + garbageValue = "-5" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { // L: 635 - this.cyclesPerFlash = var1; // L: 636 + if (var1 >= 1) { + this.cyclesPerFlash = var1; } - } // L: 638 - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-23" - ) - @Export("resetCyclesPerFlash") - public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; // L: 641 - } // L: 642 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1146559262" - ) - @Export("setPerpetualFlash") - public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; // L: 645 - } // L: 646 - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "9389136" - ) - @Export("flashElement") - public void flashElement(int var1) { - this.flashingElements = new HashSet(); // L: 649 - this.flashingElements.add(var1); // L: 650 - this.flashCount = 0; // L: 651 - this.flashCycle = 0; // L: 652 - } // L: 653 - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "156861495" - ) - @Export("flashCategory") - public void flashCategory(int var1) { - this.flashingElements = new HashSet(); // L: 656 - this.flashCount = 0; // L: 657 - this.flashCycle = 0; // L: 658 - - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 659 - if (Archive.WorldMapElement_get(var2) != null && Archive.WorldMapElement_get(var2).category == var1) { // L: 660 663 - this.flashingElements.add(Archive.WorldMapElement_get(var2).objectId); // L: 664 - } - } - - } // L: 667 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1840445078" - ) - @Export("stopCurrentFlashes") - public void stopCurrentFlashes() { - this.flashingElements = null; // L: 670 - } // L: 671 - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1467263825" - ) - @Export("setElementsDisabled") - public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; // L: 674 - } // L: 675 - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-1998904362" - ) - @Export("disableElement") - public void disableElement(int var1, boolean var2) { - if (!var2) { // L: 678 - this.enabledElements.add(var1); // L: 679 - } else { - this.enabledElements.remove(var1); // L: 682 - } - - this.method6182(); // L: 684 - } // L: 685 - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-1964224308" - ) - @Export("setCategoryDisabled") - public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { // L: 688 - this.enabledCategories.add(var1); // L: 689 - } else { - this.enabledCategories.remove(var1); // L: 692 - } - - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 694 - if (Archive.WorldMapElement_get(var3) != null && Archive.WorldMapElement_get(var3).category == var1) { // L: 695 698 - int var4 = Archive.WorldMapElement_get(var3).objectId; // L: 699 - if (!var2) { // L: 700 - this.enabledElementIds.add(var4); // L: 701 - } else { - this.enabledElementIds.remove(var4); // L: 704 - } - } - } - - this.method6182(); // L: 708 - } // L: 709 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-268102441" - ) - @Export("getElementsDisabled") - public boolean getElementsDisabled() { - return !this.elementsDisabled; // L: 712 } @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-89" + descriptor = "(I)V", + garbageValue = "6267742" + ) + @Export("resetCyclesPerFlash") + public void resetCyclesPerFlash() { + this.cyclesPerFlash = 50; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1308328304" + ) + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "89127988" + ) + @Export("flashElement") + public void flashElement(int var1) { + this.flashingElements = new HashSet(); + this.flashingElements.add(var1); + this.flashCount = 0; + this.flashCycle = 0; + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1104278490" + ) + @Export("flashCategory") + public void flashCategory(int var1) { + this.flashingElements = new HashSet(); + this.flashCount = 0; + this.flashCycle = 0; + + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { + if (HealthBarUpdate.WorldMapElement_get(var2) != null && HealthBarUpdate.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(HealthBarUpdate.WorldMapElement_get(var2).objectId); + } + } + + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2058376384" + ) + @Export("stopCurrentFlashes") + public void stopCurrentFlashes() { + this.flashingElements = null; + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "1" + ) + @Export("setElementsDisabled") + public void setElementsDisabled(boolean var1) { + this.elementsDisabled = !var1; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IZB)V", + garbageValue = "84" + ) + @Export("disableElement") + public void disableElement(int var1, boolean var2) { + if (!var2) { + this.enabledElements.add(var1); + } else { + this.enabledElements.remove(var1); + } + + this.method6208(); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(IZB)V", + garbageValue = "0" + ) + @Export("setCategoryDisabled") + public void setCategoryDisabled(int var1, boolean var2) { + if (!var2) { + this.enabledCategories.add(var1); + } else { + this.enabledCategories.remove(var1); + } + + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { + if (HealthBarUpdate.WorldMapElement_get(var3) != null && HealthBarUpdate.WorldMapElement_get(var3).category == var1) { + int var4 = HealthBarUpdate.WorldMapElement_get(var3).objectId; + if (!var2) { + this.enabledElementIds.add(var4); + } else { + this.enabledElementIds.remove(var4); + } + } + } + + this.method6208(); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "773346517" + ) + @Export("getElementsDisabled") + public boolean getElementsDisabled() { + return !this.elementsDisabled; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1251957185" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); // L: 716 + return !this.enabledElements.contains(var1); } - @ObfuscatedName("bq") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-348662358" + descriptor = "(IB)Z", + garbageValue = "1" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); // L: 720 + return !this.enabledCategories.contains(var1); } - @ObfuscatedName("bx") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1439307571" + garbageValue = "1597966482" ) - void method6182() { - this.field4037.clear(); // L: 724 - this.field4037.addAll(this.enabledElements); // L: 725 - this.field4037.addAll(this.enabledElementIds); // L: 726 - } // L: 727 + void method6208() { + this.field4022.clear(); + this.field4022.addAll(this.enabledElements); + this.field4022.addAll(this.enabledElementIds); + } - @ObfuscatedName("bi") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1475137861" + garbageValue = "1041722835" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { // L: 730 - int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 733 - int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 734 - List var9 = this.worldMapManager.method3526(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: 735 - if (!var9.isEmpty()) { // L: 736 + if (this.cacheLoader.isLoaded()) { + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); + List var9 = this.worldMapManager.method3480(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { // L: 739 - return; // L: 755 + if (!var10.hasNext()) { + return; } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 740 - WorldMapElement var12 = Archive.WorldMapElement_get(var11.getElement()); // L: 742 - var13 = false; // L: 743 + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); + WorldMapElement var12 = HealthBarUpdate.WorldMapElement_get(var11.getElement()); + var13 = false; - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 744 - if (var12.menuActions[var14] != null) { // L: 745 - class22.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 746 - var13 = true; // L: 747 + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { + if (var12.menuActions[var14] != null) { + class7.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + var13 = true; } } - } while(!var13); // L: 750 + } while(!var13); } } - } // L: 731 737 751 + } - @ObfuscatedName("bz") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(ILiw;I)Liw;", - garbageValue = "1919686510" + descriptor = "(ILij;I)Lij;", + garbageValue = "-1814924889" ) - public Coord method6184(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { // L: 758 - return null; // L: 759 - } else if (!this.worldMapManager.isLoaded()) { // L: 761 - return null; // L: 762 - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 764 - return null; // L: 765 + public Coord method6210(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { + return null; + } else if (!this.worldMapManager.isLoaded()) { + return null; + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { + return null; } else { - HashMap var3 = this.worldMapManager.buildIcons(); // L: 767 - List var4 = (List)var3.get(var1); // L: 768 - if (var4 != null && !var4.isEmpty()) { // L: 769 - AbstractWorldMapIcon var5 = null; // L: 772 - int var6 = -1; // L: 773 - Iterator var7 = var4.iterator(); // L: 774 + HashMap var3 = this.worldMapManager.buildIcons(); + List var4 = (List)var3.get(var1); + if (var4 != null && !var4.isEmpty()) { + AbstractWorldMapIcon var5 = null; + int var6 = -1; + Iterator var7 = var4.iterator(); while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; // L: 789 + return var5.coord2; } - var8 = (AbstractWorldMapIcon)var7.next(); // L: 775 - int var9 = var8.coord2.x - var2.x; // L: 777 - int var10 = var8.coord2.y - var2.y; // L: 778 - var11 = var10 * var10 + var9 * var9; // L: 779 - if (var11 == 0) { // L: 780 - return var8.coord2; // L: 781 + var8 = (AbstractWorldMapIcon)var7.next(); + int var9 = var8.coord2.x - var2.x; + int var10 = var8.coord2.y - var2.y; + var11 = var9 * var9 + var10 * var10; + if (var11 == 0) { + return var8.coord2; } - } while(var11 >= var6 && var5 != null); // L: 783 + } while(var11 >= var6 && var5 != null); - var5 = var8; // L: 784 - var6 = var11; // L: 785 + var5 = var8; + var6 = var11; } } else { - return null; // L: 770 + return null; } } } - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(IILiw;Liw;B)V", - garbageValue = "89" - ) - @Export("worldMapMenuAction") - public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - ScriptEvent var5 = new ScriptEvent(); // L: 793 - WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 794 - var5.setArgs(new Object[]{var6}); // L: 795 - switch(var1) { // L: 796 - case 1008: - var5.setType(10); // L: 804 - break; // L: 805 - case 1009: - var5.setType(11); // L: 819 - break; - case 1010: - var5.setType(12); // L: 809 - break; // L: 810 - case 1011: - var5.setType(13); // L: 814 - break; // L: 815 - case 1012: - var5.setType(14); // L: 799 - } - - WorldMapSection1.runScriptEvent(var5); // L: 823 - } // L: 824 - @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)Lgh;", - garbageValue = "604534686" + descriptor = "(IILij;Lij;B)V", + garbageValue = "79" + ) + @Export("worldMapMenuAction") + public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { + ScriptEvent var5 = new ScriptEvent(); + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); + var5.setArgs(new Object[]{var6}); + switch(var1) { + case 1008: + var5.setType(10); + break; + case 1009: + var5.setType(11); + break; + case 1010: + var5.setType(12); + break; + case 1011: + var5.setType(13); + break; + case 1012: + var5.setType(14); + } + + UserComparator10.runScriptEvent(var5); + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(I)Lgr;", + garbageValue = "-140025760" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { // L: 827 - return null; // L: 828 - } else if (!this.worldMapManager.isLoaded()) { // L: 830 - return null; // L: 831 + if (!this.cacheLoader.isLoaded()) { + return null; + } else if (!this.worldMapManager.isLoaded()) { + return null; } else { - HashMap var1 = this.worldMapManager.buildIcons(); // L: 833 - this.field4041 = new LinkedList(); // L: 834 - Iterator var2 = var1.values().iterator(); // L: 835 + HashMap var1 = this.worldMapManager.buildIcons(); + this.field4070 = new LinkedList(); + Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { - List var3 = (List)var2.next(); // L: 836 - this.field4041.addAll(var3); // L: 838 + List var3 = (List)var2.next(); + this.field4070.addAll(var3); } - this.iconIterator = this.field4041.iterator(); // L: 841 - return this.iconNext(); // L: 842 + this.iconIterator = this.field4070.iterator(); + return this.iconNext(); } } - @ObfuscatedName("bc") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(I)Lgh;", - garbageValue = "-379304026" + descriptor = "(I)Lgr;", + garbageValue = "2042851179" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { // L: 846 - return null; // L: 847 + if (this.iconIterator == null) { + return null; } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { // L: 849 - return null; // L: 855 + if (!this.iconIterator.hasNext()) { + return null; } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 850 - } while(var1.getElement() == -1); // L: 851 + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); + } while(var1.getElement() == -1); - return var1; // L: 852 + return var1; } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)[Lhb;", + garbageValue = "1559272136" + ) + static LoginPacket[] method6366() { + return new LoginPacket[]{LoginPacket.field2792, LoginPacket.field2790, LoginPacket.field2789, LoginPacket.field2793, LoginPacket.field2791, LoginPacket.field2796}; + } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 28a134354d..b9265637cc 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,106 +4,112 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mx") +@ObfuscatedName("mp") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("j") + @ObfuscatedName("hm") + @ObfuscatedGetter( + intValue = -1743864695 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("l") @Export("cacheName") String cacheName; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 470808673 + intValue = -1673386275 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Ljp;)V" + descriptor = "(Ljy;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { - this.percentLoaded = 0; // L: 13 - this.loaded = false; // L: 14 - this.archive = var1; // L: 17 - } // L: 18 + this.percentLoaded = 0; + this.loaded = false; + this.archive = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1390594183" + garbageValue = "798378546" ) @Export("reset") void reset(String var1) { - if (var1 != null && !var1.isEmpty()) { // L: 21 - if (var1 != this.cacheName) { // L: 24 - this.cacheName = var1; // L: 27 - this.percentLoaded = 0; // L: 28 - this.loaded = false; // L: 29 - this.load(); // L: 30 + if (var1 != null && !var1.isEmpty()) { + if (var1 != this.cacheName) { + this.cacheName = var1; + this.percentLoaded = 0; + this.loaded = false; + this.load(); } } - } // L: 22 25 31 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1812007653" + garbageValue = "2123469742" ) @Export("load") int load() { - if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2134.name, this.cacheName)) { // L: 35 - return this.percentLoaded; // L: 36 + if (this.percentLoaded < 33) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2115.name, this.cacheName)) { + return this.percentLoaded; } - this.percentLoaded = 33; // L: 38 + this.percentLoaded = 33; } - if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field2130.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2130.name, this.cacheName)) { // L: 41 42 - return this.percentLoaded; // L: 43 + if (this.percentLoaded == 33) { + if (this.archive.isValidFileName(WorldMapCacheName.field2114.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2114.name, this.cacheName)) { + return this.percentLoaded; } - this.percentLoaded = 66; // L: 46 + this.percentLoaded = 66; } - if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2129.name)) { // L: 49 - return this.percentLoaded; // L: 50 + if (this.percentLoaded == 66) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2116.name)) { + return this.percentLoaded; } - this.percentLoaded = 100; // L: 52 - this.loaded = true; // L: 53 + this.percentLoaded = 100; + this.loaded = true; } - return this.percentLoaded; // L: 55 + return this.percentLoaded; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1542978500" + garbageValue = "1463629324" ) @Export("isLoaded") boolean isLoaded() { - return this.loaded; // L: 59 + return this.loaded; } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1748006282" + garbageValue = "-1908493453" ) @Export("getPercentLoaded") int getPercentLoaded() { - return this.percentLoaded; // L: 63 + return this.percentLoaded; } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index a5182663d1..af507eb9a5 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -9,179 +9,179 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fa") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1578989981 + intValue = -1570146787 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("internalName") String internalName; @ObfuscatedName("v") @Export("externalName") String externalName; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1093781253 + intValue = -387474139 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1026096533 + intValue = -810351387 ) @Export("zoom") int zoom; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lij;" ) @Export("origin") Coord origin; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1868545785 + intValue = 1162515791 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2043667075 + intValue = -367119943 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 491098273 + intValue = -1069848443 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -380417961 + intValue = 425431757 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("isMain") boolean isMain; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("sections") LinkedList sections; public WorldMapArea() { - this.id = -1; // L: 9 - this.backGroundColor = -1; // L: 12 - this.zoom = -1; // L: 13 - this.origin = null; // L: 14 - this.regionLowX = Integer.MAX_VALUE; // L: 15 - this.regionHighX = 0; // L: 16 - this.regionLowY = Integer.MAX_VALUE; // L: 17 - this.regionHighY = 0; // L: 18 - this.isMain = false; // L: 19 + this.id = -1; + this.backGroundColor = -1; + this.zoom = -1; + this.origin = null; + this.regionLowX = Integer.MAX_VALUE; + this.regionHighX = 0; + this.regionLowY = Integer.MAX_VALUE; + this.regionHighY = 0; + this.isMain = false; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-458748855" + descriptor = "(Lnv;II)V", + garbageValue = "1541243731" ) @Export("read") public void read(Buffer var1, int var2) { - this.id = var2; // L: 23 - this.internalName = var1.readStringCp1252NullTerminated(); // L: 24 - this.externalName = var1.readStringCp1252NullTerminated(); // L: 25 - this.origin = new Coord(var1.readInt()); // L: 26 - this.backGroundColor = var1.readInt(); // L: 27 - var1.readUnsignedByte(); // L: 28 - this.isMain = var1.readUnsignedByte() == 1; // L: 29 - this.zoom = var1.readUnsignedByte(); // L: 30 - int var3 = var1.readUnsignedByte(); // L: 31 - this.sections = new LinkedList(); // L: 32 + this.id = var2; + this.internalName = var1.readStringCp1252NullTerminated(); + this.externalName = var1.readStringCp1252NullTerminated(); + this.origin = new Coord(var1.readInt()); + this.backGroundColor = var1.readInt(); + var1.readUnsignedByte(); + this.isMain = var1.readUnsignedByte() == 1; + this.zoom = var1.readUnsignedByte(); + int var3 = var1.readUnsignedByte(); + this.sections = new LinkedList(); - 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("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;S)Lge;", - garbageValue = "2606" + descriptor = "(Lnv;I)Lgx;", + garbageValue = "1619583113" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 40 - WorldMapSectionType var3 = (WorldMapSectionType)Clock.findEnumerated(WorldMapSectionType.method3676(), var2); // L: 41 - Object var4 = null; // L: 42 - switch(var3.type) { // L: 43 + int var2 = var1.readUnsignedByte(); + WorldMapSectionType var3 = (WorldMapSectionType)Huffman.findEnumerated(WorldMapSectionType.method3600(), var2); + Object var4 = null; + switch(var3.type) { case 0: - var4 = new WorldMapSection2(); // L: 45 + var4 = new class171(); break; case 1: - var4 = new WorldMapSection1(); // L: 48 - break; // L: 49 + var4 = new WorldMapSection2(); + break; case 2: - var4 = new WorldMapSection0(); // L: 56 + var4 = new WorldMapSection0(); break; case 3: - var4 = new class170(); // L: 53 - break; // L: 54 + var4 = new WorldMapSection1(); + break; default: - throw new IllegalStateException(""); // L: 51 + throw new IllegalStateException(""); } - ((WorldMapSection)var4).read(var1); // L: 59 - return (WorldMapSection)var4; // L: 60 + ((WorldMapSection)var4).read(var1); + return (WorldMapSection)var4; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-1448523684" + garbageValue = "722138687" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 64 + Iterator var4 = this.sections.iterator(); WorldMapSection var5; do { if (!var4.hasNext()) { - return false; // L: 72 + return false; } - var5 = (WorldMapSection)var4.next(); // L: 65 - } while(!var5.containsCoord(var1, var2, var3)); // L: 67 + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(var1, var2, var3)); - return true; // L: 68 + return true; } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-579774048" + descriptor = "(IIB)Z", + garbageValue = "73" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - int var3 = var1 / 64; // L: 76 - int var4 = var2 / 64; // L: 77 - if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78 - if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79 - Iterator var5 = this.sections.iterator(); // L: 80 + int var3 = var1 / 64; + int var4 = var2 / 64; + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { + Iterator var5 = this.sections.iterator(); WorldMapSection var6; do { if (!var5.hasNext()) { - return false; // L: 88 + return false; } - var6 = (WorldMapSection)var5.next(); // L: 81 - } while(!var6.containsPosition(var1, var2)); // L: 83 + var6 = (WorldMapSection)var5.next(); + } while(!var6.containsPosition(var1, var2)); - return true; // L: 84 + return true; } else { return false; } @@ -190,201 +190,237 @@ public class WorldMapArea { } } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIS)[I", - garbageValue = "-1315" + descriptor = "(IIII)[I", + garbageValue = "-2086521998" ) @Export("position") public int[] position(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 92 + Iterator var4 = this.sections.iterator(); WorldMapSection var5; do { if (!var4.hasNext()) { - return null; // L: 100 + return null; } - var5 = (WorldMapSection)var4.next(); // L: 93 - } while(!var5.containsCoord(var1, var2, var3)); // L: 95 + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(var1, var2, var3)); - return var5.getBorderTileLengths(var1, var2, var3); // L: 96 + return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)Liw;", - garbageValue = "-464379344" + descriptor = "(III)Lij;", + garbageValue = "269042318" ) @Export("coord") public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); // L: 104 + Iterator var3 = this.sections.iterator(); WorldMapSection var4; do { if (!var3.hasNext()) { - return null; // L: 112 + return null; } - var4 = (WorldMapSection)var3.next(); // L: 105 - } while(!var4.containsPosition(var1, var2)); // L: 107 + var4 = (WorldMapSection)var3.next(); + } while(!var4.containsPosition(var1, var2)); - return var4.coord(var1, var2); // L: 108 + return var4.coord(var1, var2); } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "126" + descriptor = "(I)V", + garbageValue = "19328953" ) @Export("setBounds") void setBounds() { - Iterator var1 = this.sections.iterator(); // L: 116 + Iterator var1 = this.sections.iterator(); while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 - var2.expandBounds(this); // L: 119 + WorldMapSection var2 = (WorldMapSection)var1.next(); + var2.expandBounds(this); } - } // L: 122 + } - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-362615212" + descriptor = "(B)I", + garbageValue = "103" ) @Export("getId") public int getId() { - return this.id; // L: 125 + return this.id; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1577332140" + ) + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1712382848" + ) + @Export("getInternalName") + public String getInternalName() { + return this.internalName; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1525693350" + ) + @Export("getExternalName") + public String getExternalName() { + return this.externalName; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-2" + ) + @Export("getBackGroundColor") + int getBackGroundColor() { + return this.backGroundColor; } @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "58" - ) - @Export("getIsMain") - public boolean getIsMain() { - return this.isMain; // L: 129 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-118" - ) - @Export("getInternalName") - public String getInternalName() { - return this.internalName; // L: 133 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "117" - ) - @Export("getExternalName") - public String getExternalName() { - return this.externalName; // L: 137 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "18217" - ) - @Export("getBackGroundColor") - int getBackGroundColor() { - return this.backGroundColor; // L: 141 - } - - @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "4" + garbageValue = "117" ) @Export("getZoom") public int getZoom() { - return this.zoom; // L: 145 + return this.zoom; } @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-53355558" + garbageValue = "-132060536" ) @Export("getRegionLowX") public int getRegionLowX() { - return this.regionLowX; // L: 149 + return this.regionLowX; } - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1437577168" + garbageValue = "172672356" ) @Export("getRegionHighX") public int getRegionHighX() { - return this.regionHighX; // L: 153 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-51" - ) - @Export("getRegionLowY") - public int getRegionLowY() { - return this.regionLowY; // L: 157 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2076656857" - ) - @Export("getRegionHighY") - public int getRegionHighY() { - return this.regionHighY; // L: 161 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-195979201" - ) - @Export("getOriginX") - public int getOriginX() { - return this.origin.x; // L: 165 + return this.regionHighX; } @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "263093788" + garbageValue = "1292485982" + ) + @Export("getRegionLowY") + public int getRegionLowY() { + return this.regionLowY; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1465522234" + ) + @Export("getRegionHighY") + public int getRegionHighY() { + return this.regionHighY; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2147163667" + ) + @Export("getOriginX") + public int getOriginX() { + return this.origin.x; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "335914375" ) @Export("getOriginPlane") public int getOriginPlane() { - return this.origin.plane; // L: 169 + return this.origin.plane; } - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2050680691" + garbageValue = "2093254477" ) @Export("getOriginY") public int getOriginY() { - return this.origin.y; // L: 173 + return this.origin.y; } - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Liw;", - garbageValue = "2115040321" + descriptor = "(I)Lij;", + garbageValue = "-1754049769" ) @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); // L: 177 + return new Coord(this.origin); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIILem;II)V", + garbageValue = "598437329" + ) + static void method3358(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); + var5.plane = var0; + var5.x = var1 * 128; + var5.y = var2 * 128; + int var6 = var3.sizeX; + int var7 = var3.sizeY; + if (var4 == 1 || var4 == 3) { + var6 = var3.sizeY; + var7 = var3.sizeX; + } + + var5.field722 = (var6 + var1) * 128; + var5.field723 = (var7 + var2) * 128; + var5.soundEffectId = var3.ambientSoundId; + var5.field718 = var3.field1779 * 128; + var5.field727 = var3.int5; + var5.field728 = var3.int6; + var5.soundEffectIds = var3.soundEffectIds; + if (var3.transforms != null) { + var5.obj = var3; + var5.set(); + } + + ObjectSound.objectSounds.addFirst(var5); + if (var5.soundEffectIds != null) { + var5.field725 = var5.field727 + (int)(Math.random() * (double)(var5.field728 - var5.field727)); + } + } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 4fac1a97bf..7e46fec11d 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -6,88 +6,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("gi") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("rq") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "[Lom;" ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("i") + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("er") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("h") @Export("worldMapData0Set") HashSet worldMapData0Set; @ObfuscatedName("k") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("iconList") List iconList; WorldMapAreaData() { - } // L: 14 + } - @ObfuscatedName("bu") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Lnt;Lnt;IZI)V", - garbageValue = "-1962435243" + descriptor = "(Lnv;Lnv;IZB)V", + garbageValue = "-124" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { - this.read(var1, var3); // L: 17 - int var5 = var2.readUnsignedShort(); // L: 18 - this.worldMapData0Set = new HashSet(var5); // L: 19 + this.read(var1, var3); + int var5 = var2.readUnsignedShort(); + this.worldMapData0Set = new HashSet(var5); int var6; - for (var6 = 0; var6 < var5; ++var6) { // L: 20 - WorldMapData_0 var7 = new WorldMapData_0(); // L: 21 + for (var6 = 0; var6 < var5; ++var6) { + WorldMapData_0 var7 = new WorldMapData_0(); try { - var7.init(var2); // L: 23 - } catch (IllegalStateException var12) { // L: 25 - continue; // L: 26 + var7.init(var2); + } 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 + for (int var10 = 0; var10 < var6; ++var10) { + WorldMapData_1 var8 = new WorldMapData_1(); 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("bl") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(Lnt;ZB)V", - garbageValue = "-62" + descriptor = "(Lnv;ZI)V", + garbageValue = "2145575528" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { - this.iconList = new LinkedList(); // L: 46 - int var3 = var1.readUnsignedShort(); // L: 47 + this.iconList = new LinkedList(); + int var3 = var1.readUnsignedShort(); - for (int var4 = 0; var4 < var3; ++var4) { // L: 48 - int var5 = var1.method6630(); // L: 49 - Coord var6 = new Coord(var1.readInt()); // L: 50 - boolean var7 = var1.readUnsignedByte() == 1; // L: 51 - if (var2 || !var7) { // L: 52 - this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53 + for (int var4 = 0; var4 < var3; ++var4) { + int var5 = var1.method6674(); + Coord var6 = new Coord(var1.readInt()); + boolean var7 = var1.readUnsignedByte() == 1; + if (var2 || !var7) { + this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); } } - } // L: 56 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)[Lhi;", + garbageValue = "-1217280037" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2787, ServerPacket.field2746, ServerPacket.field2693, ServerPacket.field2692, ServerPacket.field2695, ServerPacket.field2768, ServerPacket.field2697, ServerPacket.field2719, ServerPacket.field2699, ServerPacket.field2700, ServerPacket.field2701, ServerPacket.field2702, ServerPacket.field2767, ServerPacket.field2704, ServerPacket.field2705, ServerPacket.field2706, ServerPacket.field2707, ServerPacket.field2757, ServerPacket.field2755, ServerPacket.field2710, ServerPacket.field2694, ServerPacket.field2712, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2748, ServerPacket.field2711, ServerPacket.field2750, ServerPacket.field2718, ServerPacket.field2717, ServerPacket.field2728, ServerPacket.field2721, ServerPacket.field2703, ServerPacket.field2723, ServerPacket.field2724, ServerPacket.field2725, ServerPacket.field2726, ServerPacket.field2756, ServerPacket.field2715, ServerPacket.field2729, ServerPacket.field2730, ServerPacket.field2731, ServerPacket.field2774, ServerPacket.field2733, ServerPacket.field2734, ServerPacket.field2735, ServerPacket.field2736, ServerPacket.field2737, ServerPacket.field2738, ServerPacket.field2709, ServerPacket.field2740, ServerPacket.field2741, ServerPacket.field2742, ServerPacket.field2720, ServerPacket.field2744, ServerPacket.field2745, ServerPacket.field2727, ServerPacket.field2732, ServerPacket.field2781, ServerPacket.field2749, ServerPacket.field2770, ServerPacket.field2751, ServerPacket.field2752, ServerPacket.field2747, ServerPacket.field2754, ServerPacket.field2722, ServerPacket.field2769, ServerPacket.field2698, ServerPacket.field2758, ServerPacket.field2759, ServerPacket.field2760, ServerPacket.field2761, ServerPacket.field2762, ServerPacket.field2763, ServerPacket.field2708, ServerPacket.field2765, ServerPacket.field2766, ServerPacket.field2716, ServerPacket.field2783, ServerPacket.field2777, ServerPacket.field2743, ServerPacket.field2771, ServerPacket.field2772, ServerPacket.field2773, ServerPacket.field2691, ServerPacket.field2775, ServerPacket.field2776, ServerPacket.field2764, ServerPacket.field2778, ServerPacket.field2779, ServerPacket.field2780, ServerPacket.field2753, ServerPacket.field2782, ServerPacket.field2696, ServerPacket.field2784, ServerPacket.field2785}; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)Lag;", + garbageValue = "-58" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return class112.getNextWorldListWorld(); + } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 7b5cc384b4..4066ab69b6 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,82 +1,55 @@ 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("gt") +@ObfuscatedName("gg") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgg;" ) - public static final WorldMapCacheName field2131; - @ObfuscatedName("e") + public static final WorldMapCacheName field2117; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgg;" ) - public static final WorldMapCacheName field2134; + public static final WorldMapCacheName field2115; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgg;" ) - public static final WorldMapCacheName field2130; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgt;" - ) - static final WorldMapCacheName field2136; + public static final WorldMapCacheName field2114; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgg;" ) - public static final WorldMapCacheName field2129; - @ObfuscatedName("i") + static final WorldMapCacheName field2118; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Lgg;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("nw") - @ObfuscatedSignature( - descriptor = "[Liv;" + public static final WorldMapCacheName field2116; + @ObfuscatedName("fv") + @ObfuscatedGetter( + longValue = 5083972194157405959L ) - static Widget[] field2135; - @ObfuscatedName("o") + static long field2119; + @ObfuscatedName("n") @Export("name") public final String name; static { - field2131 = new WorldMapCacheName("details"); // L: 4 - field2134 = new WorldMapCacheName("compositemap"); // L: 5 - field2130 = new WorldMapCacheName("compositetexture"); // L: 6 - field2136 = new WorldMapCacheName("area"); // L: 7 - field2129 = new WorldMapCacheName("labels"); // L: 8 + field2117 = new WorldMapCacheName("details"); + field2115 = new WorldMapCacheName("compositemap"); + field2114 = new WorldMapCacheName("compositetexture"); + field2118 = new WorldMapCacheName("area"); + field2116 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { - this.name = var1; // L: 12 - } // L: 13 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lix;I)V", - garbageValue = "-715270644" - ) - public static void method3789(Huffman var0) { - class250.huffman = var0; // L: 14 - } // L: 15 - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3274" - ) - static final void method3788() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11443 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11444 - var1.clearIsInFriendsChat(); // L: 11445 - } - - } // L: 11447 + this.name = var1; + } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 2d52032e97..bd212ea168 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,96 +3,120 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fj") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { WorldMapData_0() { - } // L: 6 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;B)V", - garbageValue = "68" + descriptor = "(Lnv;I)V", + garbageValue = "-1866643170" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field2111.value) { // L: 10 - throw new IllegalStateException(""); // L: 11 + int var2 = var1.readUnsignedByte(); + if (var2 != WorldMapID.field2095.value) { + throw new IllegalStateException(""); } else { - super.minPlane = var1.readUnsignedByte(); // L: 13 - super.planes = var1.readUnsignedByte(); // L: 14 - super.regionXLow = var1.readUnsignedShort(); // L: 15 - super.regionYLow = var1.readUnsignedShort(); // L: 16 - super.regionX = var1.readUnsignedShort(); // L: 17 - super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method6630(); // L: 19 - super.fileId = var1.method6630(); // L: 20 + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort(); + super.regionYLow = var1.readUnsignedShort(); + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + super.groupId = var1.method6674(); + super.fileId = var1.method6674(); } - } // L: 21 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1563875465" + descriptor = "(Lnv;I)V", + garbageValue = "-1489554607" ) @Export("readGeography") void readGeography(Buffer var1) { - super.planes = Math.min(super.planes, 4); // L: 24 - super.floorUnderlayIds = new short[1][64][64]; // L: 25 - super.floorOverlayIds = new short[super.planes][64][64]; // L: 26 - super.field2068 = new byte[super.planes][64][64]; // L: 27 - super.field2074 = new byte[super.planes][64][64]; // L: 28 - super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29 - int var2 = var1.readUnsignedByte(); // L: 30 - if (var2 != class180.field2102.value) { // L: 31 - throw new IllegalStateException(""); // L: 32 + super.planes = Math.min(super.planes, 4); + super.floorUnderlayIds = new short[1][64][64]; + super.floorOverlayIds = new short[super.planes][64][64]; + super.field2056 = new byte[super.planes][64][64]; + super.field2057 = new byte[super.planes][64][64]; + super.decorations = new WorldMapDecoration[super.planes][64][64][]; + int var2 = var1.readUnsignedByte(); + if (var2 != class181.field2090.value) { + throw new IllegalStateException(""); } else { - int var3 = var1.readUnsignedByte(); // L: 34 - int var4 = var1.readUnsignedByte(); // L: 35 - if (var3 == super.regionX && var4 == super.regionY) { // L: 36 - for (int var5 = 0; var5 < 64; ++var5) { // L: 39 - for (int var6 = 0; var6 < 64; ++var6) { // L: 40 - this.readTile(var5, var6, var1); // L: 41 + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY) { + for (int var5 = 0; var5 < 64; ++var5) { + for (int var6 = 0; var6 < 64; ++var6) { + this.readTile(var5, var6, var1); } } } else { - throw new IllegalStateException(""); // L: 37 + throw new IllegalStateException(""); } } - } // L: 44 - - public int hashCode() { - return super.regionX | super.regionY << 8; // L: 55 } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { // L: 47 - return false; // L: 48 + if (!(var1 instanceof WorldMapData_0)) { + return false; } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 - return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51 + WorldMapData_0 var2 = (WorldMapData_0)var1; + return var2.regionX == super.regionX && super.regionY == var2.regionY; } } - @ObfuscatedName("ak") + public int hashCode() { + return super.regionX | super.regionY << 8; + } + + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-1824219320" + descriptor = "(ILbd;ZB)I", + garbageValue = "100" ) - static int method3267(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { // L: 2442 - if (var0 == 3702) { // L: 2447 - ++ChatChannel.Interpreter_intStackSize; // L: 2448 - return 1; // L: 2449 - } else { - return 2; // L: 2451 - } + static int method3227(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { + Interpreter.Interpreter_intStackSize -= 5; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7204) { + Interpreter.Interpreter_intStackSize -= 6; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 >= 7205 && var0 < 7209) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7209) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 >= 7210 && var0 < 7214) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 7214) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; } else { - --ChatChannel.Interpreter_intStackSize; // L: 2443 - --UserComparator9.Interpreter_stringStackSize; // L: 2444 - return 1; // L: 2445 + return 2; + } + } + + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-68" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (Huffman.loadInterface(var0)) { + HealthBar.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); } } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index ec0f9e0486..bfb34b04e0 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -4,188 +4,151 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fr") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -624362671 + intValue = -1290365167 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2082539499 + intValue = -1760069741 ) @Export("chunkYLow") int chunkYLow; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2054670475 + intValue = -1558290037 ) @Export("chunkX") int chunkX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1388655107 + intValue = -765239819 ) @Export("chunkY") int chunkY; WorldMapData_1() { - } // L: 11 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1149185778" + descriptor = "(Lnv;S)V", + garbageValue = "-6252" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field2108.value) { // L: 15 - throw new IllegalStateException(""); // L: 16 + int var2 = var1.readUnsignedByte(); + if (var2 != WorldMapID.field2094.value) { + throw new IllegalStateException(""); } else { - super.minPlane = var1.readUnsignedByte(); // L: 18 - super.planes = var1.readUnsignedByte(); // L: 19 - super.regionXLow = var1.readUnsignedShort(); // L: 20 - super.regionYLow = var1.readUnsignedShort(); // L: 21 + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort(); + super.regionYLow = var1.readUnsignedShort(); this.chunkXLow = var1.readUnsignedByte(); this.chunkYLow = var1.readUnsignedByte(); - super.regionX = var1.readUnsignedShort(); // L: 24 - super.regionY = var1.readUnsignedShort(); // L: 25 - this.chunkX = var1.readUnsignedByte(); // L: 26 - this.chunkY = var1.readUnsignedByte(); // L: 27 - super.groupId = var1.method6630(); // L: 28 - super.fileId = var1.method6630(); // L: 29 + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + this.chunkX = var1.readUnsignedByte(); + this.chunkY = var1.readUnsignedByte(); + super.groupId = var1.method6674(); + super.fileId = var1.method6674(); } - } // L: 30 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1563875465" + descriptor = "(Lnv;I)V", + garbageValue = "-1489554607" ) @Export("readGeography") void readGeography(Buffer var1) { - super.planes = Math.min(super.planes, 4); // L: 33 - super.floorUnderlayIds = new short[1][64][64]; // L: 34 - super.floorOverlayIds = new short[super.planes][64][64]; // L: 35 - super.field2068 = new byte[super.planes][64][64]; // L: 36 - super.field2074 = new byte[super.planes][64][64]; // L: 37 - super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38 - int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 != class180.field2103.value) { // L: 40 - throw new IllegalStateException(""); // L: 41 + super.planes = Math.min(super.planes, 4); + super.floorUnderlayIds = new short[1][64][64]; + super.floorOverlayIds = new short[super.planes][64][64]; + super.field2056 = new byte[super.planes][64][64]; + super.field2057 = new byte[super.planes][64][64]; + super.decorations = new WorldMapDecoration[super.planes][64][64][]; + int var2 = var1.readUnsignedByte(); + if (var2 != class181.field2089.value) { + throw new IllegalStateException(""); } else { - int var3 = var1.readUnsignedByte(); // L: 43 - int var4 = var1.readUnsignedByte(); // L: 44 - int var5 = var1.readUnsignedByte(); // L: 45 - int var6 = var1.readUnsignedByte(); // L: 46 - if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 47 - for (int var7 = 0; var7 < 8; ++var7) { // L: 50 - for (int var8 = 0; var8 < 8; ++var8) { // L: 51 - this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 52 + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + int var5 = var1.readUnsignedByte(); + int var6 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { + for (int var7 = 0; var7 < 8; ++var7) { + for (int var8 = 0; var8 < 8; ++var8) { + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); } } } else { - throw new IllegalStateException(""); // L: 48 + throw new IllegalStateException(""); } } - } // L: 55 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "24313" + descriptor = "(B)I", + garbageValue = "42" ) @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; // L: 73 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1571205738" - ) - @Export("getChunkYLow") - int getChunkYLow() { - return this.chunkYLow; // L: 77 + return this.chunkXLow; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-115" + descriptor = "(I)I", + garbageValue = "956664221" + ) + @Export("getChunkYLow") + int getChunkYLow() { + return this.chunkYLow; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-333255923" ) @Export("getChunkX") int getChunkX() { - return this.chunkX; // L: 81 + return this.chunkX; } - @ObfuscatedName("r") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-29" + garbageValue = "0" ) @Export("getChunkY") int getChunkY() { - return this.chunkY; // L: 85 - } - - public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 + return this.chunkY; } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_1)) { // L: 58 - return false; // L: 59 + if (!(var1 instanceof WorldMapData_1)) { + return false; } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 - if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 62 - return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; // L: 65 + WorldMapData_1 var2 = (WorldMapData_1)var1; + if (super.regionX == var2.regionX && super.regionY == var2.regionY) { + return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; } else { - return false; // L: 63 + return false; } } } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)Lhg;", - garbageValue = "1853252899" - ) - public static PacketBufferNode method3583() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)[Lhj;", - garbageValue = "1" - ) - public static class226[] method3582() { - return new class226[]{class226.field2688, class226.field2683, class226.field2684, class226.field2692, class226.field2693, class226.field2687, class226.field2686, class226.field2689, class226.field2690, class226.field2691}; // L: 17 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)Liv;", - garbageValue = "1896933792" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 199 - int var2 = var0 & 65535; // L: 200 - if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1] == null || GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1][var2] == null) { // L: 201 - boolean var3 = class20.loadInterface(var1); // L: 202 - if (!var3) { // L: 203 - return null; - } - } - - return GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1][var2]; // L: 205 + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index dd5b450061..342fcd993c 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -1,202 +1,40 @@ -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("fw") +@ObfuscatedName("fl") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("j") - @Export("cacheDir") - public static File cacheDir; - @ObfuscatedName("bi") + @ObfuscatedName("rf") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Ly;" ) - static GameBuild field2084; - @ObfuscatedName("f") + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2029148241 + intValue = -326529945 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 968273187 + intValue = -777918577 ) @Export("decoration") final int decoration; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -576802065 + intValue = 1953592577 ) @Export("rotation") final int rotation; WorldMapDecoration(int var1, int var2, int var3) { - this.objectDefinitionId = var1; // L: 9 - this.decoration = var2; // L: 10 - this.rotation = var3; // L: 11 - } // L: 12 - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1240184930" - ) - static final void method3710(int var0, int var1, int var2, int var3) { - Client.overheadTextCount = 0; // L: 5322 - boolean var4 = false; // L: 5323 - int var5 = -1; // L: 5324 - int var6 = -1; // L: 5325 - int var7 = Players.Players_count; // L: 5326 - int[] var8 = Players.Players_indices; // L: 5327 - - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 5328 - Object var20; - if (var9 < var7) { // L: 5330 - var20 = Client.players[var8[var9]]; // L: 5331 - if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 5332 - var4 = true; // L: 5333 - var5 = var9; // L: 5334 - continue; - } - - if (var20 == class262.localPlayer) { // L: 5337 - var6 = var9; // L: 5338 - continue; // L: 5339 - } - } else { - var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 5342 - } - - UserComparator4.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 5343 - } - - if (Client.renderSelf && var6 != -1) { // L: 5345 - UserComparator4.drawActor2d(class262.localPlayer, var6, var0, var1, var2, var3); // L: 5346 - } - - if (var4) { // L: 5348 - UserComparator4.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 5349 - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 5351 - int var10 = Client.overheadTextXs[var9]; // L: 5352 - int var11 = Client.overheadTextYs[var9]; // L: 5353 - int var12 = Client.overheadTextXOffsets[var9]; // L: 5354 - int var13 = Client.overheadTextAscents[var9]; // L: 5355 - boolean var14 = true; // L: 5356 - - while (var14) { - var14 = false; // L: 5358 - - for (int var19 = 0; var19 < var9; ++var19) { // L: 5359 - if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 5360 5361 - var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 5362 - var14 = true; // L: 5363 - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; // L: 5368 - Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 5369 - String var15 = Client.overheadText[var9]; // L: 5370 - if (Client.chatEffects == 0) { // L: 5371 - int var16 = 16776960; // L: 5372 - if (Client.overheadTextColors[var9] < 6) { // L: 5373 - var16 = Client.field725[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { // L: 5374 - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { // L: 5375 - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { // L: 5376 - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { // L: 5377 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5378 - if (var17 < 50) { // L: 5379 - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { // L: 5380 - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 5381 - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { // L: 5383 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5384 - if (var17 < 50) { // L: 5385 - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { // L: 5386 - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 5387 - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { // L: 5389 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5390 - if (var17 < 50) { // L: 5391 - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { // L: 5392 - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { // L: 5393 - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var9] == 0) { // L: 5395 - class309.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { // L: 5396 - class309.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { // L: 5397 - class309.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { // L: 5398 - class309.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { // L: 5399 - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class309.fontBold12.stringWidth(var15) + 100) / 150; // L: 5400 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5401 - class309.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 5402 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5403 - } - - if (Client.overheadTextEffects[var9] == 5) { // L: 5405 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5406 - int var18 = 0; // L: 5407 - if (var17 < 25) { // L: 5408 - var18 = var17 - 25; - } else if (var17 > 125) { // L: 5409 - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class309.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5410 - class309.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 5411 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5412 - } - } else { - class309.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5416 - } - } - - } // L: 5419 + this.objectDefinitionId = var1; + this.decoration = var2; + this.rotation = var3; + } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index fc0169ba3e..377b2c595e 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,132 +4,134 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("ip") @Implements("WorldMapDecorationType") -public enum WorldMapDecorationType implements Enumerated -{ - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3160(0, 0), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3147(1, 0), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3148(2, 0), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3170(3, 0), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3150(9, 2), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3149(4, 1), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3152(5, 1), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3158(6, 1), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3151(7, 1), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3155(8, 1), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3156(12, 2), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3157(13, 2), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3166(14, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3159(15, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3146(16, 2), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3161(17, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3162(18, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3163(19, 2), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - field3164(20, 2), +public enum WorldMapDecorationType implements Enumerated { @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lip;" ) - field3165(21, 2), - @ObfuscatedName("p") + field3148(0, 0), + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lip;" ) - field3154(10, 2), - @ObfuscatedName("c") + field3140(1, 0), + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lip;" ) - field3167(11, 2), + field3139(2, 0), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3142(3, 0), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3159(9, 2), @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lip;" ) - field3168(22, 3); + field3160(4, 1), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3141(5, 1), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3144(6, 1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3147(7, 1), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3145(8, 1), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3149(12, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3143(13, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3151(14, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3152(15, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3146(16, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3154(17, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3155(18, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3156(19, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3157(20, 2), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3158(21, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3150(10, 2), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3153(11, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + field3161(22, 3); - @ObfuscatedName("gn") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("l") + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "Lkt;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1689741145 + intValue = 2086267501 ) @Export("id") public final int id; @@ -139,140 +141,58 @@ public enum WorldMapDecorationType implements Enumerated garbageValue = "0" ) WorldMapDecorationType(int var3, int var4) { - this.id = var3; // L: 34 - } // L: 35 + this.id = var3; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 38 + return this.id; } - @ObfuscatedName("ft") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "10" + descriptor = "(B)[Ljn;", + garbageValue = "38" ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { // L: 3009 - CollisionMap.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 3010 - CollisionMap.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 3011 - CollisionMap.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 3012 - Login.loginIndex = 3; // L: 3013 - Login.field1012 = 1; // L: 3014 - } else if (var0 == 4) { // L: 3016 - Login.loginIndex = 12; // L: 3018 - Login.field1011 = 0; // L: 3019 - } else if (var0 == 5) { // L: 3022 - Login.field1012 = 2; // L: 3023 - CollisionMap.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: 3024 - } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 3026 - if (var0 == 7) { // L: 3029 - CollisionMap.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 3030 - CollisionMap.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 3031 - CollisionMap.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 3032 - CollisionMap.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 3033 - CollisionMap.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 3034 - CollisionMap.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 3035 - CollisionMap.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 3036 - CollisionMap.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 3037 - CollisionMap.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 3038 - CollisionMap.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: 3039 - Login.loginIndex = 12; // L: 3041 - Login.field1011 = 1; // L: 3042 - } else if (var0 == 19) { // L: 3045 - CollisionMap.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 3046 - CollisionMap.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 3047 - CollisionMap.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 3048 - CollisionMap.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 3049 - CollisionMap.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 3050 - CollisionMap.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 3051 - CollisionMap.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 3052 - CollisionMap.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 3053 - CollisionMap.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) { - CollisionMap.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 3054 - } else if (var0 == 37) { // L: 3055 - CollisionMap.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 3056 - CollisionMap.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 3057 - Login.loginIndex = 8; // L: 3058 - } else { - if (var0 == 56) { // L: 3060 - CollisionMap.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 3061 - Projectile.updateGameState(11); // L: 3062 - return; // L: 3063 - } + static class263[] method4892() { + return new class263[]{class263.field3191, class263.field3189}; + } - if (var0 == 57) { // L: 3065 - CollisionMap.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 3066 - Projectile.updateGameState(11); // L: 3067 - return; // L: 3068 - } + @ObfuscatedName("t") + static final void method4881(long var0) { + try { + Thread.sleep(var0); + } catch (InterruptedException var3) { + } - if (var0 == 61) { // L: 3070 - Login.loginIndex = 7; // L: 3071 - } else { - CollisionMap.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3073 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "933878299" + ) + static int method4888(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; + } else { + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; } } - } else { - CollisionMap.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 3027 + + return var3; } - - Projectile.updateGameState(10); // L: 3074 - } // L: 3075 - - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "618302230" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field839 = 0L; // L: 4398 - if (var0 >= 2) { // L: 4399 - Client.isResizable = true; - } else { - Client.isResizable = false; // L: 4400 - } - - if (class302.getWindowedMode() == 1) { // L: 4401 - class1.client.setMaxCanvasSize(765, 503); // L: 4402 - } else { - class1.client.setMaxCanvasSize(7680, 2160); // L: 4405 - } - - if (Client.gameState >= 25) { // L: 4407 - BufferedSink.method5992(); - } - - } // L: 4408 + } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 02d7fc7c55..9a7b061aa3 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -1,443 +1,317 @@ -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("ek") +@ObfuscatedName("ei") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lek;" + descriptor = "Ljy;" + ) + @Export("WorldMapElement_archive") + static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "[Lei;" ) @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; + static WorldMapElement[] WorldMapElement_cached; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1856527829 + intValue = 1151780193 ) @Export("WorldMapElement_count") public static int WorldMapElement_count; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhw;" ) @Export("WorldMapElement_cachedSprites") - public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("j") + static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -334819521 + intValue = 181121925 ) @Export("objectId") public final int objectId; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1578997885 + intValue = -1556885323 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1711364077 + intValue = -559473179 ) @Export("sprite2") int sprite2; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("name") public String name; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1034605975 + intValue = -1511118893 ) - public int field1563; - @ObfuscatedName("d") + public int field1547; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1720690587 + intValue = -49419043 ) @Export("textSize") public int textSize; - @ObfuscatedName("b") - public boolean field1569; - @ObfuscatedName("i") - public boolean field1567; + @ObfuscatedName("p") + public boolean field1529; + @ObfuscatedName("h") + public boolean field1541; @ObfuscatedName("k") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("g") + @ObfuscatedName("a") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("t") - int[] field1570; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1625174781 - ) - int field1573; + @ObfuscatedName("q") + int[] field1530; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 796441921 + intValue = -2054958761 ) - int field1566; - @ObfuscatedName("q") + int field1544; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 110963729 + intValue = -820884415 ) - int field1571; - @ObfuscatedName("s") + int field1545; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1540991657 + intValue = 1627071551 ) - int field1556; - @ObfuscatedName("p") + int field1546; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 347811663 + ) + int field1537; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Leh;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Ley;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("n") - int[] field1577; - @ObfuscatedName("l") - byte[] field1578; - @ObfuscatedName("w") + @ObfuscatedName("z") + int[] field1550; + @ObfuscatedName("d") + byte[] field1551; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 477871251 + intValue = -1204378113 ) @Export("category") public int category; static { - WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 + WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); } - public WorldMapElement(int var1) { - this.sprite1 = -1; // L: 18 - this.sprite2 = -1; // L: 19 - this.textSize = 0; // L: 22 - this.field1569 = true; // L: 24 - this.field1567 = false; // L: 25 - this.menuActions = new String[5]; // L: 26 - this.field1573 = Integer.MAX_VALUE; // L: 29 - this.field1566 = Integer.MAX_VALUE; // L: 30 - this.field1571 = Integer.MIN_VALUE; // L: 31 - this.field1556 = Integer.MIN_VALUE; // L: 32 + WorldMapElement(int var1) { + this.sprite1 = -1; + this.sprite2 = -1; + this.textSize = 0; + this.field1529 = true; + this.field1541 = false; + this.menuActions = new String[5]; + this.field1544 = Integer.MAX_VALUE; + this.field1545 = Integer.MAX_VALUE; + this.field1546 = Integer.MIN_VALUE; + this.field1537 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnt;S)V", - garbageValue = "28368" + descriptor = "(Lnv;I)V", + garbageValue = "-1617070752" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); - if (var2 == 0) { // L: 53 + if (var2 == 0) { return; } - this.decodeNext(var1, var2); // L: 54 + this.decodeNext(var1, var2); } } - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "1992527916" + descriptor = "(Lnv;II)V", + garbageValue = "-1051181878" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method6630(); + this.sprite1 = var1.method6674(); } else if (var2 == 2) { - this.sprite2 = var1.method6630(); - } else if (var2 == 3) { // L: 61 + this.sprite2 = var1.method6674(); + } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 62 - this.field1563 = var1.readMedium(); + } else if (var2 == 4) { + this.field1547 = var1.readMedium(); } else if (var2 == 5) { - var1.readMedium(); // L: 64 + var1.readMedium(); } else if (var2 == 6) { this.textSize = var1.readUnsignedByte(); } else { - int var3; - if (var2 == 7) { // L: 67 - var3 = var1.readUnsignedByte(); // L: 68 - if ((var3 & 1) == 0) { // L: 69 - this.field1569 = false; + int var6; + if (var2 == 7) { + var6 = var1.readUnsignedByte(); + if ((var6 & 1) == 0) { + this.field1529 = false; } - if ((var3 & 2) == 2) { // L: 70 - this.field1567 = true; + if ((var6 & 2) == 2) { + this.field1541 = true; } - } else if (var2 == 8) { // L: 72 + } else if (var2 == 8) { var1.readUnsignedByte(); - } else if (var2 >= 10 && var2 <= 14) { // L: 75 + } else if (var2 >= 10 && var2 <= 14) { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { // L: 76 - var3 = var1.readUnsignedByte(); // L: 77 - this.field1570 = new int[var3 * 2]; // L: 78 + } else if (var2 == 15) { + var6 = var1.readUnsignedByte(); + this.field1530 = new int[var6 * 2]; int var4; - for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 79 - this.field1570[var4] = var1.readShort(); + for (var4 = 0; var4 < var6 * 2; ++var4) { + this.field1530[var4] = var1.readShort(); } - var1.readInt(); // L: 80 - var4 = var1.readUnsignedByte(); // L: 81 - this.field1577 = new int[var4]; // L: 82 + var1.readInt(); + var4 = var1.readUnsignedByte(); + this.field1550 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field1577.length; ++var5) { // L: 83 - this.field1577[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1550.length; ++var5) { + this.field1550[var5] = var1.readInt(); } - this.field1578 = new byte[var3]; + this.field1551 = new byte[var6]; - for (var5 = 0; var5 < var3; ++var5) { // L: 85 - this.field1578[var5] = var1.readByte(); + for (var5 = 0; var5 < var6; ++var5) { + this.field1551[var5] = var1.readByte(); } - } else if (var2 != 16) { // L: 87 + } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { // L: 89 - var1.method6630(); // L: 90 - } else if (var2 == 19) { // L: 92 + } else if (var2 == 18) { + var1.method6674(); + } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { - var1.readInt(); // L: 94 - } else if (var2 == 22) { // L: 96 - var1.readInt(); // L: 97 - } else if (var2 == 23) { // L: 99 - var1.readUnsignedByte(); // L: 100 - var1.readUnsignedByte(); // L: 101 + var1.readInt(); + } else if (var2 == 22) { + var1.readInt(); + } else if (var2 == 23) { var1.readUnsignedByte(); - } else if (var2 == 24) { // L: 104 - var1.readShort(); // L: 105 - var1.readShort(); // L: 106 - } else if (var2 == 25) { // L: 108 - var1.method6630(); - } else if (var2 == 28) { // L: 111 - var1.readUnsignedByte(); // L: 112 - } else if (var2 == 29) { // L: 114 - this.horizontalAlignment = (HorizontalAlignment)Clock.findEnumerated(MouseHandler.method726(), var1.readUnsignedByte()); // L: 115 - } else if (var2 == 30) { // L: 117 - this.verticalAlignment = (VerticalAlignment)Clock.findEnumerated(class106.method2373(), var1.readUnsignedByte()); + var1.readUnsignedByte(); + var1.readUnsignedByte(); + } else if (var2 == 24) { + var1.readShort(); + var1.readShort(); + } else if (var2 == 25) { + var1.method6674(); + } else if (var2 == 28) { + var1.readUnsignedByte(); + } else if (var2 == 29) { + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1608, HorizontalAlignment.field1612}; + this.horizontalAlignment = (HorizontalAlignment)Huffman.findEnumerated(var3, var1.readUnsignedByte()); + } else if (var2 == 30) { + this.verticalAlignment = (VerticalAlignment)Huffman.findEnumerated(class4.method21(), var1.readUnsignedByte()); } } } } - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "33" + descriptor = "(I)V", + garbageValue = "970284318" ) - public void method2724() { - if (this.field1570 != null) { // L: 124 - for (int var1 = 0; var1 < this.field1570.length; var1 += 2) { // L: 125 - if (this.field1570[var1] < this.field1573) { // L: 126 - this.field1573 = this.field1570[var1]; - } else if (this.field1570[var1] > this.field1571) { - this.field1571 = this.field1570[var1]; // L: 127 + void method2735() { + if (this.field1530 != null) { + for (int var1 = 0; var1 < this.field1530.length; var1 += 2) { + if (this.field1530[var1] < this.field1544) { + this.field1544 = this.field1530[var1]; + } else if (this.field1530[var1] > this.field1546) { + this.field1546 = this.field1530[var1]; } - if (this.field1570[var1 + 1] < this.field1566) { // L: 128 - this.field1566 = this.field1570[var1 + 1]; - } else if (this.field1570[var1 + 1] > this.field1556) { - this.field1556 = this.field1570[var1 + 1]; // L: 129 + if (this.field1530[var1 + 1] < this.field1545) { + this.field1545 = this.field1530[var1 + 1]; + } else if (this.field1530[var1 + 1] > this.field1537) { + this.field1537 = this.field1530[var1 + 1]; } } } - } // L: 132 + } - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ZB)Loa;", - garbageValue = "1" + descriptor = "(ZI)Lom;", + garbageValue = "2101643047" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; // L: 135 - return this.getSprite(var2); // L: 136 + int var2 = this.sprite1; + return this.getSprite(var2); } - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IB)Loa;", - garbageValue = "112" + descriptor = "(IS)Lom;", + garbageValue = "5732" ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { // L: 140 + if (var1 < 0) { return null; } else { - SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 141 - if (var2 != null) { // L: 142 + SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); + if (var2 != null) { return var2; } else { - var2 = Tile.SpriteBuffer_getSprite(class244.WorldMapElement_archive, var1, 0); // L: 143 - if (var2 != null) { // L: 144 - WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 145 + var2 = ViewportMouse.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + if (var2 != null) { + WorldMapElement_cachedSprites.put(var2, (long)var1); } - return var2; // L: 147 + return var2; } } } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "78" - ) - @Export("getObjectId") - public int getObjectId() { - return this.objectId; // L: 151 - } - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1243419683" + descriptor = "(B)I", + garbageValue = "6" ) - static long method2721() { - try { - URL var0 = new URL(class19.method283("services", false) + "m=accountappeal/login.ws"); - 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; - } catch (Exception var9) { // L: 59 - return 0L; // L: 60 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lmo;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1387320814" - ) - static String method2742(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { // L: 33 - return var2; - } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 34 - return var3 == null ? var2 : (String)var3.obj; // L: 35 36 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "1458799604" - ) - public static char method2732(char var0) { - switch(var0) { // L: 52 - case ' ': - case '-': - case '_': - case ' ': - return '_'; // L: 107 - case '#': - case '[': - case ']': - return var0; // L: 88 - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; // L: 84 - case 'Ç': - case 'ç': - return 'c'; // L: 91 - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; // L: 118 - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - return 'i'; // L: 73 - case 'Ñ': - case 'ñ': - return 'n'; // L: 66 - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; // L: 63 - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; // L: 102 - case 'ß': - return 'b'; // L: 93 - case 'ÿ': - case 'Ÿ': - return 'y'; // L: 121 - default: - return Character.toLowerCase(var0); // L: 109 - } + @Export("getObjectId") + public int getObjectId() { + return this.objectId; } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 011f058ef8..7461ab645d 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,139 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("gh") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("sr") + @ObfuscatedName("m") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 74587707976866895L - ) - static long field2150; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -861680435 - ) - static int field2146; - @ObfuscatedName("ea") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("eu") - @ObfuscatedGetter( - intValue = -1550671291 - ) - static int field2152; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -733594899 + intValue = -1133978819 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lij;" ) @Export("coord1") public Coord coord1; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lij;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILiw;Liw;)V" + descriptor = "(ILij;Lij;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { - this.mapElement = var1; // L: 11 - this.coord1 = var2; // L: 12 - this.coord2 = var3; // L: 13 - } // L: 14 - - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-1811227158" - ) - @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: 7400 - if (Client.isLowDetail && var0 != SoundSystem.Client_plane) { // L: 7401 - return; - } - - long var7 = 0L; // L: 7402 - boolean var9 = true; // L: 7403 - boolean var10 = false; // L: 7404 - boolean var11 = false; // L: 7405 - if (var1 == 0) { // L: 7406 - var7 = DevicePcmPlayerProvider.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { // L: 7407 - var7 = DevicePcmPlayerProvider.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { // L: 7408 - var7 = DevicePcmPlayerProvider.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { // L: 7409 - var7 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { // L: 7410 - var12 = DevicePcmPlayerProvider.scene.getObjectFlags(var0, var2, var3, var7); // L: 7411 - int var14 = Message.Entity_unpackID(var7); // L: 7412 - int var15 = var12 & 31; // L: 7413 - int var16 = var12 >> 6 & 3; // L: 7414 - ObjectComposition var13; - if (var1 == 0) { // L: 7415 - DevicePcmPlayerProvider.scene.removeBoundaryObject(var0, var2, var3); // L: 7416 - var13 = Tiles.getObjectDefinition(var14); // L: 7417 - if (var13.interactType != 0) { // L: 7418 - Client.collisionMaps[var0].method3217(var2, var3, var15, var16, var13.boolean1); - } - } - - if (var1 == 1) { // L: 7420 - DevicePcmPlayerProvider.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { // L: 7421 - DevicePcmPlayerProvider.scene.removeGameObject(var0, var2, var3); // L: 7422 - var13 = Tiles.getObjectDefinition(var14); // L: 7423 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7424 - return; - } - - if (var13.interactType != 0) { // L: 7425 - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); - } - } - - if (var1 == 3) { // L: 7427 - DevicePcmPlayerProvider.scene.removeFloorDecoration(var0, var2, var3); // L: 7428 - var13 = Tiles.getObjectDefinition(var14); // L: 7429 - if (var13.interactType == 1) { // L: 7430 - Client.collisionMaps[var0].method3206(var2, var3); - } - } - } - - if (var4 >= 0) { // L: 7433 - var12 = var0; // L: 7434 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7435 - var12 = var0 + 1; - } - - Decimator.method1167(var0, var12, var2, var3, var4, var5, var6, DevicePcmPlayerProvider.scene, Client.collisionMaps[var0]); // L: 7436 - } - } - - } // L: 7439 + this.mapElement = var1; + this.coord1 = var2; + this.coord2 = var3; + } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 8729623fbe..582e3fa747 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,127 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("ge") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("sb") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lge;" ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("f") + static final WorldMapID field2095; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lge;" ) - static final WorldMapID field2111; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lff;" - ) - static final WorldMapID field2108; + static final WorldMapID field2094; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1292015261 + intValue = -1894228719 ) @Export("value") final int value; static { - field2111 = new WorldMapID(0); // L: 4 - field2108 = new WorldMapID(1); // L: 5 + field2095 = new WorldMapID(0); + field2094 = new WorldMapID(1); } WorldMapID(int var1) { - this.value = var1; // L: 9 - } // L: 10 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-115" - ) - static int method3718(int var0, int var1) { - if (var0 == -2) { // L: 15 - return 12345678; - } else if (var0 == -1) { // L: 16 - if (var1 < 0) { // L: 17 - var1 = 0; // L: 18 - } else if (var1 > 127) { // L: 20 - var1 = 127; // L: 21 - } - - var1 = 127 - var1; // L: 23 - return var1; // L: 24 - } else { - var1 = (var0 & 127) * var1 / 128; // L: 26 - if (var1 < 2) { // L: 27 - var1 = 2; - } else if (var1 > 126) { // L: 28 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 29 - } + this.value = var1; } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2096657321" - ) - static final int method3716(int var0, int var1) { - if (var0 == -2) { // L: 852 - return 12345678; - } else if (var0 == -1) { // L: 853 - if (var1 < 2) { - var1 = 2; // L: 854 - } else if (var1 > 126) { // L: 855 - var1 = 126; - } - - return var1; // L: 856 - } else { - var1 = (var0 & 127) * var1 / 128; // L: 858 - if (var1 < 2) { // L: 859 - var1 = 2; - } else if (var1 > 126) { // L: 860 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 861 - } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2067762103" - ) - static void method3717() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11019 - int var1 = var0.group; // L: 11020 - if (class20.loadInterface(var1)) { // L: 11021 - boolean var2 = true; // L: 11022 - Widget[] var3 = GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1]; // L: 11023 - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 11024 - if (var3[var4] != null) { // L: 11025 - var2 = var3[var4].isIf3; // L: 11026 - break; - } - } - - if (!var2) { // L: 11030 - var4 = (int)var0.key; // L: 11031 - Widget var5 = WorldMapData_1.getWidget(var4); // L: 11032 - if (var5 != null) { // L: 11033 - Script.invalidateWidget(var5); - } - } - } - } - - } // L: 11037 } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 646c89f6a2..2e5812012e 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,273 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("ft") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("rv") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -439578227 - ) - static int field2029; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ly;" - ) - static ClanChannel field2031; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1437380799 + intValue = -1685075761 ) @Export("element") final int element; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfd;" + descriptor = "Lff;" ) @Export("label") final WorldMapLabel label; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1704027019 + intValue = 821932121 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 96075769 + intValue = -1643565747 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Liw;Liw;ILfd;)V" + descriptor = "(Lij;Lij;ILff;)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 = Archive.WorldMapElement_get(this.getElement()); // L: 17 - SpritePixels var6 = var5.getSpriteBool(false); // L: 18 - if (var6 != null) { // L: 19 - this.subWidth = var6.subWidth; // L: 20 - this.subHeight = var6.subHeight; // L: 21 + super(var1, var2); + this.element = var3; + this.label = var4; + WorldMapElement var5 = HealthBarUpdate.WorldMapElement_get(this.getElement()); + SpritePixels var6 = var5.getSpriteBool(false); + if (var6 != null) { + this.subWidth = var6.subWidth; + this.subHeight = var6.subHeight; } else { - this.subWidth = 0; // L: 24 - this.subHeight = 0; // L: 25 + this.subWidth = 0; + this.subHeight = 0; } - } // L: 27 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1717389517" + garbageValue = "995404902" ) @Export("getElement") public int getElement() { - return this.element; // L: 30 + return this.element; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lfd;", - garbageValue = "1736510941" + descriptor = "(B)Lff;", + garbageValue = "5" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 34 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-60" - ) - @Export("getSubWidth") - int getSubWidth() { - return this.subWidth; // L: 38 + return this.label; } @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-401407374" + garbageValue = "1077868698" + ) + @Export("getSubWidth") + int getSubWidth() { + return this.subWidth; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1851510146" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; // L: 42 + return this.subHeight; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)[Lhs;", - garbageValue = "0" - ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2752, ServerPacket.field2704, ServerPacket.field2705, ServerPacket.field2706, ServerPacket.field2707, ServerPacket.field2708, ServerPacket.field2709, ServerPacket.field2746, ServerPacket.field2711, ServerPacket.field2728, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2715, ServerPacket.field2716, ServerPacket.field2721, ServerPacket.field2718, ServerPacket.field2719, ServerPacket.field2778, ServerPacket.field2765, ServerPacket.field2722, ServerPacket.field2720, ServerPacket.field2724, ServerPacket.field2725, ServerPacket.field2726, ServerPacket.field2712, ServerPacket.field2753, ServerPacket.field2732, ServerPacket.field2773, ServerPacket.field2731, ServerPacket.field2798, ServerPacket.field2733, ServerPacket.field2734, ServerPacket.field2735, ServerPacket.field2717, ServerPacket.field2737, ServerPacket.field2738, ServerPacket.field2739, ServerPacket.field2740, ServerPacket.field2741, ServerPacket.field2742, ServerPacket.field2743, ServerPacket.field2744, ServerPacket.field2710, ServerPacket.field2793, ServerPacket.field2747, ServerPacket.field2723, ServerPacket.field2749, ServerPacket.field2748, ServerPacket.field2751, ServerPacket.field2727, ServerPacket.field2736, ServerPacket.field2754, ServerPacket.field2755, ServerPacket.field2703, ServerPacket.field2757, ServerPacket.field2758, ServerPacket.field2799, ServerPacket.field2760, ServerPacket.field2761, ServerPacket.field2762, ServerPacket.field2763, ServerPacket.field2764, ServerPacket.field2794, ServerPacket.field2766, ServerPacket.field2767, ServerPacket.field2768, ServerPacket.field2769, ServerPacket.field2770, ServerPacket.field2771, ServerPacket.field2772, ServerPacket.field2759, ServerPacket.field2774, ServerPacket.field2775, ServerPacket.field2776, ServerPacket.field2777, ServerPacket.field2780, ServerPacket.field2779, ServerPacket.field2730, ServerPacket.field2781, ServerPacket.field2750, ServerPacket.field2782, ServerPacket.field2784, ServerPacket.field2785, ServerPacket.field2786, ServerPacket.field2729, ServerPacket.field2792, ServerPacket.field2789, ServerPacket.field2790, ServerPacket.field2783, ServerPacket.field2791, ServerPacket.field2745, ServerPacket.field2756, ServerPacket.field2795, ServerPacket.field2796, ServerPacket.field2797}; // L: 104 - } - - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "(IIIIIS)V", - garbageValue = "-23293" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = DevicePcmPlayerProvider.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5720 - int var7; - int var8; - int var9; - int var10; - int var13; - int var14; - if (0L != var5) { // L: 5721 - var7 = DevicePcmPlayerProvider.scene.getObjectFlags(var0, var1, var2, var5); // L: 5722 - var8 = var7 >> 6 & 3; // L: 5723 - var9 = var7 & 31; // L: 5724 - var10 = var3; // L: 5725 - boolean var11 = var5 != 0L && !class24.method329(var5); // L: 5728 - if (var11) { // L: 5730 - var10 = var4; - } - - int[] var12 = class69.sceneMinimapSprite.pixels; // L: 5731 - var13 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5732 - var14 = Message.Entity_unpackID(var5); // L: 5733 - ObjectComposition var15 = Tiles.getObjectDefinition(var14); // L: 5734 - if (var15.mapSceneId != -1) { // L: 5735 - IndexedSprite var16 = FloorDecoration.mapSceneSprites[var15.mapSceneId]; // L: 5736 - if (var16 != null) { // L: 5737 - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5738 - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5739 - var16.drawAt(var17 + var1 * 4 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5740 - } - } else { - if (var9 == 0 || var9 == 2) { // L: 5744 - if (var8 == 0) { // L: 5745 - var12[var13] = var10; // L: 5746 - var12[var13 + 512] = var10; // L: 5747 - var12[var13 + 1024] = var10; // L: 5748 - var12[var13 + 1536] = var10; // L: 5749 - } else if (var8 == 1) { // L: 5751 - var12[var13] = var10; // L: 5752 - var12[var13 + 1] = var10; // L: 5753 - var12[var13 + 2] = var10; // L: 5754 - var12[var13 + 3] = var10; // L: 5755 - } else if (var8 == 2) { // L: 5757 - var12[var13 + 3] = var10; // L: 5758 - var12[var13 + 512 + 3] = var10; // L: 5759 - var12[var13 + 1024 + 3] = var10; // L: 5760 - var12[var13 + 1536 + 3] = var10; // L: 5761 - } else if (var8 == 3) { // L: 5763 - var12[var13 + 1536] = var10; // L: 5764 - var12[var13 + 1536 + 1] = var10; // L: 5765 - var12[var13 + 1536 + 2] = var10; // L: 5766 - var12[var13 + 1536 + 3] = var10; // L: 5767 - } - } - - if (var9 == 3) { // L: 5770 - if (var8 == 0) { // L: 5771 - var12[var13] = var10; - } else if (var8 == 1) { // L: 5772 - var12[var13 + 3] = var10; - } else if (var8 == 2) { // L: 5773 - var12[var13 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 5774 - var12[var13 + 1536] = var10; - } - } - - if (var9 == 2) { // L: 5776 - if (var8 == 3) { // L: 5777 - var12[var13] = var10; // L: 5778 - var12[var13 + 512] = var10; // L: 5779 - var12[var13 + 1024] = var10; // L: 5780 - var12[var13 + 1536] = var10; // L: 5781 - } else if (var8 == 0) { // L: 5783 - var12[var13] = var10; // L: 5784 - var12[var13 + 1] = var10; // L: 5785 - var12[var13 + 2] = var10; // L: 5786 - var12[var13 + 3] = var10; // L: 5787 - } else if (var8 == 1) { // L: 5789 - var12[var13 + 3] = var10; // L: 5790 - var12[var13 + 512 + 3] = var10; // L: 5791 - var12[var13 + 1024 + 3] = var10; // L: 5792 - var12[var13 + 1536 + 3] = var10; // L: 5793 - } else if (var8 == 2) { // L: 5795 - var12[var13 + 1536] = var10; // L: 5796 - var12[var13 + 1536 + 1] = var10; // L: 5797 - var12[var13 + 1536 + 2] = var10; // L: 5798 - var12[var13 + 1536 + 3] = var10; // L: 5799 - } - } - } - } - - var5 = DevicePcmPlayerProvider.scene.getGameObjectTag(var0, var1, var2); // L: 5804 - if (0L != var5) { // L: 5805 - var7 = DevicePcmPlayerProvider.scene.getObjectFlags(var0, var1, var2, var5); // L: 5806 - var8 = var7 >> 6 & 3; // L: 5807 - var9 = var7 & 31; // L: 5808 - var10 = Message.Entity_unpackID(var5); // L: 5809 - ObjectComposition var19 = Tiles.getObjectDefinition(var10); // L: 5810 - if (var19.mapSceneId != -1) { // L: 5811 - IndexedSprite var26 = FloorDecoration.mapSceneSprites[var19.mapSceneId]; // L: 5812 - if (var26 != null) { // L: 5813 - var13 = (var19.sizeX * 4 - var26.subWidth) / 2; // L: 5814 - var14 = (var19.sizeY * 4 - var26.subHeight) / 2; // L: 5815 - var26.drawAt(var13 + var1 * 4 + 48, var14 + (104 - var2 - var19.sizeY) * 4 + 48); // L: 5816 - } - } else if (var9 == 9) { // L: 5819 - int var20 = 15658734; // L: 5820 - boolean var27 = 0L != var5 && !class24.method329(var5); // L: 5823 - if (var27) { // L: 5825 - var20 = 15597568; - } - - int[] var21 = class69.sceneMinimapSprite.pixels; // L: 5826 - int var22 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5827 - if (var8 != 0 && var8 != 2) { // L: 5828 - var21[var22] = var20; // L: 5835 - var21[var22 + 1 + 512] = var20; // L: 5836 - var21[var22 + 1024 + 2] = var20; // L: 5837 - var21[var22 + 1536 + 3] = var20; // L: 5838 - } else { - var21[var22 + 1536] = var20; // L: 5829 - var21[var22 + 1 + 1024] = var20; // L: 5830 - var21[var22 + 512 + 2] = var20; // L: 5831 - var21[var22 + 3] = var20; // L: 5832 - } - } - } - - var5 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(var0, var1, var2); // L: 5842 - if (0L != var5) { // L: 5843 - var7 = Message.Entity_unpackID(var5); // L: 5844 - ObjectComposition var23 = Tiles.getObjectDefinition(var7); // L: 5845 - if (var23.mapSceneId != -1) { // L: 5846 - IndexedSprite var24 = FloorDecoration.mapSceneSprites[var23.mapSceneId]; // L: 5847 - if (var24 != null) { // L: 5848 - var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5849 - int var25 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5850 - var24.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var23.sizeY) * 4 + var25 + 48); // L: 5851 - } - } - } - - } // L: 5855 - - @ObfuscatedName("ln") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "360913539" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = InterfaceParent.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); // L: 11489 - var0.packetBuffer.writeByte(0); // L: 11490 - Client.packetWriter.addNode(var0); // L: 11491 - } // L: 11492 } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 021936fe6e..a74cfb662e 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,167 +4,215 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("fq") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("f") + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1566048417 + intValue = 1389619149 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lfb;" ) @Export("region") final WorldMapRegion region; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -211441443 + intValue = -794401753 ) @Export("element") int element; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lfd;" + descriptor = "Lff;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1002959697 + intValue = -405059171 ) @Export("subWidth") int subWidth; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 711676767 + intValue = -703752817 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Liw;Liw;ILfn;)V" + descriptor = "(Lij;Lij;ILfb;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { - super(var1, var2); // L: 17 - this.objectDefId = var3; // L: 18 - this.region = var4; // L: 19 - this.init(); // L: 20 - } // L: 21 + super(var1, var2); + this.objectDefId = var3; + this.region = var4; + this.init(); + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-819350446" + descriptor = "(B)V", + garbageValue = "64" ) @Export("init") void init() { - this.element = Tiles.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(Archive.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = Archive.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; // L: 30 + this.element = ClanChannel.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(HealthBarUpdate.WorldMapElement_get(this.element)); + WorldMapElement var1 = HealthBarUpdate.WorldMapElement_get(this.getElement()); + SpritePixels var2 = var1.getSpriteBool(false); + if (var2 != null) { + this.subWidth = var2.subWidth; + this.subHeight = var2.subHeight; } else { - this.subWidth = 0; // L: 33 - this.subHeight = 0; // L: 34 + this.subWidth = 0; + this.subHeight = 0; } - } // L: 36 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1717389517" + garbageValue = "995404902" ) @Export("getElement") public int getElement() { - return this.element; // L: 39 + return this.element; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lfd;", - garbageValue = "1736510941" + descriptor = "(B)Lff;", + garbageValue = "5" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 43 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-60" - ) - @Export("getSubWidth") - int getSubWidth() { - return this.subWidth; // L: 47 + return this.label; } @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-401407374" + garbageValue = "1077868698" + ) + @Export("getSubWidth") + int getSubWidth() { + return this.subWidth; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1851510146" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)Ljava/lang/String;", - garbageValue = "242028315" + descriptor = "(IIIII)V", + garbageValue = "1664758345" ) - public static String method3304(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); // L: 67 - if (var2 > 32767) { // L: 68 - var2 = 32767; - } + static final void method3260(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + Huffman.field3113[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } - byte[] var3 = new byte[var2]; // L: 69 - var0.offset += class250.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 70 - String var4 = Actor.decodeStringCp1252(var3, 0, var2); // L: 71 - var1 = var4; // L: 72 - } catch (Exception var6) { // L: 74 - var1 = "Cabbage"; // L: 75 + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var4 == var3 + var1 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } + } } - return var1; // L: 78 } - @ObfuscatedName("y") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjp;IIIZI)V", - garbageValue = "-554182310" + descriptor = "([BI)V", + garbageValue = "-2070330416" ) - public static void method3300(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class233.musicPlayerStatus = 1; // L: 50 - InvDefinition.musicTrackArchive = var1; // L: 51 - class233.musicTrackGroupId = var2; // L: 52 - class233.musicTrackFileId = var3; // L: 53 - class233.musicTrackVolume = var4; // L: 54 - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var5; // L: 55 - FaceNormal.pcmSampleLength = var0; // L: 56 - } // L: 57 + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else { + if (ByteArrayPool.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && class127.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { + ByteArrayPool.ByteArrayPool_arrays[var1][class127.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } - @ObfuscatedName("jx") + } + } + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1274785577" + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "-116" ) - static void method3305(int var0) { - class29.tempMenuAction = new MenuAction(); // L: 11004 - class29.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11005 - class29.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11006 - class29.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11007 - class29.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11008 - class29.tempMenuAction.action = Client.menuActions[var0]; // L: 11009 - } // L: 11010 + public static int method3265(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); + } + + return var2; + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1767689918" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = ObjectSound.getWidgetChild(PcmPlayer.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + UserComparator10.runScriptEvent(var1); + } + + Client.field564 = -1; + Client.isSpellSelected = false; + AttackOption.invalidateWidget(var0); + } + } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index e56fcfd232..75c5e98d58 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -1,116 +1,59 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fd") +@ObfuscatedName("ff") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("el") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lil;" ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("f") + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("s") @Export("text") String text; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 797016481 + intValue = -1335734451 ) @Export("width") int width; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2014432723 + intValue = 1270064663 ) @Export("height") int height; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfi;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILfg;)V" + descriptor = "(Ljava/lang/String;IILfi;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { - this.text = var1; // L: 10 - this.width = var2; // L: 11 - this.height = var3; // L: 12 - this.size = var4; // L: 13 - } // L: 14 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "427619994" - ) - public static int method3714(int var0, int var1, int var2) { - int var3 = UserComparator2.method6890(var2 - var1 + 1); // L: 57 - var3 <<= var1; // L: 58 - var0 |= var3; // L: 59 - return var0; // L: 60 + this.text = var1; + this.width = var2; + this.height = var3; + this.size = var4; } - @ObfuscatedName("x") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-481933347" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "794875000" ) - static int method3715(int var0, Script var1, boolean var2) { - Widget var7; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1223 - int var4; - if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1240 - var7 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1241 - var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1242 - if (var4 >= 1 && var4 <= 10) { // L: 1243 - class106 var8 = new class106(var4, var7.id, var7.childIndex, var7.itemId); // L: 1246 - Interpreter.field965.add(var8); // L: 1247 - return 1; // L: 1248 - } else { - throw new RuntimeException(); // L: 1244 - } - } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1250 - ChatChannel.Interpreter_intStackSize -= 3; // L: 1251 - int var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1252 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1253 - int var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 1254 - if (var5 >= 1 && var5 <= 10) { // L: 1255 - class106 var6 = new class106(var5, var3, var4, WorldMapData_1.getWidget(var3).itemId); // L: 1258 - Interpreter.field965.add(var6); // L: 1259 - return 1; // L: 1260 - } else { - throw new RuntimeException(); // L: 1256 - } - } else { - return 2; // L: 1262 - } - } else if (Interpreter.field966 >= 10) { // L: 1224 - throw new RuntimeException(); // L: 1225 - } else { - if (var0 >= 2000) { // L: 1228 - var7 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1229 - } else { - var7 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1231 - } - - if (var7.onResize == null) { // L: 1232 - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); // L: 1233 - var9.widget = var7; // L: 1234 - var9.args = var7.onResize; // L: 1235 - var9.field1154 = Interpreter.field966 + 1; // L: 1236 - Client.scriptEvents.addFirst(var9); // L: 1237 - return 1; // L: 1238 - } - } + static void method3650(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index e81c527d6f..f3f3229793 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,185 +4,118 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fi") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfi;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfi;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfi;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -543167351 - ) - final int field1943; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -12875383 + intValue = 1627067465 ) - final int field1948; - @ObfuscatedName("o") + final int field1918; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -210309675 + intValue = 1595583091 ) - final int field1945; + final int field1919; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 660625401 + ) + final int field1920; static { - WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); // L: 7 - WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); // L: 8 - WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); // L: 9 + WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field1943 = var1; // L: 19 - this.field1948 = var2; // L: 20 - this.field1945 = var3; // L: 21 - } // L: 22 + this.field1918 = var1; + this.field1919 = var2; + this.field1920 = var3; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "1269824536" + garbageValue = "1014095385" ) - boolean method3278(float var1) { - return var1 >= (float)this.field1945; // L: 25 + boolean method3231(float var1) { + return var1 >= (float)this.field1920; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)[Lfg;", - garbageValue = "589843549" + descriptor = "(B)[Lfi;", + garbageValue = "1" ) - static WorldMapLabelSize[] method3280() { - return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large}; // L: 15 + static WorldMapLabelSize[] method3237() { + return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Lfg;", - garbageValue = "2" + descriptor = "(II)Lfi;", + garbageValue = "-1751099573" ) - static WorldMapLabelSize method3281(int var0) { - WorldMapLabelSize[] var1 = method3280(); // L: 30 + static WorldMapLabelSize method3232(int var0) { + WorldMapLabelSize[] var1 = method3237(); - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 - WorldMapLabelSize var3 = var1[var2]; // L: 32 - if (var0 == var3.field1948) { // L: 34 - return var3; // L: 35 + for (int var2 = 0; var2 < var1.length; ++var2) { + WorldMapLabelSize var3 = var1[var2]; + if (var0 == var3.field1919) { + return var3; } } - return null; // L: 40 + return null; } - @ObfuscatedName("v") + @ObfuscatedName("gn") @ObfuscatedSignature( - descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;I)[Lof;", - garbageValue = "652881992" + descriptor = "(II)V", + garbageValue = "47989270" ) - public static IndexedSprite[] method3268(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 44 - int var4 = var0.getFileId(var3, var2); // L: 45 - IndexedSprite[] var5; - if (!Message.method1263(var0, var3, var4)) { // L: 48 - var5 = null; // L: 49 + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field624 = 0L; + if (var0 >= 2) { + Client.isResizable = true; } else { - IndexedSprite[] var7 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 54 - - for (int var8 = 0; var8 < class397.SpriteBuffer_spriteCount; ++var8) { // L: 55 - IndexedSprite var9 = var7[var8] = new IndexedSprite(); // L: 56 - var9.width = class397.SpriteBuffer_spriteWidth; // L: 57 - var9.height = class244.SpriteBuffer_spriteHeight; // L: 58 - var9.xOffset = class397.SpriteBuffer_xOffsets[var8]; // L: 59 - var9.yOffset = class26.SpriteBuffer_yOffsets[var8]; // L: 60 - var9.subWidth = Canvas.SpriteBuffer_spriteWidths[var8]; // L: 61 - var9.subHeight = Clock.SpriteBuffer_spriteHeights[var8]; // L: 62 - var9.palette = class397.SpriteBuffer_spritePalette; // L: 63 - var9.pixels = class126.SpriteBuffer_pixels[var8]; // L: 64 - } - - ArchiveDisk.method5993(); // L: 66 - var5 = var7; // L: 69 + Client.isResizable = false; + } + + if (MusicPatch.getWindowedMode() == 1) { + Script.client.setMaxCanvasSize(765, 503); + } else { + Script.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25) { + PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(MusicPatch.getWindowedMode()); + var1.packetBuffer.writeShort(MouseRecorder.canvasWidth); + var1.packetBuffer.writeShort(Client.canvasHeight); + Client.packetWriter.addNode(var1); } - return var5; // L: 71 } - - @ObfuscatedName("gt") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "191984233" - ) - static final void method3274() { - int var0 = Players.Players_count; // L: 4078 - int[] var1 = Players.Players_indices; // L: 4079 - - for (int var2 = 0; var2 < var0; ++var2) { // L: 4080 - Player var3 = Client.players[var1[var2]]; // L: 4081 - if (var3 != null) { // L: 4082 - World.updateActorSequence(var3, 1); // L: 4083 - } - } - - } // L: 4086 - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(Lcl;I)V", - garbageValue = "-2040471803" - ) - static final void method3279(Actor var0) { - if (var0.field1269 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapScaleHandler.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4182 - int var1 = var0.field1269 - var0.field1276; // L: 4183 - int var2 = Client.cycle - var0.field1276; // L: 4184 - int var3 = var0.field1225 * 64 + var0.field1264 * 128; // L: 4185 - int var4 = var0.field1225 * 64 + var0.field1268 * 128; // L: 4186 - int var5 = var0.field1225 * 64 + var0.field1265 * 128; // L: 4187 - int var6 = var0.field1225 * 64 + var0.field1267 * 128; // L: 4188 - var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 4189 - var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; // L: 4190 - } - - var0.field1242 = 0; // L: 4192 - var0.orientation = var0.field1270; // L: 4193 - var0.rotation = var0.orientation; // L: 4194 - } // L: 4195 - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "([Liv;Liv;ZI)V", - garbageValue = "-1843640686" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1327325403 * -1727030445 : var1.width * 1476009263 * -527414833; // L: 9936 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 845859575 * -2062739769 : var1.height * -1001050535 * 25115113; // L: 9937 - DynamicObject.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9938 - if (var1.children != null) { // L: 9939 - DynamicObject.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9940 - if (var5 != null) { // L: 9941 - JagexCache.method2637(var5.group, var3, var4, var2); - } - - if (var1.contentType == 1337) { // L: 9942 - } - - } // L: 9943 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 3794f12a28..3fcdefd260 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -9,591 +9,467 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fx") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("qn") - @ObfuscatedSignature( - descriptor = "Lb;" + @ObfuscatedName("ed") + @ObfuscatedGetter( + intValue = 567755745 ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("f") + @Export("worldPort") + static int worldPort; + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "Lcn;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("s") @Export("loaded") boolean loaded; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("loadStarted") boolean loadStarted; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lgi;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lom;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("j") + @ObfuscatedName("l") @Export("icons") HashMap icons; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[Lfn;" + descriptor = "[[Lfb;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "[Lof;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljy;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("fonts") final HashMap fonts; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 303896089 + intValue = 1390859875 ) @Export("tileX") int tileX; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1832860335 + intValue = -1222384123 ) @Export("tileY") int tileY; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 590568685 + intValue = 390141283 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1476623753 + intValue = -951709163 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1546416373 + intValue = -1782967125 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lof;Ljava/util/HashMap;Ljp;Ljp;)V" + descriptor = "([Lof;Ljava/util/HashMap;Ljy;Ljy;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { - this.loaded = false; // L: 16 - this.loadStarted = false; // L: 17 - this.scaleHandlers = new HashMap(); // L: 22 - this.pixelsPerTile = 0; // L: 31 - this.mapSceneSprites = var1; // L: 34 - this.fonts = var2; // L: 35 - this.geographyArchive = var3; // L: 36 - this.groundArchive = var4; // L: 37 - } // L: 38 + this.loaded = false; + this.loadStarted = false; + this.scaleHandlers = new HashMap(); + this.pixelsPerTile = 0; + this.mapSceneSprites = var1; + this.fonts = var2; + this.geographyArchive = var3; + this.groundArchive = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;Ljava/lang/String;ZS)V", - garbageValue = "-5214" + descriptor = "(Ljy;Ljava/lang/String;ZI)V", + garbageValue = "628227609" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { - if (!this.loadStarted) { // L: 41 - this.loaded = false; // L: 44 - this.loadStarted = true; // L: 45 - System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field2131.name); // L: 47 - int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2131.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2134.name, var2)); // L: 50 - System.nanoTime(); // L: 51 - System.nanoTime(); // L: 52 - this.mapAreaData = new WorldMapAreaData(); // L: 53 + if (!this.loadStarted) { + this.loaded = false; + this.loadStarted = true; + System.nanoTime(); + int var4 = var1.getGroupId(WorldMapCacheName.field2117.name); + int var5 = var1.getFileId(var4, var2); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2117.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2115.name, var2)); + System.nanoTime(); + System.nanoTime(); + this.mapAreaData = new WorldMapAreaData(); try { - this.mapAreaData.init(var6, var7, var5, var3); // L: 55 - } catch (IllegalStateException var19) { // L: 57 - return; // L: 58 + this.mapAreaData.init(var6, var7, var5, var3); + } catch (IllegalStateException var19) { + return; } - this.mapAreaData.getOriginX(); // L: 60 - this.mapAreaData.getOriginPlane(); // L: 61 - this.mapAreaData.getOriginY(); // L: 62 - this.tileX = this.mapAreaData.getRegionLowX() * 64; // L: 63 - this.tileY = this.mapAreaData.getRegionLowY() * 64; // L: 64 - this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; // L: 65 - this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; // L: 66 - int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; // L: 67 - int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68 - System.nanoTime(); // L: 69 - System.nanoTime(); // L: 70 - class44.method532(); // L: 71 - this.regions = new WorldMapRegion[var16][var9]; // L: 72 - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 + this.mapAreaData.getOriginX(); + this.mapAreaData.getOriginPlane(); + this.mapAreaData.getOriginY(); + this.tileX = this.mapAreaData.getRegionLowX() * 64; + this.tileY = this.mapAreaData.getRegionLowY() * 64; + this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; + this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; + int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; + int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; + System.nanoTime(); + System.nanoTime(); + VarpDefinition.method2713(); + this.regions = new WorldMapRegion[var16][var9]; + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); 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(); + int var12 = var11.regionX; + int var13 = var11.regionY; + int var14 = var12 - this.mapAreaData.getRegionLowX(); + int var15 = var13 - this.mapAreaData.getRegionLowY(); + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); } - 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) { + for (int var18 = 0; var18 < var9; ++var18) { + if (this.regions[var17][var18] == null) { + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); } } } - System.nanoTime(); // L: 92 - System.nanoTime(); // L: 93 - if (var1.isValidFileName(WorldMapCacheName.field2130.name, var2)) { // L: 94 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2130.name, var2); // L: 95 - this.compositeTextureSprite = class125.convertJpgToSprite(var20); // L: 96 + System.nanoTime(); + System.nanoTime(); + if (var1.isValidFileName(WorldMapCacheName.field2114.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2114.name, var2); + this.compositeTextureSprite = ClientPreferences.convertJpgToSprite(var20); } - System.nanoTime(); // L: 98 - var1.clearGroups(); // L: 99 - var1.clearFiles(); // L: 100 - this.loaded = true; // L: 101 + System.nanoTime(); + var1.clearGroups(); + var1.clearFiles(); + this.loaded = true; } - } // L: 42 102 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1914125455" + descriptor = "(S)V", + garbageValue = "9283" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; // L: 105 - } // L: 106 + this.icons = null; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "1" + descriptor = "(IIIIIIIII)V", + garbageValue = "-648114963" ) @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; + int var10 = Rasterizer2D.Rasterizer2D_width; + int var11 = Rasterizer2D.Rasterizer2D_height; + int[] var12 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var12); + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); + int var15 = (int)Math.ceil((double)var14); + this.pixelsPerTile = var15; + if (!this.scaleHandlers.containsKey(var15)) { + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); + var16.init(); + this.scaleHandlers.put(var15, var16); } - int var23 = var13.x + var13.width - 1; // L: 123 - int var17 = var13.height + var13.y - 1; // L: 124 + int var23 = var13.width + var13.x - 1; + int var17 = var13.y + var13.height - 1; 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) { + for (var19 = var13.y; var19 <= var17; ++var19) { + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } - Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130 - Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131 - var18 = (int)(64.0F * var14); // L: 132 - var19 = this.tileX + var1; // L: 133 - int var20 = var2 + this.tileY; // L: 134 + Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); + Rasterizer2D.Rasterizer2D_setClipArray(var12); + var18 = (int)(64.0F * var14); + var19 = this.tileX + var1; + int var20 = var2 + this.tileY; - 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].method3407(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) { + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { + this.regions[var21][var22].method3360(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); } } - } // L: 140 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", - garbageValue = "-95" - ) - @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)(var15 * 64.0F); // L: 145 - int var17 = this.tileX + var1; // L: 146 - int var18 = var2 + this.tileY; // L: 147 - - int var19; - int var20; - for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 148 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 149 - if (var13) { // L: 150 - this.regions[var19][var20].initWorldMapIcon1s(); // L: 151 - } - - this.regions[var19][var20].method3417(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153 - } - } - - if (var10 != null && var11 > 0) { // L: 156 - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 157 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 158 - this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 - } - } - } - - } // L: 163 + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;III)V", - garbageValue = "-1541196041" + descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", + garbageValue = "-284044712" + ) + @Export("drawElements") + public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); + int var16 = (int)(var15 * 64.0F); + int var17 = this.tileX + var1; + int var18 = var2 + this.tileY; + + int var19; + int var20; + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { + if (var13) { + this.regions[var19][var20].initWorldMapIcon1s(); + } + + this.regions[var19][var20].method3370(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + } + } + + if (var10 != null && var11 > 0) { + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { + this.regions[var19][var20].flashElements(var10, var11, var12); + } + } + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIIILjava/util/HashSet;IIS)V", + garbageValue = "31069" ) @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) { + this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); + if (var6 > 0 && var6 % var7 < var7 / 2) { + if (this.icons == null) { + this.buildIcons0(); } - Iterator var8 = var5.iterator(); // L: 176 + Iterator var8 = var5.iterator(); while (true) { List var10; do { if (!var8.hasNext()) { - return; // L: 193 + return; } - 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(); + var10 = (List)this.icons.get(var9); + } while(var10 == null); Iterator var11 = var10.iterator(); - while (var11.hasNext()) { // L: 183 - 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 + while (var11.hasNext()) { + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); } } } } - } // L: 167 171 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "1811762017" - ) - public List method3526(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - LinkedList var11 = new LinkedList(); // L: 196 - if (!this.loaded) { // L: 197 - return var11; // L: 198 - } else { - WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200 - float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201 - int var14 = (int)(64.0F * var13); // L: 202 - int var15 = this.tileX + var1; // L: 203 - int var16 = var2 + this.tileY; // L: 204 - - for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { // L: 205 - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 206 - List var19 = this.regions[var17][var18].method3437(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207 - if (!var19.isEmpty()) { // L: 208 - var11.addAll(var19); // L: 209 - } - } - } - - return var11; // L: 213 - } } - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIII)Lfh;", - garbageValue = "-2057635793" + descriptor = "(IIIIIIIIIIS)Ljava/util/List;", + garbageValue = "1106" + ) + public List method3480(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + LinkedList var11 = new LinkedList(); + if (!this.loaded) { + return var11; + } else { + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); + float var13 = this.getPixelsPerTile(var7, var3 - var1); + int var14 = (int)(64.0F * var13); + int var15 = this.tileX + var1; + int var16 = var2 + this.tileY; + + for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { + for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { + List var19 = this.regions[var17][var18].method3391(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); + if (!var19.isEmpty()) { + var11.addAll(var19); + } + } + } + + return var11; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIIII)Lfo;", + garbageValue = "746542950" ) @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); + int var6 = this.tileX + var1; + int var7 = var2 + this.tileY; + int var8 = var3 + this.tileX; + int var9 = var4 + this.tileY; + int var10 = var6 / 64; + int var11 = var7 / 64; + int var12 = var8 / 64; + int var13 = var9 / 64; + var5.width = var12 - var10 + 1; + var5.height = var13 - var11 + 1; + var5.x = var10 - this.mapAreaData.getRegionLowX(); + var5.y = var11 - this.mapAreaData.getRegionLowY(); + if (var5.x < 0) { + var5.width += var5.x; + var5.x = 0; } - 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) { + var5.width = this.regions.length - var5.x; } - if (var5.y < 0) { // L: 237 - var5.height += var5.y; // L: 238 - var5.y = 0; // L: 239 + if (var5.y < 0) { + var5.height += var5.y; + var5.y = 0; } - 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) { + var5.height = this.regions[0].length - var5.y; + } + + var5.width = Math.min(var5.width, this.regions.length); + var5.height = Math.min(var5.height, this.regions[0].length); + return var5; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "2" + ) + @Export("isLoaded") + public boolean isLoaded() { + return this.loaded; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/HashMap;", + garbageValue = "1746400791" + ) + @Export("buildIcons") + public HashMap buildIcons() { + this.buildIcons0(); + return this.icons; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1138210716" + ) + @Export("buildIcons0") + void buildIcons0() { + if (this.icons == null) { + this.icons = new HashMap(); + } + + this.icons.clear(); + + for (int var1 = 0; var1 < this.regions.length; ++var1) { + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { + List var3 = this.regions[var1][var2].icons(); + Iterator var4 = var3.iterator(); + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); + if (var5.hasValidElement()) { + int var6 = var5.getElement(); + if (!this.icons.containsKey(var6)) { + LinkedList var7 = new LinkedList(); + var7.add(var5); + this.icons.put(var6, var7); + } else { + List var8 = (List)this.icons.get(var6); + var8.add(var5); + } + } + } + } } - var5.width = Math.min(var5.width, this.regions.length); // L: 244 - var5.height = Math.min(var5.height, this.regions[0].length); // L: 245 - return var5; // L: 246 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-10" - ) - @Export("isLoaded") - public boolean isLoaded() { - return this.loaded; // L: 250 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "-1763373289" - ) - @Export("buildIcons") - public HashMap buildIcons() { - this.buildIcons0(); // L: 254 - return this.icons; // L: 255 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-112" - ) - @Export("buildIcons0") - void buildIcons0() { - if (this.icons == null) { // L: 259 - this.icons = new HashMap(); // L: 260 - } - - this.icons.clear(); // L: 262 - - for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 263 - for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 264 - List var3 = this.regions[var1][var2].icons(); // L: 265 - Iterator var4 = var3.iterator(); // L: 266 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 267 - if (var5.hasValidElement()) { // L: 269 - int var6 = var5.getElement(); // L: 270 - if (!this.icons.containsKey(var6)) { // L: 271 - LinkedList var7 = new LinkedList(); // L: 272 - var7.add(var5); // L: 273 - this.icons.put(var6, var7); // L: 274 - } else { - List var8 = (List)this.icons.get(var6); // L: 277 - var8.add(var5); // L: 278 - } - } - } - } - } - - } // L: 284 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(III)F", - garbageValue = "1764352522" + descriptor = "(IIB)F", + garbageValue = "34" ) @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; + if (var3 > 8.0F) { return 8.0F; - } else if (var3 < 1.0F) { // L: 289 + } else if (var3 < 1.0F) { 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); + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; } } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Laa;I)V", - garbageValue = "59413416" - ) - static void method3538(GameEngine var0) { - while (SecureRandomCallable.isKeyDown()) { // L: 1409 - if (SoundCache.field446 == 13) { // L: 1410 - Login.worldSelectOpen = false; // L: 1412 - class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1413 - class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1414 - Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 1415 - return; // L: 1417 - } - - if (SoundCache.field446 == 96) { // L: 1419 - if (Login.worldSelectPage > 0 && NetCache.worldSelectLeftSprite != null) { // L: 1420 - --Login.worldSelectPage; // L: 1421 - } - } else if (SoundCache.field446 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class12.worldSelectRightSprite != null) { // L: 1424 1425 - ++Login.worldSelectPage; // L: 1426 - } - } - - if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1430 - int var1 = Login.xPadding + 280; // L: 1431 - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1432 - World.changeWorldSelectSorting(0, 0); // L: 1433 - return; // L: 1434 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1436 - World.changeWorldSelectSorting(0, 1); // L: 1437 - return; // L: 1438 - } - - int var2 = Login.xPadding + 390; // L: 1440 - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1441 - World.changeWorldSelectSorting(1, 0); // L: 1442 - return; // L: 1443 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1445 - World.changeWorldSelectSorting(1, 1); // L: 1446 - return; // L: 1447 - } - - int var3 = Login.xPadding + 500; // L: 1449 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1450 - World.changeWorldSelectSorting(2, 0); // L: 1451 - return; // L: 1452 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1454 - World.changeWorldSelectSorting(2, 1); // L: 1455 - return; // L: 1456 - } - - int var4 = Login.xPadding + 610; // L: 1458 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1459 - World.changeWorldSelectSorting(3, 0); // L: 1460 - return; // L: 1461 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1463 - World.changeWorldSelectSorting(3, 1); // L: 1464 - return; // L: 1465 - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1467 - Login.worldSelectOpen = false; // L: 1469 - class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1470 - class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1471 - Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 1472 - return; // L: 1474 - } - - if (Login.hoveredWorldIndex != -1) { // L: 1476 - World var5 = World.World_worlds[Login.hoveredWorldIndex]; // L: 1477 - GrandExchangeOfferAgeComparator.changeWorld(var5); // L: 1478 - Login.worldSelectOpen = false; // L: 1480 - class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1481 - class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1482 - Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 1483 - return; // L: 1485 - } - - if (Login.worldSelectPage > 0 && NetCache.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= NetCache.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class0.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class0.canvasHeight / 2 + 50) { // L: 1487 - --Login.worldSelectPage; // L: 1488 - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && class12.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= AttackOption.canvasWidth - class12.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= AttackOption.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class0.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class0.canvasHeight / 2 + 50) { // L: 1490 - ++Login.worldSelectPage; // L: 1491 - } - } - - } // L: 1494 - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-306372299" - ) - static final void method3557() { - int[] var0 = Players.Players_indices; // L: 3852 - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3853 - Player var4 = Client.players[var0[var1]]; // L: 3854 - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3855 - --var4.overheadTextCyclesRemaining; // L: 3856 - if (var4.overheadTextCyclesRemaining == 0) { // L: 3857 - var4.overheadText = null; - } - } - } - - for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3860 - int var2 = Client.npcIndices[var1]; // L: 3861 - NPC var3 = Client.npcs[var2]; // L: 3862 - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3863 - --var3.overheadTextCyclesRemaining; // L: 3864 - if (var3.overheadTextCyclesRemaining == 0) { // L: 3865 - var3.overheadText = null; - } - } - } - - } // L: 3868 } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 9e0a55fcd3..5fead3550f 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,113 +4,140 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fo") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("f") + @ObfuscatedName("sd") @ObfuscatedGetter( - intValue = -1826737113 + longValue = 6362986280713500467L + ) + static long field2066; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1221403027 ) @Export("width") int width; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 813874845 + intValue = -1042567567 ) @Export("height") int height; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1282834747 + intValue = -1743568477 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 568186345 + intValue = 737503149 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "Lfx;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lft;)V" + descriptor = "(Lfx;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; // L: 303 + this.this$0 = var1; } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lbk;Lbk;IZI)I", - garbageValue = "1719503771" + descriptor = "(III)I", + garbageValue = "-1440200962" ) - @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; - } + public static int method3644(int var0, int var1) { + int var2; + if (var1 > var0) { + var2 = var0; + var0 = var1; + var1 = var2; + } - if (var5 == -1) { // L: 216 - var5 = 2001; - } + while (var1 != 0) { + var2 = var0 % var1; + var0 = var1; + var1 = var2; + } + + return var0; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1249174439" + ) + static boolean method3643(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { + return true; } + } - 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; + return false; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1409868397" + ) + static int method3645(int var0, Script var1, boolean var2) { + if (var0 == 7100) { + ++Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 7101) { + class1.Interpreter_stringStackSize += 2; + return 1; + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { + if (var0 == 7106) { + ++Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 7107) { + ++Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 7108) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere.method5252() ? 1 : 0; + return 1; + } else if (var0 == 7110) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7120) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7121) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7122) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; } else { - return var0.activity.compareTo(var1.activity); // L: 227 + return 2; } - } else if (var2 == 4) { // L: 229 - return var0.method1757() ? (var1.method1757() ? 0 : 1) : (var1.method1757() ? -1 : 0); - } else if (var2 == 5) { // L: 230 - return var0.method1749() ? (var1.method1749() ? 0 : 1) : (var1.method1749() ? -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 + ++Interpreter.Interpreter_intStackSize; + return 1; } } - @ObfuscatedName("lq") + @ObfuscatedName("lm") @ObfuscatedSignature( - descriptor = "(Lnt;IB)V", - garbageValue = "-36" + descriptor = "(II)V", + garbageValue = "-1832697259" ) - static void method3709(Buffer var0, int var1) { - byte[] var2 = var0.array; // L: 11648 - if (Client.randomDatData == null) { // L: 11650 - Client.randomDatData = new byte[24]; - } - - class307.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 11651 - if (JagexCache.JagexCache_randomDat != null) { // L: 11654 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 11656 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11657 - } catch (Exception var4) { // L: 11659 - } - } - - } // L: 11662 + static void method3646(int var0) { + Client.oculusOrbState = var0; + } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 637a39f183..323cf7c35d 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -9,54 +9,53 @@ 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("fb") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhh;" + descriptor = "Lhk;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -91763405 + intValue = 1338895583 ) @Export("regionX") int regionX; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1756122927 + intValue = 2091575285 ) @Export("regionY") int regionY; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfo;" + descriptor = "Lfj;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("h") + @ObfuscatedName("o") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -314457837 + intValue = 2141135903 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 605397793 + intValue = -889260385 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("b") + @ObfuscatedName("p") @Export("icon0List") List icon0List; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("iconMap") HashMap iconMap; @ObfuscatedName("k") @@ -64,114 +63,89 @@ public class WorldMapRegion { 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 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1948817139" - ) - void method3407(int var1, int var2, int var3) { - int var5 = this.regionX; // L: 57 - int var6 = this.regionY; // L: 58 - int var7 = this.pixelsPerTile; // L: 59 - SpritePixels var4 = (SpritePixels)WorldMapRegion_cachedSprites.get(GameEngine.method716(var5, var6, var7)); // L: 61 - if (var4 != null) { // L: 64 - if (var3 == this.pixelsPerTile * 64) { // L: 65 - var4.drawAt(var1, var2); // L: 66 - } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 69 - } - - } - } // L: 71 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lfo;Ljava/util/List;I)V", - garbageValue = "-2121590512" - ) - @Export("initWorldMapData0") - void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); // L: 74 - this.worldMapData_0 = var1; // L: 75 - this.addAllToIconList(var2); // L: 76 - } // L: 77 + this.regionX = var1; + this.regionY = var2; + this.worldMapData1List = new LinkedList(); + this.icon0List = new LinkedList(); + this.iconMap = new HashMap(); + this.backgroundColor = var3 | -16777216; + this.fonts = var4; + } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "2112928302" + descriptor = "(IIIB)V", + garbageValue = "0" + ) + void method3360(int var1, int var2, int var3) { + SpritePixels var4 = StudioGame.method4914(this.regionX, this.regionY, this.pixelsPerTile); + if (var4 != null) { + if (var3 == this.pixelsPerTile * 64) { + var4.drawAt(var1, var2); + } else { + var4.drawScaledWorldmap(var1, var2, var3, var3); + } + + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lfj;Ljava/util/List;B)V", + garbageValue = "-14" + ) + @Export("initWorldMapData0") + void initWorldMapData0(WorldMapData_0 var1, List var2) { + this.iconMap.clear(); + this.worldMapData_0 = var1; + this.addAllToIconList(var2); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", + garbageValue = "-84" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 80 - Iterator var3 = var1.iterator(); // L: 81 + this.iconMap.clear(); + Iterator var3 = var1.iterator(); while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 82 - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 84 - this.worldMapData1List.add(var4); // L: 85 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { + this.worldMapData1List.add(var4); } } - this.addAllToIconList(var2); // L: 89 - } // L: 90 + this.addAllToIconList(var2); + } - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIILfy;I)V", - garbageValue = "831467254" + descriptor = "(IIIILfk;I)V", + garbageValue = "-563989234" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 93 - label74: - for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 94 - for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 95 - WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 96 - if (var9 != null && var9.length != 0) { // L: 97 - WorldMapDecoration[] var10 = var9; // L: 101 + for (int var6 = var1; var6 < var3 + var1; ++var6) { + label49: + for (int var7 = var2; var7 < var2 + var4; ++var7) { + for (int var8 = 0; var8 < var5.planes; ++var8) { + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; + if (var9 != null && var9.length != 0) { + WorldMapDecoration[] var10 = var9; - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 102 - ObjectComposition var13; - boolean var14; - label65: { - WorldMapDecoration var12 = var10[var11]; // L: 103 - var13 = Tiles.getObjectDefinition(var12.objectDefinitionId); // L: 105 - if (var13.transforms != null) { // L: 108 - int[] var15 = var13.transforms; // L: 110 - - for (int var16 = 0; var16 < var15.length; ++var16) { // L: 111 - int var17 = var15[var16]; // L: 112 - ObjectComposition var18 = Tiles.getObjectDefinition(var17); // L: 114 - if (var18.mapIconId != -1) { // L: 115 - var14 = true; // L: 116 - break label65; - } - } - } else if (var13.mapIconId != -1) { // L: 123 - var14 = true; // L: 124 - break label65; // L: 125 - } - - var14 = false; // L: 127 - } - - if (var14) { // L: 129 - this.getIcon(var13, var8, var6, var7, var5); // L: 132 - continue label74; // L: 133 + for (int var11 = 0; var11 < var10.length; ++var11) { + WorldMapDecoration var12 = var10[var11]; + ObjectComposition var13 = ClanChannel.getObjectDefinition(var12.objectDefinitionId); + if (AttackOption.method2003(var13)) { + this.getIcon(var13, var8, var6, var7, var5); + continue label49; } } } @@ -179,475 +153,435 @@ public class WorldMapRegion { } } - } // L: 140 + } - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lez;IIILfy;B)V", - garbageValue = "111" + descriptor = "(Lem;IIILfk;I)V", + garbageValue = "1503822535" ) @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: 143 - Coord var7 = null; // L: 144 - if (this.worldMapData_0 != null) { // L: 145 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 146 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); + Coord var7 = null; + if (this.worldMapData_0 != null) { + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 149 - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 150 + WorldMapData_1 var8 = (WorldMapData_1)var5; + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 153 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 154 + if (var1.transforms != null) { + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - var9 = Archive.WorldMapElement_get(var1.mapIconId); // L: 157 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 158 + var9 = HealthBarUpdate.WorldMapElement_get(var1.mapIconId); + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } - var9 = Archive.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 160 - if (var9.field1569) { // L: 161 - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 162 + var9 = HealthBarUpdate.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); + if (var9.field1529) { + this.iconMap.put(new Coord(0, var3, var4), var10); } - } // L: 164 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "753583707" + ) + @Export("initWorldMapIcon1s") + void initWorldMapIcon1s() { + Iterator var1 = this.iconMap.values().iterator(); + + while (var1.hasNext()) { + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); + if (var2 instanceof WorldMapIcon_1) { + ((WorldMapIcon_1)var2).init(); + } + } + + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljava/util/List;I)V", + garbageValue = "-53087144" + ) + @Export("addAllToIconList") + void addAllToIconList(List var1) { + Iterator var2 = var1.iterator(); + + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); + if (HealthBarUpdate.WorldMapElement_get(var3.element).field1529 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3389(var3.element)); + this.icon0List.add(var4); + } + } + + } @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-95285337" + garbageValue = "1398783565" ) - @Export("initWorldMapIcon1s") - void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 167 - - while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 168 - if (var2 instanceof WorldMapIcon_1) { // L: 170 - ((WorldMapIcon_1)var2).init(); // L: 171 - } - } - - } // L: 175 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/util/List;I)V", - garbageValue = "631658105" - ) - @Export("addAllToIconList") - void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); // L: 178 - - while (var2.hasNext()) { // L: 189 - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 179 - if (Archive.WorldMapElement_get(var3.element).field1569 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 181 184 - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3435(var3.element)); // L: 185 - this.icon0List.add(var4); // L: 186 - } - } - - } // L: 190 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1612272147" - ) - void method3414() { - if (this.worldMapData_0 != null) { // L: 193 - this.worldMapData_0.reset(); // L: 194 + void method3367() { + if (this.worldMapData_0 != null) { + this.worldMapData_0.reset(); } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 197 + Iterator var1 = this.worldMapData1List.iterator(); while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 198 - var2.reset(); // L: 200 + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); + var2.reset(); } } - } // L: 204 + } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljp;B)Z", - garbageValue = "37" + descriptor = "(Ljy;I)Z", + garbageValue = "-1741906357" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 207 - if (this.worldMapData_0 != null) { // L: 208 - this.worldMapData_0.loadGeography(var1); // L: 209 - if (this.worldMapData_0.isFullyLoaded()) { // L: 210 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 211 - return true; // L: 212 + this.iconMap.clear(); + if (this.worldMapData_0 != null) { + this.worldMapData_0.loadGeography(var1); + if (this.worldMapData_0.isFullyLoaded()) { + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); + return true; } else { - return false; // L: 214 + return false; } } else { - boolean var2 = true; // L: 217 + boolean var2 = true; Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 218 222 - var4 = (WorldMapData_1)var3.next(); // L: 219 - var4.loadGeography(var1); // L: 221 + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { + var4 = (WorldMapData_1)var3.next(); + var4.loadGeography(var1); } - if (var2) { // L: 225 - var3 = this.worldMapData1List.iterator(); // L: 226 + if (var2) { + var3 = this.worldMapData1List.iterator(); while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 227 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 229 + var4 = (WorldMapData_1)var3.next(); + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); } } - return var2; // L: 233 + return var2; } } - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILgs;[Lof;Ljp;Ljp;B)V", - garbageValue = "-40" + descriptor = "(ILgb;[Lof;Ljy;Ljy;B)V", + garbageValue = "29" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; // L: 238 - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 239 - int var7 = this.regionX; // L: 243 - int var8 = this.regionY; // L: 244 - SpritePixels var6 = (SpritePixels)WorldMapRegion_cachedSprites.get(GameEngine.method716(var7, var8, var1)); // L: 246 - if (var6 == null) { // L: 248 - boolean var9 = true; // L: 251 - var9 &= this.loadGeography(var4); // L: 252 - int var11; - if (this.worldMapData_0 != null) { // L: 255 - var11 = this.worldMapData_0.groupId; // L: 256 + this.pixelsPerTile = var1; + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { + if (StudioGame.method4914(this.regionX, this.regionY, var1) == null) { + boolean var6 = true; + var6 &= this.loadGeography(var4); + int var8; + if (this.worldMapData_0 != null) { + var8 = this.worldMapData_0.groupId; } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 259 + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; } - var9 &= var5.tryLoadGroup(var11); // L: 261 - if (var9) { // L: 262 - byte[] var10 = var5.takeFileFlat(var11); // L: 263 - WorldMapSprite var12; - if (var10 == null) { // L: 266 - var12 = new WorldMapSprite(); // L: 267 + var6 &= var5.tryLoadGroup(var8); + if (var6) { + byte[] var7 = var5.takeFileFlat(var8); + WorldMapSprite var9; + if (var7 == null) { + var9 = new WorldMapSprite(); } else { - var12 = new WorldMapSprite(class125.convertJpgToSprite(var10).pixels); // L: 270 + var9 = new WorldMapSprite(ClientPreferences.convertJpgToSprite(var7).pixels); } - SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 273 - var14.setRaster(); // L: 274 - if (this.worldMapData_0 != null) { // L: 275 - this.method3419(var2, var3, var12); // L: 276 + SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var11.setRaster(); + if (this.worldMapData_0 != null) { + this.method3372(var2, var3, var9); } else { - this.method3420(var2, var3, var12); // L: 279 + this.method3373(var2, var3, var9); } - int var15 = this.regionX; // L: 281 - int var16 = this.regionY; // L: 282 - int var17 = this.pixelsPerTile; // L: 283 - WorldMapRegion_cachedSprites.put(var14, GameEngine.method716(var15, var16, var17), var14.pixels.length * 4); // L: 285 - this.method3414(); // L: 287 + int var12 = this.regionX; + int var13 = this.regionY; + int var14 = this.pixelsPerTile; + WorldMapRegion_cachedSprites.put(var11, HitSplatDefinition.method2988(var12, var13, var14), var11.pixels.length * 4); + this.method3367(); } } } - } // L: 240 249 288 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;B)V", - garbageValue = "92" - ) - void method3417(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 291 - var4 = new HashSet(); // L: 292 - } - - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 294 - this.drawMapLinks(var1, var2, var4, var3); // L: 295 - } // L: 296 + } @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "803439659" + ) + void method3370(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { + var4 = new HashSet(); + } + + this.drawNonLinkMapIcons(var1, var2, var4, var3); + this.drawMapLinks(var1, var2, var4, var3); + } + + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-1184159068" + garbageValue = "502507792" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 299 + Iterator var4 = this.iconMap.values().iterator(); while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 300 - if (var5.hasValidElement()) { // L: 302 - int var6 = var5.getElement(); // L: 303 - if (var1.contains(var6)) { // L: 304 - WorldMapElement var7 = Archive.WorldMapElement_get(var6); // L: 305 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 306 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); + if (var5.hasValidElement()) { + int var6 = var5.getElement(); + if (var1.contains(var6)) { + WorldMapElement var7 = HealthBarUpdate.WorldMapElement_get(var6); + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method3488(var1, var2, var3); // L: 310 - } // L: 311 + this.method3381(var1, var2, var3); + } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lgs;[Lof;Lfk;B)V", - garbageValue = "0" + descriptor = "(Lgb;[Lof;Lfn;B)V", + garbageValue = "-8" ) - void method3419(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method3372(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 314 - for (var5 = 0; var5 < 64; ++var5) { // L: 315 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 316 - this.method3423(var4, var5, this.worldMapData_0, var1); // L: 317 + for (var4 = 0; var4 < 64; ++var4) { + for (var5 = 0; var5 < 64; ++var5) { + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); + this.method3406(var4, var5, this.worldMapData_0, var1); } } - for (var4 = 0; var4 < 64; ++var4) { // L: 320 - for (var5 = 0; var5 < 64; ++var5) { // L: 321 - this.method3421(var4, var5, this.worldMapData_0, var1, var2); // L: 322 + for (var4 = 0; var4 < 64; ++var4) { + for (var5 = 0; var5 < 64; ++var5) { + this.method3371(var4, var5, this.worldMapData_0, var1, var2); } } - } // L: 325 + } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lgs;[Lof;Lfk;B)V", - garbageValue = "39" + descriptor = "(Lgb;[Lof;Lfn;I)V", + garbageValue = "1710049753" ) - void method3420(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 328 + void method3373(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 329 + var5 = (WorldMapData_1)var4.next(); - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 331 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 332 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 333 - this.method3423(var6, var7, var5, var1); // L: 334 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { + this.drawTileGround(var6, var7, var5, var1, var3); + this.method3406(var6, var7, var5, var1); } } } - var4 = this.worldMapData1List.iterator(); // L: 339 + var4 = this.worldMapData1List.iterator(); while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 340 + var5 = (WorldMapData_1)var4.next(); - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 342 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 343 - this.method3421(var6, var7, var5, var1, var2); // L: 344 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { + this.method3371(var6, var7, var5, var1, var2); } } } - } // L: 349 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IILfy;Lgs;[Lof;B)V", - garbageValue = "56" - ) - void method3421(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method3426(var1, var2, var3); // L: 352 - this.method3425(var1, var2, var3, var5); // L: 353 - } // L: 354 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IILfy;Lgs;Lfk;I)V", - garbageValue = "1645371529" - ) - @Export("drawTileGround") - void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 357 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 358 - if (var6 == -1 && var7 == -1) { // L: 359 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 360 - } - - int var8 = 16711935; // L: 362 - int var9; - if (var7 != -1) { // L: 363 - int var10 = this.backgroundColor; // L: 365 - FloorOverlayDefinition var11 = WorldMapSectionType.method3677(var7); // L: 367 - if (var11 == null) { // L: 368 - var9 = var10; // L: 369 - } else if (var11.secondaryRgb >= 0) { // L: 372 - var9 = var11.secondaryRgb | -16777216; // L: 373 - } else { - int var12; - if (var11.texture >= 0) { // L: 375 - var12 = WorldMapID.method3718(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 376 - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 377 - } else if (var11.primaryRgb == 16711935) { // L: 379 - var9 = var10; // L: 380 - } else { - var12 = ClientPreferences.method2330(var11.hue, var11.saturation, var11.lightness); // L: 383 - int var13 = WorldMapID.method3718(var12, 96); // L: 384 - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; // L: 385 - } - } - - var8 = var9; // L: 388 - } - - if (var7 > -1 && var3.field2068[0][var1][var2] == 0) { // L: 390 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 391 - } else { - var9 = this.method3424(var1, var2, var3, var5); // L: 394 - if (var7 == -1) { // L: 395 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 396 - } else { - var4.method3819(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2068[0][var1][var2], var3.field2074[0][var1][var2]); // L: 399 - } - } - } // L: 392 397 400 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IILfy;Lgs;B)V", - garbageValue = "1" - ) - void method3423(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 403 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 404 - if (var6 > -1) { // L: 405 - int var8 = this.backgroundColor; // L: 407 - FloorOverlayDefinition var9 = WorldMapSectionType.method3677(var6); // L: 409 - int var7; - if (var9 == null) { // L: 410 - var7 = var8; // L: 411 - } else if (var9.secondaryRgb >= 0) { // L: 414 - var7 = var9.secondaryRgb | -16777216; // L: 415 - } else { - int var10; - if (var9.texture >= 0) { // L: 417 - var10 = WorldMapID.method3718(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 418 - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 419 - } else if (var9.primaryRgb == 16711935) { // L: 421 - var7 = var8; // L: 422 - } else { - var10 = ClientPreferences.method2330(var9.hue, var9.saturation, var9.lightness); // L: 425 - int var11 = WorldMapID.method3718(var10, 96); // L: 426 - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216; // L: 427 - } - } - - if (var3.field2068[var5][var1][var2] == 0) { // L: 431 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 432 - } else { - var4.method3819(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2068[var5][var1][var2], var3.field2074[var5][var1][var2]); // L: 435 - } - } - } - - } // L: 439 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IILfy;Lfk;B)I", - garbageValue = "37" - ) - int method3424(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 442 443 445 } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IILfy;[Lof;I)V", - garbageValue = "-1994135211" + descriptor = "(IILfk;Lgb;[Lof;B)V", + garbageValue = "88" ) - void method3425(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 449 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 450 - if (var6 != null && var6.length != 0) { // L: 451 - WorldMapDecoration[] var7 = var6; // L: 455 - - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 456 - WorldMapDecoration var9 = var7[var8]; // L: 457 - int var11 = var9.decoration; // L: 460 - boolean var10 = var11 >= WorldMapDecorationType.field3154.id && var11 <= WorldMapDecorationType.field3167.id; // L: 462 - if (var10 || class32.method384(var9.decoration)) { // L: 464 - ObjectComposition var12 = Tiles.getObjectDefinition(var9.objectDefinitionId); // L: 465 - if (var12.mapSceneId != -1) { // L: 466 - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 467 - var4[var12.mapSceneId].method6997(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 471 - } else { - var4[var12.mapSceneId].method6997(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 468 - } - } - } - } - } - } - - } // L: 479 + void method3371(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method3375(var1, var2, var3); + this.method3378(var1, var2, var3, var5); + } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IILfy;B)V", - garbageValue = "22" + descriptor = "(IILfk;Lgb;Lfn;B)V", + garbageValue = "-2" ) - void method3426(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 482 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 483 - if (var5 != null && var5.length != 0) { // L: 484 - WorldMapDecoration[] var6 = var5; // L: 488 + @Export("drawTileGround") + void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; + if (var6 == -1 && var7 == -1) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); + } - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 489 - WorldMapDecoration var8 = var6[var7]; // L: 490 - if (Login.method2058(var8.decoration)) { // L: 492 - ObjectComposition var9 = Tiles.getObjectDefinition(var8.objectDefinitionId); // L: 493 - int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 494 - if (var8.decoration == WorldMapDecorationType.field3160.id) { // L: 495 - this.method3439(var1, var2, var8.rotation, var10); // L: 496 + int var8 = 16711935; + if (var7 != -1) { + var8 = class104.method2272(var7, this.backgroundColor); + } + + if (var7 > -1 && var3.field2056[0][var1][var2] == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); + } else { + int var9 = this.method3377(var1, var2, var3, var5); + if (var7 == -1) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); + } else { + var4.method3757(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2056[0][var1][var2], var3.field2057[0][var1][var2]); + } + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IILfk;Lgb;I)V", + garbageValue = "-1570940592" + ) + void method3406(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; + if (var6 > -1) { + int var7 = class104.method2272(var6, this.backgroundColor); + if (var3.field2056[var5][var1][var2] == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); + } else { + var4.method3757(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2056[var5][var1][var2], var3.field2057[var5][var1][var2]); + } + } + } + + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IILfk;Lfn;B)I", + garbageValue = "-35" + ) + int method3377(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IILfk;[Lof;I)V", + garbageValue = "-1721240992" + ) + void method3378(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; + if (var6 != null && var6.length != 0) { + WorldMapDecoration[] var7 = var6; + + for (int var8 = 0; var8 < var7.length; ++var8) { + WorldMapDecoration var9 = var7[var8]; + if (!class65.method1797(var9.decoration)) { + int var11 = var9.decoration; + boolean var10 = var11 == WorldMapDecorationType.field3161.id; + if (!var10) { + continue; + } + } + + ObjectComposition var12 = ClanChannel.getObjectDefinition(var9.objectDefinitionId); + if (var12.mapSceneId != -1) { + if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { + var4[var12.mapSceneId].method7066(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + } else { + var4[var12.mapSceneId].method7066(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + } + } + } + } + } + + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IILfk;I)V", + garbageValue = "1769617516" + ) + void method3375(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; + if (var5 != null && var5.length != 0) { + WorldMapDecoration[] var6 = var5; + + for (int var7 = 0; var7 < var6.length; ++var7) { + WorldMapDecoration var8 = var6[var7]; + if (ClanSettings.method2421(var8.decoration)) { + ObjectComposition var9 = ClanChannel.getObjectDefinition(var8.objectDefinitionId); + int var10 = var9.int1 != 0 ? -3407872 : -3355444; + if (var8.decoration == WorldMapDecorationType.field3148.id) { + this.method3393(var1, var2, var8.rotation, var10); } - if (var8.decoration == WorldMapDecorationType.field3148.id) { // L: 498 - this.method3439(var1, var2, var8.rotation, -3355444); // L: 499 - this.method3439(var1, var2, var8.rotation + 1, var10); // L: 500 + if (var8.decoration == WorldMapDecorationType.field3139.id) { + this.method3393(var1, var2, var8.rotation, -3355444); + this.method3393(var1, var2, var8.rotation + 1, var10); } - if (var8.decoration == WorldMapDecorationType.field3170.id) { // L: 502 - if (var8.rotation == 0) { // L: 503 + if (var8.decoration == WorldMapDecorationType.field3142.id) { + if (var8.rotation == 0) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 504 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); } - if (var8.rotation == 2) { // L: 505 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + if (var8.rotation == 2) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } - if (var8.rotation == 3) { // L: 506 + if (var8.rotation == 3) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field3150.id) { // L: 508 - int var11 = var8.rotation % 2; // L: 509 + if (var8.decoration == WorldMapDecorationType.field3159.id) { + int var11 = var8.rotation % 2; int var12; - if (var11 == 0) { // L: 510 - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 511 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 512 + if (var11 == 0) { + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 516 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 517 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); } } } @@ -656,351 +590,423 @@ public class WorldMapRegion { } } - } // L: 526 + } - @ObfuscatedName("n") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IB)V", - garbageValue = "-34" + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "984216560" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 529 - float var6 = var5 / 2.0F; // L: 530 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 531 + float var5 = (float)var4 / 64.0F; + float var6 = var5 / 2.0F; + Iterator var7 = this.iconMap.entrySet().iterator(); while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 532 - Coord var9 = (Coord)var8.getKey(); // L: 534 - int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); // L: 535 - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 536 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 537 - if (var12 != null && var12.hasValidElement()) { // L: 538 - var12.screenX = var10; // L: 539 - var12.screenY = var11; // L: 540 - WorldMapElement var13 = Archive.WorldMapElement_get(var12.getElement()); // L: 541 - if (!var3.contains(var13.getObjectId())) { // L: 542 - this.method3429(var12, var10, var11, var5); // L: 543 + Entry var8 = (Entry)var7.next(); + Coord var9 = (Coord)var8.getKey(); + int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); + if (var12 != null && var12.hasValidElement()) { + var12.screenX = var10; + var12.screenY = var11; + WorldMapElement var13 = HealthBarUpdate.WorldMapElement_get(var12.getElement()); + if (!var3.contains(var13.getObjectId())) { + this.method3383(var12, var10, var11, var5); } } } - } // L: 548 + } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-466157918" + garbageValue = "-625072095" ) - void method3488(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 551 + void method3381(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 552 - if (var5.hasValidElement()) { // L: 554 - WorldMapElement var6 = Archive.WorldMapElement_get(var5.getElement()); // L: 555 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 556 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 557 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); + if (var5.hasValidElement()) { + WorldMapElement var6 = HealthBarUpdate.WorldMapElement_get(var5.getElement()); + if (var6 != null && var1.contains(var6.getObjectId())) { + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } } } - } // L: 561 + } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lek;IIIII)V", - garbageValue = "-380618886" + descriptor = "(Lei;IIIII)V", + garbageValue = "-1613915654" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels var6 = var1.getSpriteBool(false); // L: 564 - if (var6 != null) { // L: 565 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 568 - if (var4 % var5 < var5 / 2) { // L: 569 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 570 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 571 + SpritePixels var6 = var1.getSpriteBool(false); + if (var6 != null) { + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); + if (var4 % var5 < var5 / 2) { + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); } } - } // L: 566 573 + } - @ObfuscatedName("a") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgh;IIFB)V", - garbageValue = "41" + descriptor = "(Lgr;IIFS)V", + garbageValue = "9367" ) - void method3429(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = Archive.WorldMapElement_get(var1.getElement()); // L: 576 - this.method3477(var5, var2, var3); // L: 577 - this.method3431(var1, var5, var2, var3, var4); // L: 578 - } // L: 579 + void method3383(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = HealthBarUpdate.WorldMapElement_get(var1.getElement()); + this.method3433(var5, var2, var3); + this.method3385(var1, var5, var2, var3, var4); + } - @ObfuscatedName("aw") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lek;III)V", - garbageValue = "2103112249" + descriptor = "(Lei;III)V", + garbageValue = "-1317474454" ) - void method3477(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); // L: 582 - if (var4 != null) { // L: 583 - int var5 = this.method3433(var4, var1.horizontalAlignment); // L: 584 - int var6 = this.method3409(var4, var1.verticalAlignment); // L: 585 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 586 + void method3433(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); + if (var4 != null) { + int var5 = this.method3463(var4, var1.horizontalAlignment); + int var6 = this.method3388(var4, var1.verticalAlignment); + var4.drawTransBgAt(var5 + var2, var3 + var6); } - } // L: 588 + } - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lgh;Lek;IIFI)V", - garbageValue = "-796895701" + descriptor = "(Lgr;Lei;IIFI)V", + garbageValue = "403879221" ) - void method3431(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 591 - if (var6 != null) { // L: 592 - if (var6.size.method3278(var5)) { // L: 595 - Font var7 = (Font)this.fonts.get(var6.size); // L: 598 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1563, 0, 1, 0, var7.ascent / 2); // L: 599 + void method3385(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); + if (var6 != null) { + if (var6.size.method3231(var5)) { + Font var7 = (Font)this.fonts.get(var6.size); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1547, 0, 1, 0, var7.ascent / 2); } } - } // L: 593 596 600 + } - @ObfuscatedName("ad") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "-281265080" + descriptor = "(IILjava/util/HashSet;IS)V", + garbageValue = "22167" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 603 - Iterator var6 = this.icon0List.iterator(); // L: 604 + float var5 = (float)var4 / 64.0F; + Iterator var6 = this.icon0List.iterator(); while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 605 - if (var7.hasValidElement()) { // L: 607 - int var8 = var7.coord2.x % 64; // L: 608 - int var9 = var7.coord2.y % 64; // L: 609 - var7.screenX = (int)((float)var1 + (float)var8 * var5); // L: 610 - var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); // L: 611 - if (!var3.contains(var7.getElement())) { // L: 612 - this.method3429(var7, var7.screenX, var7.screenY, var5); // L: 615 + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); + if (var7.hasValidElement()) { + int var8 = var7.coord2.x % 64; + int var9 = var7.coord2.y % 64; + var7.screenX = (int)((float)var8 * var5 + (float)var1); + var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); + if (!var3.contains(var7.getElement())) { + this.method3383(var7, var7.screenX, var7.screenY, var5); } } } - } // L: 618 - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Loa;Leq;I)I", - garbageValue = "2137509015" - ) - int method3433(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 621 - case 1: - return 0; // L: 632 - case 2: - return -var1.subWidth / 2; // L: 628 - default: - return -var1.subWidth; // L: 624 - } } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Loa;Lee;I)I", - garbageValue = "-128811790" + descriptor = "(Lom;Leh;I)I", + garbageValue = "-431171033" ) - int method3409(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { // L: 638 + int method3463(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { case 0: - return -var1.subHeight / 2; // L: 641 + return -var1.subWidth / 2; case 2: - return 0; // L: 649 + return 0; default: - return -var1.subHeight; // L: 645 + return -var1.subWidth; } } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IB)Lfd;", - garbageValue = "1" + descriptor = "(Lom;Ley;I)I", + garbageValue = "-1730963826" ) - WorldMapLabel method3435(int var1) { - WorldMapElement var2 = Archive.WorldMapElement_get(var1); // L: 655 - return this.createMapLabel(var2); // L: 656 + int method3388(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { + case 0: + return -var1.subHeight / 2; + case 1: + return 0; + default: + return -var1.subHeight; + } } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lek;I)Lfd;", - garbageValue = "282116482" + descriptor = "(IS)Lff;", + garbageValue = "25395" + ) + WorldMapLabel method3389(int var1) { + WorldMapElement var2 = HealthBarUpdate.WorldMapElement_get(var1); + return this.createMapLabel(var2); + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lei;I)Lff;", + garbageValue = "-846800264" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 660 - WorldMapLabelSize var2 = WorldMapLabelSize.method3281(var1.textSize); // L: 663 - if (var2 == null) { // L: 664 - return null; // L: 665 + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { + WorldMapLabelSize var2 = WorldMapLabelSize.method3232(var1.textSize); + if (var2 == null) { + return null; } else { - Font var3 = (Font)this.fonts.get(var2); // L: 667 - if (var3 == null) { // L: 668 - return null; // L: 669 + Font var3 = (Font)this.fonts.get(var2); + if (var3 == null) { + return null; } else { - int var4 = var3.lineCount(var1.name, 1000000); // L: 671 - String[] var5 = new String[var4]; // L: 672 - var3.breakLines(var1.name, (int[])null, var5); // L: 673 - int var6 = var5.length * var3.ascent / 2; // L: 674 - int var7 = 0; // L: 675 - String[] var8 = var5; // L: 677 + int var4 = var3.lineCount(var1.name, 1000000); + String[] var5 = new String[var4]; + var3.breakLines(var1.name, (int[])null, var5); + int var6 = var5.length * var3.ascent / 2; + int var7 = 0; + String[] var8 = var5; - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 678 - String var10 = var8[var9]; // L: 679 - int var11 = var3.stringWidth(var10); // L: 681 - if (var11 > var7) { // L: 682 - var7 = var11; // L: 683 + for (int var9 = 0; var9 < var8.length; ++var9) { + String var10 = var8[var9]; + int var11 = var3.stringWidth(var10); + if (var11 > var7) { + var7 = var11; } } - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 688 + return new WorldMapLabel(var1.name, var7, var6, var2); } } } else { - return null; // L: 661 + return null; } } - @ObfuscatedName("ag") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IIIIIB)Ljava/util/List;", - garbageValue = "0" + descriptor = "(IIIIII)Ljava/util/List;", + garbageValue = "-956706627" ) - List method3437(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 692 - if (var4 >= var1 && var5 >= var2) { // L: 693 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 694 - Iterator var7 = this.iconMap.values().iterator(); // L: 695 + List method3391(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); + if (var4 >= var1 && var5 >= var2) { + if (var4 < var3 + var1 && var5 < var3 + var2) { + Iterator var7 = this.iconMap.values().iterator(); AbstractWorldMapIcon var8; while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 696 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 698 - var6.add(var8); // L: 699 + var8 = (AbstractWorldMapIcon)var7.next(); + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { + var6.add(var8); } } - var7 = this.icon0List.iterator(); // L: 703 + var7 = this.icon0List.iterator(); while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 704 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 706 - var6.add(var8); // L: 707 + var8 = (AbstractWorldMapIcon)var7.next(); + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { + var6.add(var8); } } - return var6; // L: 711 + return var6; } else { - return var6; // L: 702 + return var6; } } else { return var6; } } - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)Ljava/util/List;", - garbageValue = "-1092434212" + garbageValue = "-806323480" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 715 - var1.addAll(this.icon0List); // L: 716 - var1.addAll(this.iconMap.values()); // L: 717 - return var1; // L: 718 + LinkedList var1 = new LinkedList(); + var1.addAll(this.icon0List); + var1.addAll(this.iconMap.values()); + return var1; } - @ObfuscatedName("aq") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-767493128" + garbageValue = "1298543290" ) - void method3439(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 722 - if (var3 == 0) { // L: 723 + void method3393(int var1, int var2, int var3, int var4) { + var3 %= 4; + if (var3 == 0) { Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 724 + if (var3 == 1) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 725 + if (var3 == 2) { Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 726 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); } - } // L: 727 + } - @ObfuscatedName("t") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-1078417152" + descriptor = "(IIIIIII)I", + garbageValue = "1546931793" ) - static int method3472(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1202 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1203 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var3)); // L: 1204 - return 1; // L: 1205 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1207 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1214 - if (var3.dataText == null) { // L: 1215 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1216 - } + public static int method3454(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { + int var6 = var3; + var3 = var4; + var4 = var6; + } - return 1; // L: 1217 - } else { - return 2; // L: 1219 - } + var2 &= 3; + if (var2 == 0) { + return var1; + } else if (var2 == 1) { + return 7 - var0 - (var3 - 1); } else { - int var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1208 - --var4; // L: 1209 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1210 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1211 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1212 + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; } } - @ObfuscatedName("li") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1896402361" + descriptor = "(IIIS)Lbd;", + garbageValue = "22552" ) - static final void method3519(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { // L: 11510 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method49()) { // L: 11511 - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11512 - if (var2.rank == -1) { // L: 11513 - PacketWriter var3 = Client.packetWriter; // L: 11514 - PacketBufferNode var4 = InterfaceParent.getPacketBufferNode(ClientPacket.field2584, var3.isaacCipher); // L: 11515 - var4.packetBuffer.writeByte(3 + class44.stringCp1252NullTerminatedByteSize(var2.name)); // L: 11516 - var4.packetBuffer.writeByte(var0); // L: 11517 - var4.packetBuffer.writeShort(var1); // L: 11518 - var4.packetBuffer.writeStringCp1252NullTerminated(var2.name); // L: 11519 - var3.addNode(var4); // L: 11520 + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = class266.method4917(var1, var0); + Script var4 = class116.method2440(var3, var0); + if (var4 != null) { + return var4; + } else { + int var5 = (-3 - var2 << 8) + var0; + Script var7 = (Script)Script.Script_cached.get((long)(var5 << 16)); + Script var6; + if (var7 != null) { + var6 = var7; + } else { + String var8 = String.valueOf(var5); + int var9 = ApproximateRouteStrategy.archive12.getGroupId(var8); + if (var9 == -1) { + var6 = null; + } else { + byte[] var10 = ApproximateRouteStrategy.archive12.takeFileFlat(var9); + if (var10 != null) { + if (var10.length <= 1) { + var6 = null; + return var6 != null ? var6 : null; + } + + var7 = ModelData0.newScript(var10); + if (var7 != null) { + Script.Script_cached.put(var7, (long)(var5 << 16)); + var6 = var7; + return var6 != null ? var6 : null; + } + } + + var6 = null; + } + } + + return var6 != null ? var6 : null; + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([BIIIIIII[Lfy;I)V", + garbageValue = "851428722" + ) + static final void method3469(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { + int var10; + for (int var9 = 0; var9 < 8; ++var9) { + for (var10 = 0; var10 < 8; ++var10) { + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var3 + var10] &= -16777217; } } } - } // L: 11521 + + Buffer var28 = new Buffer(var0); + + for (var10 = 0; var10 < 4; ++var10) { + for (int var11 = 0; var11 < 64; ++var11) { + for (int var12 = 0; var12 < 64; ++var12) { + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { + int var17 = var11 & 7; + int var18 = var12 & 7; + int var19 = var7 & 3; + int var16; + if (var19 == 0) { + var16 = var17; + } else if (var19 == 1) { + var16 = var18; + } else if (var19 == 2) { + var16 = 7 - var17; + } else { + var16 = 7 - var18; + } + + int var22 = var2 + var16; + int var25 = var11 & 7; + int var26 = var12 & 7; + int var27 = var7 & 3; + int var24; + if (var27 == 0) { + var24 = var26; + } else if (var27 == 1) { + var24 = 7 - var25; + } else if (var27 == 2) { + var24 = 7 - var26; + } else { + var24 = var25; + } + + class125.loadTerrain(var28, var1, var22, var24 + var3, 0, 0, var7); + } else { + class125.loadTerrain(var28, 0, -1, -1, 0, 0, 0); + } + } + } + } + + } } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index 7dfe858407..ba7c883691 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,733 +4,633 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gb") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("r") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1461867137 + intValue = 157705441 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("tileTemplates") byte[][][] tileTemplates; WorldMapScaleHandler(int var1) { - this.pixelsPerTile = var1; // L: 10 - } // L: 11 + this.pixelsPerTile = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "1201297815" + garbageValue = "1555283641" ) - void method3819(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.method3820(var8, var7); // L: 15 - var7 = this.method3847(var7); // L: 16 - Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 + void method3757(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { + var8 = this.method3748(var8, var7); + var7 = this.method3770(var7); + Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } - } // L: 18 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-638925559" + garbageValue = "277945494" ) - int method3820(int var1, int var2) { - if (var2 == 9) { // L: 21 + int method3748(int var1, int var2) { + if (var2 == 9) { var1 = var1 + 1 & 3; } - if (var2 == 10) { // L: 22 + if (var2 == 10) { var1 = var1 + 3 & 3; } if (var2 == 11) { - var1 = var1 + 3 & 3; // L: 23 + var1 = var1 + 3 & 3; } - return var1; // L: 24 + return var1; } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1205509523" + garbageValue = "1962492833" ) - int method3847(int var1) { - if (var1 != 9 && var1 != 10) { // L: 28 - return var1 == 11 ? 8 : var1; // L: 29 + int method3770(int var1) { + if (var1 != 9 && var1 != 10) { + return var1 == 11 ? 8 : var1; } else { - return 1; // L: 30 + return 1; } } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1145415965" + garbageValue = "-138085985" ) @Export("init") void init() { - if (this.tileTemplates == null) { // L: 34 + if (this.tileTemplates == null) { this.tileTemplates = new byte[8][4][]; this.init0(); this.init1(); this.init2(); this.init3(); this.init4(); - this.init5(); // L: 43 - this.init6(); // L: 44 - this.init7(); // L: 45 + this.init5(); + this.init6(); + this.init7(); } - } // L: 46 + } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "1144" + descriptor = "(I)V", + garbageValue = "1739194155" ) @Export("init0") void init0() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 49 - int var2 = 0; // L: 50 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 51 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 52 - if (var4 <= var3) { // L: 53 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3) { var1[var2] = -1; } - ++var2; // L: 54 + ++var2; } } - this.tileTemplates[0][0] = var1; // L: 57 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 58 - var2 = 0; // L: 59 + this.tileTemplates[0][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 - if (var4 <= var3) { // L: 62 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3) { var1[var2] = -1; } - ++var2; // L: 63 + ++var2; } } - this.tileTemplates[0][1] = var1; // L: 66 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 67 - var2 = 0; // L: 68 + this.tileTemplates[0][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 69 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 70 - if (var4 >= var3) { // L: 71 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3) { var1[var2] = -1; } - ++var2; // L: 72 + ++var2; } } - this.tileTemplates[0][2] = var1; // L: 75 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 76 - var2 = 0; // L: 77 + this.tileTemplates[0][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 78 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 79 - if (var4 >= var3) { // L: 80 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3) { var1[var2] = -1; } - ++var2; // L: 81 + ++var2; } } - this.tileTemplates[0][3] = var1; // L: 84 - } // L: 85 + this.tileTemplates[0][3] = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-875344142" + ) + @Export("init1") + void init1() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[1][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var2 >= 0 && var2 < var1.length) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } else { + ++var2; + } + } + } + + this.tileTemplates[1][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[1][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[1][3] = var1; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "406557612" + ) + @Export("init2") + void init2() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][3] = var1; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "68546170" + ) + @Export("init3") + void init3() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][3] = var1; + } @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1022109285" + garbageValue = "2091765570" ) - @Export("init1") - void init1() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 88 - int var2 = 0; // L: 89 + @Export("init4") + void init4() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 90 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 91 - if (var4 <= var3 >> 1) { // L: 92 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 93 + ++var2; } } - this.tileTemplates[1][0] = var1; // L: 96 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 97 - var2 = 0; // L: 98 + this.tileTemplates[4][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 99 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 100 - if (var2 >= 0 && var2 < var1.length) { // L: 101 - if (var4 >= var3 << 1) { // L: 105 - var1[var2] = -1; - } - - ++var2; // L: 106 - } else { - ++var2; // L: 102 - } - } - } - - this.tileTemplates[1][1] = var1; // L: 109 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 110 - var2 = 0; // L: 111 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 112 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 113 - if (var4 <= var3 >> 1) { // L: 114 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 115 + ++var2; } } - this.tileTemplates[1][2] = var1; // L: 118 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 119 - var2 = 0; // L: 120 + this.tileTemplates[4][1] = 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 - if (var4 >= var3 << 1) { // L: 123 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 124 + ++var2; } } - this.tileTemplates[1][3] = var1; // L: 127 - } // L: 128 + this.tileTemplates[4][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - @ObfuscatedName("m") + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[4][3] = var1; + } + + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1467975580" + garbageValue = "965527" ) - @Export("init2") - void init2() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 - int var2 = 0; // L: 132 + @Export("init5") + void init5() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 133 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 134 - if (var4 <= var3 >> 1) { // L: 135 - var1[var2] = -1; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= this.pixelsPerTile / 2) { + var1[var5] = -1; } - ++var2; // L: 136 + ++var5; } } - this.tileTemplates[2][0] = var1; // L: 139 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 140 - var2 = 0; // L: 141 + this.tileTemplates[5][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 - if (var4 >= var3 << 1) { - var1[var2] = -1; // L: 144 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var3 <= this.pixelsPerTile / 2) { + var1[var5] = -1; } - ++var2; // L: 145 + ++var5; } } - this.tileTemplates[2][1] = var1; // L: 148 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 149 - var2 = 0; // L: 150 + this.tileTemplates[5][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 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 - var1[var2] = -1; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= this.pixelsPerTile / 2) { + var1[var5] = -1; } - ++var2; // L: 154 + ++var5; } } - this.tileTemplates[2][2] = var1; // L: 157 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 158 - var2 = 0; // L: 159 + this.tileTemplates[5][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 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 - var1[var2] = -1; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var3 >= this.pixelsPerTile / 2) { + var1[var5] = -1; } - ++var2; // L: 163 + ++var5; } } - this.tileTemplates[2][3] = var1; // L: 166 - } // L: 167 + this.tileTemplates[5][3] = var1; + } @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1661716942" - ) - @Export("init3") - void init3() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 - int var2 = 0; // L: 171 - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 172 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 173 - if (var4 >= var3 >> 1) { // L: 174 - var1[var2] = -1; - } - - ++var2; // L: 175 - } - } - - this.tileTemplates[3][0] = var1; // L: 178 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 179 - var2 = 0; // L: 180 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 181 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 182 - if (var4 <= var3 << 1) { // L: 183 - var1[var2] = -1; - } - - ++var2; // L: 184 - } - } - - this.tileTemplates[3][1] = var1; // L: 187 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 188 - var2 = 0; // L: 189 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 190 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 191 - if (var4 >= var3 >> 1) { // L: 192 - var1[var2] = -1; - } - - ++var2; // L: 193 - } - } - - this.tileTemplates[3][2] = var1; // L: 196 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 197 - var2 = 0; // L: 198 - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 199 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 200 - if (var4 <= var3 << 1) { // L: 201 - var1[var2] = -1; - } - - ++var2; // L: 202 - } - } - - this.tileTemplates[3][3] = var1; // L: 205 - } // L: 206 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "22640304" - ) - @Export("init4") - void init4() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 209 - int var2 = 0; // L: 210 - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 211 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 212 - if (var4 >= var3 >> 1) { // L: 213 - var1[var2] = -1; - } - - ++var2; // L: 214 - } - } - - this.tileTemplates[4][0] = var1; // L: 217 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 218 - var2 = 0; // L: 219 - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 - if (var4 <= var3 << 1) { // L: 222 - var1[var2] = -1; - } - - ++var2; // L: 223 - } - } - - this.tileTemplates[4][1] = var1; // L: 226 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 227 - var2 = 0; // L: 228 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 229 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 230 - if (var4 >= var3 >> 1) { // L: 231 - var1[var2] = -1; - } - - ++var2; // L: 232 - } - } - - this.tileTemplates[4][2] = var1; // L: 235 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 236 - var2 = 0; // L: 237 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 238 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 239 - if (var4 <= var3 << 1) { // L: 240 - var1[var2] = -1; - } - - ++var2; // L: 241 - } - } - - this.tileTemplates[4][3] = var1; // L: 244 - } // L: 245 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-31" - ) - @Export("init5") - void init5() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 248 - boolean var2 = false; // L: 249 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 250 - int var5 = 0; // L: 251 - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 252 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 253 - if (var4 <= this.pixelsPerTile / 2) { // L: 254 - var1[var5] = -1; - } - - ++var5; // L: 255 - } - } - - this.tileTemplates[5][0] = var1; // L: 258 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 259 - var5 = 0; // L: 260 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 261 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 262 - if (var3 <= this.pixelsPerTile / 2) { // L: 263 - var1[var5] = -1; - } - - ++var5; // L: 264 - } - } - - this.tileTemplates[5][1] = var1; // L: 267 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 268 - var5 = 0; // L: 269 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 270 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 271 - if (var4 >= this.pixelsPerTile / 2) { // L: 272 - var1[var5] = -1; - } - - ++var5; // L: 273 - } - } - - this.tileTemplates[5][2] = var1; // L: 276 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 277 - var5 = 0; // L: 278 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 279 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 280 - if (var3 >= this.pixelsPerTile / 2) { // L: 281 - var1[var5] = -1; - } - - ++var5; // L: 282 - } - } - - this.tileTemplates[5][3] = var1; // L: 285 - } // L: 286 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "68" + garbageValue = "-959784036" ) @Export("init6") void init6() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 289 - boolean var2 = false; // L: 290 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 291 - int var5 = 0; // L: 292 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 293 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 294 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 295 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 296 + ++var5; } } - this.tileTemplates[6][0] = var1; // L: 299 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 300 - var5 = 0; // L: 301 + this.tileTemplates[6][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 302 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 303 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 304 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 305 + ++var5; } } - this.tileTemplates[6][1] = var1; // L: 308 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 309 - var5 = 0; // L: 310 + this.tileTemplates[6][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 311 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 312 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 313 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 314 + ++var5; } } - this.tileTemplates[6][2] = var1; // L: 317 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 318 - var5 = 0; // L: 319 + this.tileTemplates[6][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 320 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 321 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 322 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 323 + ++var5; } } - this.tileTemplates[6][3] = var1; // L: 326 - } // L: 327 + this.tileTemplates[6][3] = var1; + } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1742038975" + garbageValue = "-160016836" ) @Export("init7") void init7() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 330 - boolean var2 = false; // L: 331 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 332 - int var5 = 0; // L: 333 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 334 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 335 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 336 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 337 + ++var5; } } - this.tileTemplates[7][0] = var1; // L: 340 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 341 - var5 = 0; // L: 342 + this.tileTemplates[7][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 343 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 344 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 345 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 346 + ++var5; } } - this.tileTemplates[7][1] = var1; // L: 349 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 350 - var5 = 0; // L: 351 + this.tileTemplates[7][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 352 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 353 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 354 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 355 + ++var5; } } - this.tileTemplates[7][2] = var1; // L: 358 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 359 - var5 = 0; // L: 360 + this.tileTemplates[7][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 361 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 362 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 363 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 364 + ++var5; } } - this.tileTemplates[7][3] = var1; // L: 367 - } // L: 368 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lfm;", - garbageValue = "-43701379" - ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35 - if (var1 != null) { // L: 36 - return var1; - } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37 - var1 = new SequenceDefinition(); // L: 38 - if (var2 != null) { // L: 39 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 40 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 41 - return var1; // L: 42 - } + this.tileTemplates[7][3] = var1; } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ILcf;ZS)I", - garbageValue = "-3249" - ) - static int method3857(int var0, Script var1, boolean var2) { - if (var0 == 7100) { // L: 4318 - ++ChatChannel.Interpreter_intStackSize; // L: 4319 - return 1; // L: 4320 - } else if (var0 == 7101) { // L: 4322 - UserComparator9.Interpreter_stringStackSize += 2; // L: 4323 - return 1; // L: 4324 - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4326 - if (var0 == 7106) { // L: 4330 - ++ChatChannel.Interpreter_intStackSize; // L: 4331 - return 1; // L: 4332 - } else if (var0 == 7107) { // L: 4334 - ++ChatChannel.Interpreter_intStackSize; // L: 4335 - return 1; // L: 4336 - } else if (var0 == 7108) { // L: 4338 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = GameEngine.method717() ? 1 : 0; // L: 4339 - return 1; // L: 4340 - } else if (var0 == 7110) { // L: 4342 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4343 - return 1; // L: 4344 - } else if (var0 == 7120) { // L: 4346 - --ChatChannel.Interpreter_intStackSize; // L: 4347 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4348 - return 1; // L: 4349 - } else if (var0 == 7121) { // L: 4351 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4352 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4353 - return 1; // L: 4354 - } else if (var0 == 7122) { // L: 4356 - ChatChannel.Interpreter_intStackSize -= 2; // L: 4357 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4358 - return 1; // L: 4359 - } else { - return 2; // L: 4361 - } - } else { - ++ChatChannel.Interpreter_intStackSize; // L: 4327 - return 1; // L: 4328 - } - } - - @ObfuscatedName("ic") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-579182952" - ) - static void method3856() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 8972 - if (class160.method3253(Client.menuOpcodes[var0])) { // L: 8973 - if (var0 < Client.menuOptionsCount - 1) { // L: 8974 - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8975 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8976 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8977 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8978 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8979 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8980 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8981 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8982 - } - } - - --var0; // L: 8985 - --Client.menuOptionsCount; // L: 8986 - } - } - - Language.method5270(); // L: 8989 - } // L: 8990 } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 2b41e97319..94954fad55 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gx") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lfa;B)V", - garbageValue = "120" + descriptor = "(Lfa;I)V", + garbageValue = "206142404" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-2105423832" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); @@ -25,31 +25,31 @@ public interface WorldMapSection { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-173753307" + garbageValue = "2136306285" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "2086451205" + garbageValue = "634207470" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)Liw;", - garbageValue = "-36" + descriptor = "(IIB)Lij;", + garbageValue = "43" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1313413902" + descriptor = "(Lnv;I)V", + garbageValue = "342058266" ) @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 d25ce9e152..5bba7168ec 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,217 +4,268 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fu") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("ee") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1160309187 - ) - static int field2038; - @ObfuscatedName("gi") - @ObfuscatedGetter( - intValue = 389090953 - ) - static int field2047; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -55376569 + intValue = 1947644497 ) @Export("oldZ") int oldZ; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1457760887 + intValue = -724242769 ) @Export("newZ") int newZ; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -288902471 + intValue = -1400111239 ) @Export("oldX") int oldX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 20509859 + intValue = 1382865909 ) @Export("oldY") int oldY; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 96413413 + intValue = -119640959 ) @Export("newX") int newX; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -515923129 + intValue = -1117734401 ) @Export("newY") int newY; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1499525307 + intValue = 1105910093 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 697420279 + intValue = 36977951 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1525307811 + intValue = 2062636297 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 93550631 + intValue = -274522163 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -301719127 + intValue = 1864837189 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1292488093 + intValue = 1783869469 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1252351887 + intValue = 1537573725 ) @Export("newChunkXHigh") int newChunkXHigh; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1541153839 + intValue = -1637940697 ) @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { - } // L: 22 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lfa;B)V", - garbageValue = "120" + descriptor = "(Lfa;I)V", + garbageValue = "206142404" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { // L: 25 + if (var1.regionLowX > this.newX) { var1.regionLowX = this.newX; } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; // L: 26 + var1.regionHighX = this.newX; } - if (var1.regionLowY > this.newY) { // L: 27 + if (var1.regionLowY > this.newY) { var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { // L: 28 + if (var1.regionHighY < this.newY) { var1.regionHighY = this.newY; } - } // L: 29 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-2105423832" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 32 - return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35 + if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { + return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; } else { - return false; // L: 33 + return false; } } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-173753307" + garbageValue = "2136306285" ) @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: 39 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "2086451205" - ) - @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.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 - return var4; // L: 49 - } + return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)Liw;", - garbageValue = "-36" + descriptor = "(IIII)[I", + garbageValue = "634207470" ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 53 - return null; // L: 54 + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; } else { - int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56 - int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57 - return new Coord(this.oldZ, var3, var4); // L: 58 + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; + return var4; } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1313413902" + descriptor = "(IIB)Lij;", + garbageValue = "43" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { + return null; + } else { + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); + return new Coord(this.oldZ, var3, var4); + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "342058266" ) @Export("read") public void read(Buffer var1) { - this.oldZ = var1.readUnsignedByte(); // L: 62 - this.newZ = var1.readUnsignedByte(); // L: 63 - this.oldX = var1.readUnsignedShort(); // L: 64 - this.oldChunkXLow = var1.readUnsignedByte(); // L: 65 - this.oldChunkXHigh = var1.readUnsignedByte(); // L: 66 - this.oldY = var1.readUnsignedShort(); // L: 67 - this.oldChunkYLow = var1.readUnsignedByte(); // L: 68 - this.oldChunkYHigh = var1.readUnsignedByte(); // L: 69 - this.newX = var1.readUnsignedShort(); // L: 70 - this.newChunkXLow = var1.readUnsignedByte(); // L: 71 - this.newChunkXHigh = var1.readUnsignedByte(); // L: 72 - this.newY = var1.readUnsignedShort(); // L: 73 - this.newChunkYLow = var1.readUnsignedByte(); // L: 74 - this.newChunkYHigh = var1.readUnsignedByte(); // L: 75 - this.postRead(); // L: 76 - } // L: 77 + this.oldZ = var1.readUnsignedByte(); + this.newZ = var1.readUnsignedByte(); + this.oldX = var1.readUnsignedShort(); + this.oldChunkXLow = var1.readUnsignedByte(); + this.oldChunkXHigh = var1.readUnsignedByte(); + this.oldY = var1.readUnsignedShort(); + this.oldChunkYLow = var1.readUnsignedByte(); + this.oldChunkYHigh = var1.readUnsignedByte(); + this.newX = var1.readUnsignedShort(); + this.newChunkXLow = var1.readUnsignedByte(); + this.newChunkXHigh = var1.readUnsignedByte(); + this.newY = var1.readUnsignedShort(); + this.newChunkYLow = var1.readUnsignedByte(); + this.newChunkYHigh = var1.readUnsignedByte(); + this.postRead(); + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "518606194" + garbageValue = "-455189067" ) @Export("postRead") void postRead() { - } // L: 79 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1412481082" + ) + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); + VarbitComposition var1; + if (var2 != null) { + var1 = var2; + } else { + byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var2 = new VarbitComposition(); + if (var3 != null) { + var2.decode(new Buffer(var3)); + } + + VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); + var1 = var2; + } + + int var7 = var1.baseVar; + int var4 = var1.startBit; + int var5 = var1.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + return Varps.Varps_main[var7] >> var4 & var6; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Lni;", + garbageValue = "2108121521" + ) + public static class376 method3597(int var0) { + int var1 = class374.field4154[var0]; + if (var1 == 1) { + return class376.field4163; + } else if (var1 == 2) { + return class376.field4164; + } else { + return var1 == 3 ? class376.field4159 : null; + } + } + + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1217280037" + ) + static final void method3580() { + if (Client.logoutTimer > 0) { + class144.logOut(); + } else { + Client.timer.method5658(); + class16.updateGameState(40); + Client.field644 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); + } + } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index a3f44ed9d7..400d4fe7d9 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,161 +4,198 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gu") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2120559769 + intValue = -2065646499 ) @Export("minPlane") int minPlane; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 20308873 + intValue = 441565143 ) @Export("planes") int planes; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1110742467 + intValue = 567637101 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -109322199 + intValue = -1449496779 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -705603633 + intValue = 1810027609 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2092573819 + intValue = 1535884331 ) @Export("regionEndY") int regionEndY; WorldMapSection1() { - } // L: 14 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lfa;B)V", - garbageValue = "120" + descriptor = "(Lfa;I)V", + garbageValue = "206142404" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.regionEndX) { // L: 17 + if (var1.regionLowX > this.regionEndX) { var1.regionLowX = this.regionEndX; } if (var1.regionHighX < this.regionEndX) { - var1.regionHighX = this.regionEndX; // L: 18 + var1.regionHighX = this.regionEndX; } - if (var1.regionLowY > this.regionEndY) { // L: 19 + if (var1.regionLowY > this.regionEndY) { var1.regionLowY = this.regionEndY; } - if (var1.regionHighY < this.regionEndY) { // L: 20 + if (var1.regionHighY < this.regionEndY) { var1.regionHighY = this.regionEndY; } - } // L: 21 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-2105423832" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 24 - return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 27 + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { + return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; } else { - return false; // L: 25 + return false; } } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-173753307" + garbageValue = "2136306285" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "2086451205" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 35 - return null; // L: 36 - } else { - int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 38 39 40 - return var4; // L: 41 - } + return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)Liw;", - garbageValue = "-36" + descriptor = "(IIII)[I", + garbageValue = "634207470" ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 45 - return null; // L: 46 + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; } else { - int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 48 - int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 49 - return new Coord(this.minPlane, var3, var4); // L: 50 + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; + return var4; } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1313413902" + descriptor = "(IIB)Lij;", + garbageValue = "43" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { + return null; + } else { + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); + return new Coord(this.minPlane, var3, var4); + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "342058266" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); // L: 54 - this.planes = var1.readUnsignedByte(); // L: 55 - this.regionStartX = var1.readUnsignedShort(); // L: 56 - this.regionStartY = var1.readUnsignedShort(); // L: 57 - this.regionEndX = var1.readUnsignedShort(); // L: 58 - this.regionEndY = var1.readUnsignedShort(); // L: 59 - this.postRead(); // L: 60 - } // L: 61 + 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(); + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-533258975" + garbageValue = "201853491" ) @Export("postRead") void postRead() { - } // L: 63 + } - @ObfuscatedName("f") + @ObfuscatedName("lu") @ObfuscatedSignature( - descriptor = "(Lcs;I)V", - garbageValue = "-360609536" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1245791653" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - Varcs.runScript(var0, 500000, 475000); // L: 109 - } // L: 110 + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; + + for (int var4 = 0; var4 < FloorUnderlayDefinition.ItemDefinition_fileCount; ++var4) { + ItemComposition var9 = KeyHandler.ItemDefinition_get(var4); + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + BoundaryObject.foundItemIdCount = -1; + NPC.foundItemIds = null; + return; + } + + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; + + for (int var7 = 0; var7 < var3; ++var7) { + var6[var7] = var2[var7]; + } + + var2 = var6; + } + + var2[var3++] = (short)var4; + } + } + + NPC.foundItemIds = var2; + TileItem.foundItemIndex = 0; + BoundaryObject.foundItemIdCount = var3; + String[] var8 = new String[BoundaryObject.foundItemIdCount]; + + for (int var5 = 0; var5 < BoundaryObject.foundItemIdCount; ++var5) { + var8[var5] = KeyHandler.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = NPC.foundItemIds; + Language.sortItemsByName(var8, var10, 0, var8.length - 1); + } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index c5deb4d2fc..011c4085cb 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -3,103 +3,110 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fs") +@ObfuscatedName("fv") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("f") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1901155751 + intValue = -765445823 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1779919493 ) @Export("minPlane") int minPlane; - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 585064293 + intValue = -1025978027 ) @Export("planes") int planes; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1431737197 + intValue = 1379132433 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1644208397 + intValue = 2017739451 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1498564843 + intValue = -57612863 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -207611195 + intValue = 704460595 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -37128885 + intValue = -2102811521 ) - int field1962; - @ObfuscatedName("r") + int field1942; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 311901217 + intValue = 515254301 ) - int field1963; - @ObfuscatedName("h") + int field1938; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1141655241 + intValue = -823828489 ) - int field1964; - @ObfuscatedName("d") + int field1939; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 206814275 + intValue = 684958779 ) - int field1965; + int field1940; WorldMapSection2() { - } // L: 18 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lfa;B)V", - garbageValue = "120" + descriptor = "(Lfa;I)V", + garbageValue = "206142404" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field1962) { // L: 21 - var1.regionLowX = this.field1962; + if (var1.regionLowX > this.field1942) { + var1.regionLowX = this.field1942; } - if (var1.regionHighX < this.field1964) { - var1.regionHighX = this.field1964; // L: 22 + if (var1.regionHighX < this.field1939) { + var1.regionHighX = this.field1939; } - if (var1.regionLowY > this.field1963) { // L: 23 - var1.regionLowY = this.field1963; + if (var1.regionLowY > this.field1938) { + var1.regionLowY = this.field1938; } - if (var1.regionHighY < this.field1965) { // L: 24 - var1.regionHighY = this.field1965; + if (var1.regionHighY < this.field1940) { + var1.regionHighY = this.field1940; } - } // L: 25 + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-2105423832" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { + 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; @@ -109,100 +116,766 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-173753307" + garbageValue = "2136306285" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field1962 && var1 >> 6 <= this.field1964 && var2 >> 6 >= this.field1963 && var2 >> 6 <= this.field1965; // L: 35 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "2086451205" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 39 - return null; // L: 40 - } else { - int[] var4 = new int[]{var2 + (this.field1962 * 64 - this.regionStartX * 64), var3 + (this.field1963 * 64 - this.regionStartY * 64)}; // L: 42 43 44 - return var4; // L: 45 - } + return var1 >> 6 >= this.field1942 && var1 >> 6 <= this.field1939 && var2 >> 6 >= this.field1938 && var2 >> 6 <= this.field1940; } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)Liw;", - garbageValue = "-36" + descriptor = "(IIII)[I", + garbageValue = "634207470" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; + } else { + int[] var4 = new int[]{var2 + (this.field1942 * 64 - this.regionStartX * 64), var3 + (this.field1938 * 64 - this.regionStartY * 64)}; + return var4; + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIB)Lij;", + garbageValue = "43" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 49 - return null; // L: 50 + if (!this.containsPosition(var1, var2)) { + return null; } else { - int var3 = this.regionStartX * 64 - this.field1962 * 64 + var1; // L: 52 - int var4 = var2 + (this.regionStartY * 64 - this.field1963 * 64); // L: 53 - return new Coord(this.minPlane, var3, var4); // L: 54 + int var3 = this.regionStartX * 64 - this.field1942 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field1938 * 64); + return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1313413902" + descriptor = "(Lnv;I)V", + garbageValue = "342058266" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); // L: 58 - this.planes = var1.readUnsignedByte(); // L: 59 - this.regionStartX = var1.readUnsignedShort(); // L: 60 - this.regionStartY = var1.readUnsignedShort(); // L: 61 - this.regionEndX = var1.readUnsignedShort(); // L: 62 - this.regionEndY = var1.readUnsignedShort(); // L: 63 - this.field1962 = var1.readUnsignedShort(); // L: 64 - this.field1963 = var1.readUnsignedShort(); // L: 65 - this.field1964 = var1.readUnsignedShort(); // L: 66 - this.field1965 = var1.readUnsignedShort(); // L: 67 - this.postRead(); // L: 68 - } // L: 69 + 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.field1942 = var1.readUnsignedShort(); + this.field1938 = var1.readUnsignedShort(); + this.field1939 = var1.readUnsignedShort(); + this.field1940 = var1.readUnsignedShort(); + this.postRead(); + } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "767493014" + garbageValue = "1012631858" ) @Export("postRead") void postRead() { - } // L: 71 + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lew;", - garbageValue = "1413321363" + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkq;B)I", + garbageValue = "96" ) - public static VarbitComposition method3329(int var0) { - VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 28 - if (var1 != null) { // L: 29 - return var1; - } else { - byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 30 - var1 = new VarbitComposition(); // L: 31 - if (var2 != null) { // L: 32 - var1.decode(new Buffer(var2)); + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + byte var7 = 0; + byte var8 = 0; + + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { + return -1; } - VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 + if (var6 - var8 >= var4) { + return 1; + } + + char var9; + if (var7 != 0) { + var9 = (char)var7; + boolean var14 = false; + } else { + var9 = var0.charAt(var5++); + } + + char var10; + if (var8 != 0) { + var10 = (char)var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } + + byte var11; + if (var9 == 198) { + var11 = 69; + } else if (var9 == 230) { + var11 = 101; + } else if (var9 == 223) { + var11 = 115; + } else if (var9 == 338) { + var11 = 69; + } else if (var9 == 339) { + var11 = 101; + } else { + var11 = 0; + } + + var7 = var11; + byte var12; + if (var10 == 198) { + var12 = 69; + } else if (var10 == 230) { + var12 = 101; + } else if (var10 == 223) { + var12 = 115; + } else if (var10 == 338) { + var12 = 69; + } else if (var10 == 339) { + var12 = 101; + } else { + var12 = 0; + } + + var8 = var12; + var9 = VarbitComposition.standardizeChar(var9, var2); + var10 = VarbitComposition.standardizeChar(var10, var2); + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { + return class41.lowercaseChar(var9, var2) - class41.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); + + int var17; + char var20; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } + + char var18 = var0.charAt(var5); + var20 = var1.charAt(var6); + if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { + var18 = Character.toLowerCase(var18); + var20 = Character.toLowerCase(var20); + if (var20 != var18) { + return class41.lowercaseChar(var18, var2) - class41.lowercaseChar(var20, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; + } else { + for (int var19 = 0; var19 < var16; ++var19) { + var20 = var0.charAt(var19); + char var13 = var1.charAt(var19); + if (var13 != var20) { + return class41.lowercaseChar(var20, var2) - class41.lowercaseChar(var13, var2); + } + } + + return 0; } } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "844511026" + descriptor = "(Lnu;ILbb;IB)V", + garbageValue = "7" ) - static final int method3333() { - return ViewportMouse.ViewportMouse_y; // L: 90 + static final void method3289(PacketBuffer var0, int var1, Player var2, int var3) { + byte var4 = -1; + if ((var3 & 64) != 0) { + var2.field1048 = var0.readUnsignedShort(); + if (var2.pathLength == 0) { + var2.orientation = var2.field1048; + var2.field1048 = -1; + } + } + + int var5; + if ((var3 & 1024) != 0) { + var2.spotAnimation = var0.method6785(); + var5 = var0.method6704(); + var2.field1061 = var5 >> 16; + var2.field1060 = (var5 & 65535) + Client.cycle; + var2.spotAnimationFrame = 0; + var2.spotAnimationFrameCycle = 0; + if (var2.field1060 > Client.cycle) { + var2.spotAnimationFrame = -1; + } + + if (var2.spotAnimation == 65535) { + var2.spotAnimation = -1; + } + } + + if ((var3 & 16) != 0) { + var5 = var0.method6686(); + byte[] var6 = new byte[var5]; + Buffer var7 = new Buffer(var6); + var0.method6749(var6, 0, var5); + Players.field1167[var1] = var7; + var2.read(var7); + } + + if ((var3 & 2) != 0) { + var2.overheadText = var0.readStringCp1252NullTerminated(); + if (var2.overheadText.charAt(0) == '~') { + var2.overheadText = var2.overheadText.substring(1); + class120.addGameMessage(2, var2.username.getName(), var2.overheadText); + } else if (var2 == MouseHandler.localPlayer) { + class120.addGameMessage(2, var2.username.getName(), var2.overheadText); + } + + var2.isAutoChatting = false; + var2.overheadTextColor = 0; + var2.overheadTextEffect = 0; + var2.overheadTextCyclesRemaining = 150; + } + + int var13; + if ((var3 & 1) != 0) { + var5 = var0.method6696(); + if (var5 == 65535) { + var5 = -1; + } + + var13 = var0.method6688(); + ParamComposition.performPlayerAnimation(var2, var5, var13); + } + + if ((var3 & 4) != 0) { + var2.targetIndex = var0.method6785(); + if (var2.targetIndex == 65535) { + var2.targetIndex = -1; + } + } + + if ((var3 & 256) != 0) { + var2.field1062 = var0.method6690(); + var2.field1064 = var0.method6689(); + var2.field1063 = var0.readByte(); + var2.field1065 = var0.method6644(); + var2.field1073 = var0.method6697() + Client.cycle; + var2.field1067 = var0.method6696() + Client.cycle; + var2.field1050 = var0.readUnsignedShort(); + if (var2.field1003) { + var2.field1062 += var2.tileX; + var2.field1064 += var2.tileY; + var2.field1063 += var2.tileX; + var2.field1065 += var2.tileY; + var2.pathLength = 0; + } else { + var2.field1062 += var2.pathX[0]; + var2.field1064 += var2.pathY[0]; + var2.field1063 += var2.pathX[0]; + var2.field1065 += var2.pathY[0]; + var2.pathLength = 1; + } + + var2.field1066 = 0; + } + + int var8; + int var9; + int var12; + if ((var3 & 8) != 0) { + var5 = var0.method6697(); + PlayerType var16 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var0.method6686()); + boolean var14 = var0.readUnsignedByte() == 1; + var8 = var0.method6873(); + var9 = var0.offset; + if (var2.username != null && var2.appearance != null) { + boolean var10 = false; + if (var16.isUser && Canvas.friendSystem.isIgnored(var2.username)) { + var10 = true; + } + + if (!var10 && Client.field521 == 0 && !var2.isHidden) { + Players.field1181.offset = 0; + var0.method6707(Players.field1181.array, 0, var8); + Players.field1181.offset = 0; + String var11 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(Players.field1181))); + var2.overheadText = var11.trim(); + var2.overheadTextColor = var5 >> 8; + var2.overheadTextEffect = var5 & 255; + var2.overheadTextCyclesRemaining = 150; + var2.isAutoChatting = var14; + var2.field1079 = var2 != MouseHandler.localPlayer && var16.isUser && "" != Client.field629 && var11.toLowerCase().indexOf(Client.field629) == -1; + if (var16.isPrivileged) { + var12 = var14 ? 91 : 1; + } else { + var12 = var14 ? 90 : 2; + } + + if (var16.modIcon != -1) { + class120.addGameMessage(var12, HealthBar.method1945(var16.modIcon) + var2.username.getName(), var11); + } else { + class120.addGameMessage(var12, var2.username.getName(), var11); + } + } + } + + var0.offset = var8 + var9; + } + + if ((var3 & 2048) != 0) { + Players.field1170[var1] = var0.readByte(); + } + + if ((var3 & 128) != 0) { + var5 = var0.method6873(); + int var15; + int var18; + int var19; + if (var5 > 0) { + for (var13 = 0; var13 < var5; ++var13) { + var8 = -1; + var9 = -1; + var18 = -1; + var19 = var0.readUShortSmart(); + if (var19 == 32767) { + var19 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var18 = var0.readUShortSmart(); + } else if (var19 != 32766) { + var9 = var0.readUShortSmart(); + } else { + var19 = -1; + } + + var15 = var0.readUShortSmart(); + var2.addHitSplat(var19, var9, var8, var18, Client.cycle, var15); + } + } + + var13 = var0.method6686(); + if (var13 > 0) { + for (var19 = 0; var19 < var13; ++var19) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var18 = var0.readUShortSmart(); + var15 = var0.method6686(); + var12 = var9 > 0 ? var0.method6688() : var15; + var2.addHealthBar(var8, Client.cycle, var9, var18, var15, var12); + } else { + var2.removeHealthBar(var8); + } + } + } + } + + if ((var3 & 4096) != 0) { + for (var5 = 0; var5 < 3; ++var5) { + var2.actions[var5] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var3 & 8192) != 0) { + var4 = var0.readByte(); + } + + if (var2.field1003) { + if (var4 == 127) { + var2.resetPath(var2.tileX, var2.tileY); + } else { + byte var17; + if (var4 != -1) { + var17 = var4; + } else { + var17 = Players.field1170[var1]; + } + + var2.method1829(var2.tileX, var2.tileY, var17); + } + } + + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "32" + ) + static int method3276(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = GrandExchangeEvent.Client_plane; + int var15 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; + int var8 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; + AbstractWorldMapIcon.getWorldMap().method6162(var3, var15, var8, true); + return 1; + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + String var16 = ""; + var9 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); + if (var9 != null) { + var16 = var9.getExternalName(); + } + + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AbstractWorldMapIcon.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AbstractWorldMapIcon.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + AbstractWorldMapIcon.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + AbstractWorldMapIcon.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + AbstractWorldMapIcon.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + AbstractWorldMapIcon.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var14 = AbstractWorldMapIcon.getWorldMap().getDisplayCoord(); + if (var14 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var11 = AbstractWorldMapIcon.getWorldMap().getCurrentMapArea(); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); + if (var12 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; + } + + return 1; + } + } else { + Coord var5; + if (var0 == 6618) { + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var11 = AbstractWorldMapIcon.getWorldMap().getCurrentMapArea(); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var5 = var11.coord(var14.x, var14.y); + if (var5 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); + } + + return 1; + } + } else { + Coord var10; + if (var0 == 6619) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + Tile.method3889(var3, var10, false); + return 1; + } else if (var0 == 6620) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + Tile.method3889(var3, var10, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + var9 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); + if (var9 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; + return 1; + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var11 = AbstractWorldMapIcon.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); + } + + return 1; + } else if (var0 == 6624) { + AbstractWorldMapIcon.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + AbstractWorldMapIcon.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + AbstractWorldMapIcon.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + AbstractWorldMapIcon.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AbstractWorldMapIcon.getWorldMap().setPerpetualFlash(var13); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AbstractWorldMapIcon.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + AbstractWorldMapIcon.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + AbstractWorldMapIcon.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + AbstractWorldMapIcon.getWorldMap().setElementsDisabled(var13); + return 1; + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + AbstractWorldMapIcon.getWorldMap().disableElement(var3, var7); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + AbstractWorldMapIcon.getWorldMap().setCategoryDisabled(var3, var7); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + var5 = AbstractWorldMapIcon.getWorldMap().method6210(var3, var10); + if (var5 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var6 = AbstractWorldMapIcon.getWorldMap().iconStart(); + if (var6 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var6 = AbstractWorldMapIcon.getWorldMap().iconNext(); + if (var6 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = HealthBarUpdate.WorldMapElement_get(var3); + if (var4.name == null) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.name; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = HealthBarUpdate.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = HealthBarUpdate.WorldMapElement_get(var3); + if (var4 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = HealthBarUpdate.WorldMapElement_get(var3); + if (var4 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BufferedNetSocket.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BufferedNetSocket.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BufferedNetSocket.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } + } } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 229ae1351a..b95fc64b23 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,161 +1,120 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fj") +@ObfuscatedName("fs") @Implements("WorldMapSectionType") -public enum WorldMapSectionType implements Enumerated -{ - @ObfuscatedName("f") +public enum WorldMapSectionType implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfs;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(0, (byte)0), - @ObfuscatedName("e") + WORLDMAPSECTIONTYPE0(1, (byte)0), + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfs;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(1, (byte)1), + WORLDMAPSECTIONTYPE1(3, (byte)1), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfs;" ) @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(2, (byte)2), - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfs;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(3, (byte)3); + WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("i") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1205433047 + intValue = -1831029213 ) @Export("type") final int type; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("id") final byte id; WorldMapSectionType(int var3, byte var4) { - this.type = var3; // L: 21 - this.id = var4; // L: 22 - } // L: 23 + this.type = var3; + this.id = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154679040" + garbageValue = "-1806959663" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 26 + return this.id; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)Lfq;", - garbageValue = "1715010895" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1710409785" ) - public static FloorOverlayDefinition method3677(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 30 - if (var1 != null) { // L: 31 - return var1; - } else { - byte[] var2 = GrandExchangeOfferUnitPriceComparator.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 32 - var1 = new FloorOverlayDefinition(); // L: 33 - if (var2 != null) { // L: 34 - var1.decode(new Buffer(var2), var0); + static void method3607(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.removeFocusListener(MouseHandler.MouseHandler_instance); + MouseHandler.MouseHandler_currentButtonVolatile = 0; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lnv;I)Ljava/lang/String;", + garbageValue = "-458958166" + ) + public static String method3608(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); + if (var2 > 32767) { + var2 = 32767; } - var1.postDecode(); // L: 35 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 36 - return var1; // L: 37 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "-216851091" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (World.World_worlds != null) { // L: 171 - class35.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + byte[] var3 = new byte[var2]; + var0.offset += class251.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = ModeWhere.decodeStringCp1252(var3, 0, var2); + var1 = var4; + } catch (Exception var6) { + var1 = "Cabbage"; } - } // L: 174 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Lfj;", - garbageValue = "1780988355" - ) - static WorldMapSectionType[] method3676() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE3}; // L: 17 + return var1; } - @ObfuscatedName("ab") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "-73" + descriptor = "(B)[Lfs;", + garbageValue = "-12" ) - static int method3668(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3469 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class302.getWindowedMode(); // L: 3470 - return 1; // L: 3471 + static WorldMapSectionType[] method3600() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE1}; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lio;IIIB)V", + garbageValue = "59" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2993 == null) { + throw new RuntimeException(); } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3473 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3474 - if (var3 == 1 || var3 == 2) { // L: 3475 - WorldMapDecorationType.setWindowedMode(var3); - } - - return 1; // L: 3476 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3478 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.windowMode; // L: 3479 - return 1; // L: 3480 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3482 - if (var0 == 5310) { // L: 3490 - --ChatChannel.Interpreter_intStackSize; // L: 3491 - return 1; // L: 3492 - } else if (var0 == 5311) { // L: 3494 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3495 - return 1; // L: 3496 - } else if (var0 == 5312) { // L: 3498 - --ChatChannel.Interpreter_intStackSize; // L: 3499 - return 1; // L: 3500 - } else if (var0 == 5350) { // L: 3502 - UserComparator9.Interpreter_stringStackSize -= 2; // L: 3503 - --ChatChannel.Interpreter_intStackSize; // L: 3504 - return 1; // L: 3505 - } else if (var0 == 5351) { // L: 3507 - --UserComparator9.Interpreter_stringStackSize; // L: 3508 - return 1; // L: 3509 - } else { - return 2; // L: 3511 - } - } else { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3483 - if (var3 == 1 || var3 == 2) { // L: 3484 - class4.clientPreferences.windowMode = var3; // L: 3485 - Actor.savePreferences(); // L: 3486 - } - - return 1; // L: 3488 - } + var0.field2993[var1] = var2; + var0.field3035[var1] = var3; } } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 8538245459..bfde8ed99e 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,37 +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("fk") +@ObfuscatedName("fn") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("gk") - @ObfuscatedGetter( - intValue = 1244253529 + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "Lgm;" ) - @Export("baseY") - static int baseY; - @ObfuscatedName("e") + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("t") @Export("tileColors") final int[] tileColors; WorldMapSprite() { - this.tileColors = new int[4096]; // L: 11 - } // L: 12 + this.tileColors = new int[4096]; + } WorldMapSprite(int[] var1) { - this.tileColors = var1; // L: 15 - } // L: 16 + this.tileColors = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1831503038" + garbageValue = "679149457" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var2 * 64 + var1]; // L: 19 + return this.tileColors[var2 * 64 + var1]; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[Ljo;", + garbageValue = "170681777" + ) + public static class270[] method3649() { + return new class270[]{class270.field3536, class270.field3533, class270.field3530, class270.field3531}; } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 090d4af14e..8fd4796595 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,22 +2,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ha") +@ObfuscatedName("hu") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("size") final int size; Wrapper(int var1) { - this.size = var1; // L: 9 - } // L: 10 + this.size = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("get") abstract Object get(); - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 3558600358..184d82733e 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,196 +1,30 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") -public class class0 extends class14 { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 566766495 - ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = -1559337791 - ) - static int field2; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 469754669 - ) - int field3; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = -494167787820068405L - ) - long field0; - // $FF: synthetic field +@ObfuscatedName("s") +public class class0 implements class3 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lv;" + descriptor = "(Lnv;)Lnv;" ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class0(class2 var1) { - this.this$0 = var1; // L: 307 + public Buffer vmethod15(Buffer var1) { + Buffer var2 = new Buffer(100); + this.method7(var1, var2); + return var2; } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" + descriptor = "(Lnv;Lnv;)V" ) - void vmethod363(Buffer var1) { - this.field3 = var1.readInt(); // L: 310 - this.field0 = var1.readLong(); // L: 311 - } // L: 312 + void method7(Buffer var1, Buffer var2) { + class8 var3 = new class8(var1); + class5 var4 = new class5(var3); - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method137(this.field3, this.field0); // L: 315 - } // L: 316 - - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "(Lcl;B)V", - garbageValue = "-91" - ) - static final void method11(Actor var0) { - var0.isWalking = false; // L: 4293 - SequenceDefinition var1; - if (var0.movementSequence != -1) { // L: 4294 - var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.movementSequence); // L: 4295 - if (var1 != null && var1.frameIds != null) { // L: 4296 - ++var0.movementFrameCycle; // L: 4297 - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4298 - var0.movementFrameCycle = 1; // L: 4299 - ++var0.movementFrame; // L: 4300 - Buddy.method5896(var1, var0.movementFrame, var0.x, var0.y); // L: 4301 - } - - if (var0.movementFrame >= var1.frameIds.length) { // L: 4303 - var0.movementFrameCycle = 0; // L: 4304 - var0.movementFrame = 0; // L: 4305 - Buddy.method5896(var1, var0.movementFrame, var0.x, var0.y); // L: 4306 - } - } else { - var0.movementSequence = -1; // L: 4309 - } + long var5; + for (var5 = 0L; !var4.method23(var3.method67(), var3.method61(), var5); ++var5) { } - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1262) { // L: 4311 - if (var0.spotAnimationFrame < 0) { // L: 4312 - var0.spotAnimationFrame = 0; - } - - int var3 = Tiles.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4313 - if (var3 != -1) { // L: 4314 - SequenceDefinition var2 = WorldMapScaleHandler.SequenceDefinition_get(var3); // L: 4315 - if (var2 != null && var2.frameIds != null) { // L: 4316 - ++var0.spotAnimationFrameCycle; // L: 4317 - if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4318 - var0.spotAnimationFrameCycle = 1; // L: 4319 - ++var0.spotAnimationFrame; // L: 4320 - Buddy.method5896(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 4321 - } - - if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 4323 4324 - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; // L: 4327 - } - } else { - var0.spotAnimation = -1; // L: 4329 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4331 - var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.sequence); // L: 4332 - if (var1.field1895 == 1 && var0.field1281 > 0 && var0.field1276 <= Client.cycle && var0.field1269 < Client.cycle) { // L: 4333 4334 - var0.sequenceDelay = 1; // L: 4335 - return; // L: 4336 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4340 - var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.sequence); // L: 4341 - if (var1 != null && var1.frameIds != null) { // L: 4342 - ++var0.sequenceFrameCycle; // L: 4343 - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4344 - var0.sequenceFrameCycle = 1; // L: 4345 - ++var0.sequenceFrame; // L: 4346 - Buddy.method5896(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4347 - } - - if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4349 - var0.sequenceFrame -= var1.frameCount; // L: 4350 - ++var0.field1258; // L: 4351 - if (var0.field1258 >= var1.field1896) { // L: 4352 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4353 - Buddy.method5896(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4354 - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var1.field1888; // L: 4356 - } else { - var0.sequence = -1; // L: 4358 - } - } - - if (var0.sequenceDelay > 0) { // L: 4360 - --var0.sequenceDelay; - } - - } // L: 4361 - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1925251884" - ) - static String method1(int var0) { - if (var0 < 0) { // L: 8997 - return ""; - } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 8998 8999 - } + var2.writeLong(var5); } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "935953368" - ) - static final void method0(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); // L: 11112 - if (var0 != class4.clientPreferences.musicVolume) { // L: 11113 - if (class4.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11114 - class105.method2357(DynamicObject.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11115 - Client.field862 = false; // L: 11116 - } else if (var0 == 0) { // L: 11118 - Decimator.method1169(); // L: 11119 - Client.field862 = false; // L: 11120 - } else if (class233.musicPlayerStatus != 0) { // L: 11123 - class233.musicTrackVolume = var0; - } else { - class233.midiPcmStream.setPcmStreamVolume(var0); // L: 11124 - } - - class4.clientPreferences.musicVolume = var0; // L: 11126 - Actor.savePreferences(); // L: 11127 - } - - } // L: 11129 } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 5f6105ecf4..bfd0d6d4fd 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,104 +1,147 @@ +import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") -public class class1 extends class14 { - @ObfuscatedName("ar") - @Export("client") +@ObfuscatedName("t") +public class class1 implements Callable { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -136395951 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lclient;" + descriptor = "Lnv;" ) - static Client client; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -790224169 + final Buffer field1; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lj;" ) - int field6; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1595809253 - ) - int field7; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -864477031 - ) - int field8; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1618165123 - ) - int field9; + final class3 field0; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lv;" + descriptor = "Lf;" ) - final class2 this$0; + final class7 this$0; @ObfuscatedSignature( - descriptor = "(Lv;)V" + descriptor = "(Lf;Lnv;Lj;)V" ) - class1(class2 var1) { - this.this$0 = var1; // L: 289 + class1(class7 var1, Buffer var2, class3 var3) { + this.this$0 = var1; + this.field1 = var2; + this.field0 = var3; } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field6 = var1.readInt(); // L: 292 - this.field9 = var1.readInt(); // L: 293 - this.field7 = var1.readUnsignedByte(); // L: 294 - this.field8 = var1.readUnsignedByte(); // L: 295 - } // L: 296 + public Object call() { + return this.field0.vmethod15(this.field1); + } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" + descriptor = "(III)Lay;", + garbageValue = "938063245" ) - void vmethod354(ClanSettings var1) { - var1.method136(this.field6, this.field9, this.field7, this.field8); // L: 299 - } // L: 300 + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); + } - @ObfuscatedName("e") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(II)Leb;", - garbageValue = "2027222445" + descriptor = "(Lbb;IIII)V", + garbageValue = "2142643215" ) - @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)); + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (MouseHandler.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + int var7; + if (var0.skillLevel == 0) { + String var5 = var0.actions[0] + var0.username + var0.actions[1]; + var7 = var0.combatLevel; + int var8 = MouseHandler.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = ScriptFrame.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = ScriptFrame.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = ScriptFrame.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = ScriptFrame.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = ScriptFrame.colorStartTag(65280); + } else if (var9 > 6) { + var6 = ScriptFrame.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = ScriptFrame.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = ScriptFrame.colorStartTag(12648192); + } else { + var6 = ScriptFrame.colorStartTag(16776960); + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } + + int var10; + if (Client.isItemSelected == 1) { + class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((ViewportMouse.selectedSpellFlags & 8) == 8) { + class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var10 = 7; var10 >= 0; --var10) { + if (Client.playerMenuActions[var10] != null) { + short var11 = 0; + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { + continue; + } + + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > MouseHandler.localPlayer.combatLevel) { + var11 = 2000; + } + + if (MouseHandler.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == MouseHandler.localPlayer.team) { + var11 = 2000; + } else { + var11 = 0; + } + } else if (AttackOption.field1157 == Client.playerAttackOption && var0.isClanMember()) { + var11 = 2000; + } + } else if (Client.playerOptionsPriorities[var10]) { + var11 = 2000; + } + + boolean var12 = false; + var7 = Client.playerMenuOpcodes[var10] + var11; + class7.insertMenuItemNoShift(Client.playerMenuActions[var10], ScriptFrame.colorStartTag(16777215) + var4, var7, var1, var2, var3); + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { + if (Client.menuOpcodes[var10] == 23) { + Client.menuTargets[var10] = ScriptFrame.colorStartTag(16777215) + var4; + break; + } + } + } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 - return var1; // L: 29 } } - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-72" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (class289.friendsChat != null) { // L: 11471 - PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); // L: 11472 - var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 11473 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11474 - Client.packetWriter.addNode(var1); // L: 11475 - } - } // L: 11476 } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java deleted file mode 100644 index f2ec29812c..0000000000 --- a/runescape-client/src/main/java/class10.java +++ /dev/null @@ -1,84 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("z") -public class class10 extends class14 { - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("en") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("ot") - @ObfuscatedSignature( - descriptor = "Lmv;" - ) - static class340 field74; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1622036421 - ) - int field73; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class10(class2 var1) { - this.this$0 = var1; - this.field73 = -1; // L: 213 - } // L: 215 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field73 = var1.readUnsignedShort(); // L: 218 - } // L: 219 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method124(this.field73); // L: 222 - } // L: 223 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "1676920158" - ) - public static void method109(AbstractArchive var0) { - EnumComposition.EnumDefinition_archive = var0; // L: 25 - } // L: 26 - - @ObfuscatedName("lo") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1908881441" - ) - static void method113(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11538 - if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11539 - var1.remove(); // L: 11540 - } - } - - } // L: 11543 -} diff --git a/runescape-client/src/main/java/class100.java b/runescape-client/src/main/java/class100.java new file mode 100644 index 0000000000..1cdb147d1c --- /dev/null +++ b/runescape-client/src/main/java/class100.java @@ -0,0 +1,232 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ca") +public class class100 extends class103 { + @ObfuscatedName("f") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 3854583 + ) + int field1278; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -59354765 + ) + int field1279; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 443748973 + ) + int field1277; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 2061672731 + ) + int field1280; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class100(class106 var1) { + this.this$0 = var1; + this.field1278 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1278 = var1.readUnsignedShort(); + this.field1279 = var1.readInt(); + this.field1277 = var1.readUnsignedByte(); + this.field1280 = var1.readUnsignedByte(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2370(this.field1278, this.field1279, this.field1277, this.field1280); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "20" + ) + public static void method2227(int var0, int var1) { + VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); + VarbitComposition var2; + if (var3 != null) { + var2 = var3; + } else { + byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var3 = new VarbitComposition(); + if (var4 != null) { + var3.decode(new Buffer(var4)); + } + + VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); + var2 = var3; + } + + int var8 = var2.baseVar; + int var5 = var2.startBit; + int var6 = var2.endBit; + int var7 = Varps.Varps_masks[var6 - var5]; + if (var1 < 0 || var1 > var7) { + var1 = 0; + } + + var7 <<= var5; + Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Lel;", + garbageValue = "1236400389" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("hm") + @ObfuscatedSignature( + descriptor = "(ZLnu;I)V", + garbageValue = "-1522192285" + ) + static final void method2220(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { + int var2 = var1.readBits(15); + if (var2 != 32767) { + boolean var3 = false; + if (Client.npcs[var2] == null) { + Client.npcs[var2] = new NPC(); + var3 = true; + } + + NPC var4 = Client.npcs[var2]; + Client.npcIndices[++Client.npcCount - 1] = var2; + var4.npcCycle = Client.cycle; + int var8 = var1.readBits(1); + if (var8 == 1) { + Client.field474[++Client.field500 - 1] = var2; + } + + int var9 = Client.defaultRotations[var1.readBits(3)]; + if (var3) { + var4.orientation = var4.rotation = var9; + } + + int var6; + if (var0) { + var6 = var1.readBits(8); + if (var6 > 127) { + var6 -= 256; + } + } else { + var6 = var1.readBits(5); + if (var6 > 15) { + var6 -= 32; + } + } + + int var7; + if (var0) { + var7 = var1.readBits(8); + if (var7 > 127) { + var7 -= 256; + } + } else { + var7 = var1.readBits(5); + if (var7 > 15) { + var7 -= 32; + } + } + + boolean var10 = var1.readBits(1) == 1; + if (var10) { + var1.readBits(32); + } + + var4.definition = UserComparator6.getNpcDefinition(var1.readBits(14)); + int var5 = var1.readBits(1); + var4.field1023 = var4.definition.size; + var4.field1074 = var4.definition.rotation; + if (var4.field1074 == 0) { + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; + var4.walkBackSequence = var4.definition.walkBackSequence; + var4.walkLeftSequence = var4.definition.walkLeftSequence; + var4.walkRightSequence = var4.definition.walkRightSequence; + var4.idleSequence = var4.definition.idleSequence; + var4.turnLeftSequence = var4.definition.turnLeftSequence; + var4.turnRightSequence = var4.definition.turnRightSequence; + var4.method1957(MouseHandler.localPlayer.pathX[0] + var6, MouseHandler.localPlayer.pathY[0] + var7, var5 == 1); + continue; + } + } + + var1.exportIndex(); + return; + } + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(IIIIIB)V", + garbageValue = "-48" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + Message.scrollBarSprites[0].drawAt(var0, var1); + Message.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field469); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field470); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field632); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field632); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field632); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field632); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field471); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field471); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field471); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field471); + } +} diff --git a/runescape-client/src/main/java/class101.java b/runescape-client/src/main/java/class101.java new file mode 100644 index 0000000000..40aab5e99e --- /dev/null +++ b/runescape-client/src/main/java/class101.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("cx") +public class class101 extends class103 { + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = 4280987442180721817L + ) + long field1284; + @ObfuscatedName("t") + String field1283; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class101(class106 var1) { + this.this$0 = var1; + this.field1284 = -1L; + this.field1283 = null; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1284 = var1.readLong(); + } + + this.field1283 = var1.readStringCp1252NullTerminatedOrNull(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2362(this.field1284, this.field1283, 0); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lie;I)V", + garbageValue = "1929542167" + ) + public static void method2229(Huffman var0) { + class251.huffman = var0; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IB)Let;", + garbageValue = "-71" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructComposition.StructDefinition_cached.put(var1, (long)var0); + return var1; + } + } +} diff --git a/runescape-client/src/main/java/class102.java b/runescape-client/src/main/java/class102.java new file mode 100644 index 0000000000..ec76810d49 --- /dev/null +++ b/runescape-client/src/main/java/class102.java @@ -0,0 +1,160 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cr") +public class class102 extends class103 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1285244993 + ) + int field1287; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class102(class106 var1) { + this.this$0 = var1; + this.field1287 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1287 = var1.readUnsignedShort(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2363(this.field1287); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnu;II)Z", + garbageValue = "-2113578169" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { + if (var0.readBits(1) != 0) { + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { + throw new RuntimeException(); + } else { + Player var11 = Client.players[var1] = new Player(); + var11.index = var1; + if (Players.field1167[var1] != null) { + var11.read(Players.field1167[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; + var11.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var11.pathTraversed[0] = Players.field1170[var1]; + var11.plane = (byte)var8; + var11.resetPath((var9 << 13) + var3 - GrandExchangeOfferNameComparator.baseX, (var10 << 13) + var4 - NPC.baseY); + var11.field1003 = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + return false; + } else { + int var5; + int var6; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var6 = Players.Players_regions[var1]; + var7 = (var6 >> 28) + var4 & 3; + var8 = var6 >> 14 & 255; + var9 = var6 & 255; + if (var5 == 0) { + --var8; + --var9; + } + + if (var5 == 1) { + --var9; + } + + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var6 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var6 + var7 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; + } + } + } +} diff --git a/runescape-client/src/main/java/class103.java b/runescape-client/src/main/java/class103.java new file mode 100644 index 0000000000..df30ade7a0 --- /dev/null +++ b/runescape-client/src/main/java/class103.java @@ -0,0 +1,181 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cc") +public abstract class class103 extends Node { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + static ClanChannel field1293; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = 186460537 + ) + @Export("selectedItemId") + static int selectedItemId; + + class103() { + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + abstract void vmethod2562(Buffer var1); + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + abstract void vmethod2567(ClanSettings var1); + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-2125091280" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Lkq;II)Lhg;", + garbageValue = "425740128" + ) + public static PacketBufferNode method2258(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(0); + int var5 = var4.packetBuffer.offset; + var4.packetBuffer.writeByte(var0); + String var6 = var1.toLowerCase(); + byte var7 = 0; + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var7 = 2; + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); + } else if (var2 != Language.Language_EN) { + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var7 = 2; + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); + } + } + + var6 = var1.toLowerCase(); + byte var8 = 0; + if (var6.startsWith("wave:")) { + var8 = 1; + var1 = var1.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var8 = 2; + var1 = var1.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var8 = 3; + var1 = var1.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var8 = 4; + var1 = var1.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var8 = 5; + var1 = var1.substring("slide:".length()); + } else if (var2 != Language.Language_EN) { + if (var6.startsWith("wave:")) { + var8 = 1; + var1 = var1.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var8 = 2; + var1 = var1.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var8 = 3; + var1 = var1.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var8 = 4; + var1 = var1.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var8 = 5; + var1 = var1.substring("slide:".length()); + } + } + + var4.packetBuffer.writeByte(var7); + var4.packetBuffer.writeByte(var8); + SpriteMask.method4690(var4.packetBuffer, var1); + if (var0 == class256.field3131.rsOrdinal()) { + var4.packetBuffer.writeByte(var3); + } + + var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); + return var4; + } +} diff --git a/runescape-client/src/main/java/class104.java b/runescape-client/src/main/java/class104.java new file mode 100644 index 0000000000..688304f8fa --- /dev/null +++ b/runescape-client/src/main/java/class104.java @@ -0,0 +1,180 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dk") +public class class104 extends class103 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 580988101 + ) + int field1297; + @ObfuscatedName("t") + boolean field1298; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class104(class106 var1) { + this.this$0 = var1; + this.field1297 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1297 = var1.readUnsignedShort(); + this.field1298 = var1.readUnsignedByte() == 1; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2369(this.field1297, this.field1298); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1066744869" + ) + static int method2272(int var0, int var1) { + FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + FloorOverlayDefinition var2; + if (var3 != null) { + var2 = var3; + } else { + byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var3 = new FloorOverlayDefinition(); + if (var4 != null) { + var3.decode(new Buffer(var4), var0); + } + + var3.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0); + var2 = var3; + } + + if (var2 == null) { + return var1; + } else if (var2.secondaryRgb >= 0) { + return var2.secondaryRgb | -16777216; + } else { + int var6; + if (var2.texture >= 0) { + var6 = Messages.method2072(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var6] | -16777216; + } else if (var2.primaryRgb == 16711935) { + return var1; + } else { + var6 = TileItem.method2007(var2.hue, var2.saturation, var2.lightness); + int var5 = Messages.method2072(var6, 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var5] | -16777216; + } + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "-789847888" + ) + public static byte[] method2265(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { + var2[var3] = (byte)var4; + } else if (var4 == 8364) { + var2[var3] = -128; + } else if (var4 == 8218) { + var2[var3] = -126; + } else if (var4 == 402) { + var2[var3] = -125; + } else if (var4 == 8222) { + var2[var3] = -124; + } else if (var4 == 8230) { + var2[var3] = -123; + } else if (var4 == 8224) { + var2[var3] = -122; + } else if (var4 == 8225) { + var2[var3] = -121; + } else if (var4 == 710) { + var2[var3] = -120; + } else if (var4 == 8240) { + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; + } else if (var4 == 8249) { + var2[var3] = -117; + } else if (var4 == 338) { + var2[var3] = -116; + } else if (var4 == 381) { + var2[var3] = -114; + } else if (var4 == 8216) { + var2[var3] = -111; + } else if (var4 == 8217) { + var2[var3] = -110; + } else if (var4 == 8220) { + var2[var3] = -109; + } else if (var4 == 8221) { + var2[var3] = -108; + } else if (var4 == 8226) { + var2[var3] = -107; + } else if (var4 == 8211) { + var2[var3] = -106; + } else if (var4 == 8212) { + var2[var3] = -105; + } else if (var4 == 732) { + var2[var3] = -104; + } else if (var4 == 8482) { + var2[var3] = -103; + } else if (var4 == 353) { + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; + } else if (var4 == 339) { + var2[var3] = -100; + } else if (var4 == 382) { + var2[var3] = -98; + } else if (var4 == 376) { + var2[var3] = -97; + } else { + var2[var3] = 63; + } + } + + return var2; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-121" + ) + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; + } + + } + } +} diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java deleted file mode 100644 index 1b7b28c694..0000000000 --- a/runescape-client/src/main/java/class105.java +++ /dev/null @@ -1,57 +0,0 @@ -import java.io.IOException; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("db") -public class class105 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1657910779" - ) - public static void method2358(boolean var0) { - if (NetCache.NetCache_socket != null) { // L: 42 - try { - Buffer var1 = new Buffer(4); // L: 44 - var1.writeByte(var0 ? 2 : 3); // L: 45 - var1.writeMedium(0); // L: 46 - NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 47 - } catch (IOException var4) { - try { - NetCache.NetCache_socket.close(); // L: 51 - } catch (Exception var3) { // L: 53 - } - - ++NetCache.NetCache_ioExceptions; // L: 54 - NetCache.NetCache_socket = null; // L: 55 - } - - } - } // L: 57 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljp;IIIZI)V", - garbageValue = "1271786262" - ) - public static void method2357(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class233.musicPlayerStatus = 1; // L: 34 - InvDefinition.musicTrackArchive = var0; // L: 35 - class233.musicTrackGroupId = var1; // L: 36 - class233.musicTrackFileId = var2; // L: 37 - class233.musicTrackVolume = var3; // L: 38 - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var4; // L: 39 - FaceNormal.pcmSampleLength = 10000; // L: 40 - } // L: 41 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1162856506" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 162 - } -} diff --git a/runescape-client/src/main/java/class106.java b/runescape-client/src/main/java/class106.java index bb56216826..e22222a87f 100644 --- a/runescape-client/src/main/java/class106.java +++ b/runescape-client/src/main/java/class106.java @@ -3,135 +3,153 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dn") public class class106 { - @ObfuscatedName("f") + @ObfuscatedName("nq") @ObfuscatedGetter( - intValue = 2138418587 + intValue = -1974970037 ) - int field1338; - @ObfuscatedName("e") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -967225705 + longValue = -9157907718782179641L ) - int field1339; - @ObfuscatedName("v") + long field1308; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1767393285 + intValue = -1464332755 ) - int field1340; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -818178637 - ) - int field1337; - - class106(int var1, int var2, int var3, int var4) { - this.field1338 = var1; // L: 10 - this.field1339 = var2; // L: 11 - this.field1340 = var3; // L: 12 - this.field1337 = var4; // L: 13 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2088462326" - ) - int method2375() { - return this.field1338; // L: 17 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1716458247" - ) - int method2360() { - return this.field1339; // L: 21 - } - + int field1309; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1297519754" + descriptor = "Lkk;" ) - int method2367() { - return this.field1340; // L: 25 + IterableNodeDeque field1310; + + @ObfuscatedSignature( + descriptor = "(Lnv;)V" + ) + public class106(Buffer var1) { + this.field1309 = -1; + this.field1310 = new IterableNodeDeque(); + this.method2274(var1); } - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1743321878" + descriptor = "(Lnv;B)V", + garbageValue = "2" ) - int method2363() { - return this.field1337; // L: 29 - } + void method2274(Buffer var1) { + this.field1308 = var1.readLong(); + this.field1309 = var1.readInt(); - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Lja;", - garbageValue = "-2024232904" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3544, PlayerType.PlayerType_ultimateIronman}; // L: 20 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Lee;", - garbageValue = "895185577" - ) - static VerticalAlignment[] method2373() { - return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1676, VerticalAlignment.field1679}; // L: 14 - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-194944054" - ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 406 - int var2 = var1.readUnsignedByte(); // L: 407 - int var3 = var1.readInt(); // L: 408 - if (var3 < 0 || AbstractArchive.field3599 != 0 && var3 > AbstractArchive.field3599) { // L: 409 - throw new RuntimeException(); // L: 410 - } else if (var2 == 0) { // L: 412 - byte[] var6 = new byte[var3]; // L: 413 - var1.readBytes(var6, 0, var3); // L: 414 - return var6; // L: 415 - } else { - int var4 = var1.readInt(); // L: 418 - if (var4 >= 0 && (AbstractArchive.field3599 == 0 || var4 <= AbstractArchive.field3599)) { // L: 419 - byte[] var5 = new byte[var4]; // L: 422 - if (var2 == 1) { // L: 423 - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 424 + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 3) { + var3 = new class125(this); + } else if (var2 == 1) { + var3 = new class101(this); + } else if (var2 == 13) { + var3 = new class118(this); + } else if (var2 == 4) { + var3 = new class110(this); + } else if (var2 == 6) { + var3 = new class117(this); + } else if (var2 == 5) { + var3 = new class102(this); + } else if (var2 == 2) { + var3 = new class107(this); + } else if (var2 == 7) { + var3 = new class100(this); + } else if (var2 == 14) { + var3 = new class104(this); + } else if (var2 == 8) { + var3 = new class121(this); + } else if (var2 == 9) { + var3 = new class127(this); + } else if (var2 == 10) { + var3 = new class113(this); + } else if (var2 == 11) { + var3 = new class108(this); + } else if (var2 == 12) { + var3 = new class112(this); + } else { + if (var2 != 15) { + throw new RuntimeException(""); } - return var5; // L: 425 - } else { - throw new RuntimeException(); // L: 420 + var3 = new class122(this); } + + ((class103)var3).vmethod2562(var1); + this.field1310.addFirst((Node)var3); + } + + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "-901301928" + ) + public void method2273(ClanSettings var1) { + if (this.field1308 == var1.field1370 && this.field1309 == var1.field1363) { + for (class103 var2 = (class103)this.field1310.last(); var2 != null; var2 = (class103)this.field1310.previous()) { + var2.vmethod2567(var1); + } + + ++var1.field1363; + } else { + throw new RuntimeException(""); } } - @ObfuscatedName("gx") + @ObfuscatedName("kl") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-47" + descriptor = "(IIII)Lbj;", + garbageValue = "-1612775342" ) - static final int method2372() { - if (class4.clientPreferences.roofsHidden) { // L: 4849 - return SoundSystem.Client_plane; - } else { - int var0 = ItemContainer.getTileHeight(ObjectSound.cameraX, Canvas.cameraZ, SoundSystem.Client_plane); // L: 4850 - return var0 - class160.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.Client_plane][ObjectSound.cameraX >> 7][Canvas.cameraZ >> 7] & 4) != 0 ? SoundSystem.Client_plane : 3; // L: 4851 4852 + static final InterfaceParent method2275(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + Timer.Widget_resetModelFrames(var1); + Widget var4 = UrlRequester.getWidget(var0); + AttackOption.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + AttackOption.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (SoundSystem.method524(Client.menuOpcodes[var5])) { + if (var5 < Client.menuOptionsCount - 1) { + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { + Client.menuActions[var6] = Client.menuActions[var6 + 1]; + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; + } + } + + --var5; + --Client.menuOptionsCount; + } + } + + SecureRandomFuture.method1711(); + AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); + class112.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + WorldMapData_0.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; } } diff --git a/runescape-client/src/main/java/class107.java b/runescape-client/src/main/java/class107.java new file mode 100644 index 0000000000..a5685ff7f4 --- /dev/null +++ b/runescape-client/src/main/java/class107.java @@ -0,0 +1,167 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("de") +public class class107 extends class103 { + @ObfuscatedName("rd") + @ObfuscatedGetter( + intValue = -117380993 + ) + static int field1323; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1858672991 + ) + int field1321; + @ObfuscatedName("t") + byte field1320; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class107(class106 var1) { + this.this$0 = var1; + this.field1321 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1321 = var1.readUnsignedShort(); + this.field1320 = var1.readByte(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2367(this.field1321, this.field1320); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(S)Ljava/lang/String;", + garbageValue = "255" + ) + static String method2292() { + return Decimator.clientPreferences.hideUsername ? class16.method176(Login.Login_username) : Login.Login_username; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "2007790816" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + Login.loginIndex = 2; + if (var0) { + Login.Login_password = ""; + } + + AttackOption.method2005(); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + + } + + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-119" + ) + static final void method2290() { + int[] var0 = Players.Players_indices; + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var4 = Client.players[var0[var1]]; + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { + --var4.overheadTextCyclesRemaining; + if (var4.overheadTextCyclesRemaining == 0) { + var4.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { + int var2 = Client.npcIndices[var1]; + NPC var3 = Client.npcs[var2]; + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { + --var3.overheadTextCyclesRemaining; + if (var3.overheadTextCyclesRemaining == 0) { + var3.overheadText = null; + } + } + } + + } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1530848539" + ) + static void method2291() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (Huffman.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; + } + } + + if (!var2) { + var4 = (int)var0.key; + Widget var5 = UrlRequester.getWidget(var4); + if (var5 != null) { + AttackOption.invalidateWidget(var5); + } + } + } + } + + } + + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "12" + ) + static final void method2293() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsFriend(); + } + + MouseHandler.method349(); + if (MouseRecorder.friendsChat != null) { + MouseRecorder.friendsChat.clearFriends(); + } + + } +} diff --git a/runescape-client/src/main/java/class108.java b/runescape-client/src/main/java/class108.java new file mode 100644 index 0000000000..f22034e82d --- /dev/null +++ b/runescape-client/src/main/java/class108.java @@ -0,0 +1,140 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dc") +public class class108 extends class103 { + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 219249765 + ) + int field1331; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 378364321 + ) + int field1326; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 704376051 + ) + int field1327; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1492195551 + ) + int field1330; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class108(class106 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1331 = var1.readInt(); + this.field1330 = var1.readInt(); + this.field1326 = var1.readUnsignedByte(); + this.field1327 = var1.readUnsignedByte(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2372(this.field1331, this.field1330, this.field1326, this.field1327); + } + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "573927202" + ) + static void method2304(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, GraphicsObject.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != MouseHandler.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + var8.packetBuffer.method6786(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(var3[var6]); + var8.packetBuffer.method6776(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3[var6]); + var8.packetBuffer.method6685(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6683(0); + var8.packetBuffer.method6693(var3[var6]); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; + } + } + + if (!var4) { + class120.addGameMessage(4, "", "Unable to find " + var1); + } + + } + + @ObfuscatedName("lw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1553122887" + ) + static void method2294() { + if (Client.field489 && MouseHandler.localPlayer != null) { + int var0 = MouseHandler.localPlayer.pathX[0]; + int var1 = MouseHandler.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + KeyHandler.oculusOrbFocalPointX = MouseHandler.localPlayer.x; + int var2 = class122.getTileHeight(MouseHandler.localPlayer.x, MouseHandler.localPlayer.y, GrandExchangeEvent.Client_plane) - Client.camFollowHeight; + if (var2 < class270.field3532) { + class270.field3532 = var2; + } + + ArchiveDiskAction.oculusOrbFocalPointY = MouseHandler.localPlayer.y; + Client.field489 = false; + } + + } +} diff --git a/runescape-client/src/main/java/class109.java b/runescape-client/src/main/java/class109.java new file mode 100644 index 0000000000..f2cab30782 --- /dev/null +++ b/runescape-client/src/main/java/class109.java @@ -0,0 +1,156 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("do") +public class class109 extends class119 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -525542247 + ) + int field1334; + @ObfuscatedName("t") + byte field1333; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1108606271 + ) + int field1335; + @ObfuscatedName("j") + String field1332; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + final class120 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldi;)V" + ) + class109(class120 var1) { + this.this$0 = var1; + this.field1334 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "1209873443" + ) + void vmethod2558(Buffer var1) { + this.field1334 = var1.readUnsignedShort(); + this.field1333 = var1.readByte(); + this.field1335 = var1.readUnsignedShort(); + var1.readLong(); + this.field1332 = var1.readStringCp1252NullTerminated(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldt;B)V", + garbageValue = "-7" + ) + void vmethod2555(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1334); + var2.rank = this.field1333; + var2.world = this.field1335; + var2.username = new Username(this.field1332); + } + + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(Lbx;I)V", + garbageValue = "-1389624417" + ) + static final void method2313(Actor var0) { + var0.isWalking = false; + SequenceDefinition var1; + if (var0.movementSequence != -1) { + var1 = World.SequenceDefinition_get(var0.movementSequence); + if (var1 != null && var1.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + ParamComposition.method2926(var1, var0.movementFrame, var0.x, var0.y); + } + + if (var0.movementFrame >= var1.frameIds.length) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + ParamComposition.method2926(var1, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1060) { + if (var0.spotAnimationFrame < 0) { + var0.spotAnimationFrame = 0; + } + + int var3 = PcmPlayer.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var3 != -1) { + SequenceDefinition var2 = World.SequenceDefinition_get(var3); + if (var2 != null && var2.frameIds != null) { + ++var0.spotAnimationFrameCycle; + if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { + var0.spotAnimationFrameCycle = 1; + ++var0.spotAnimationFrame; + ParamComposition.method2926(var2, var0.spotAnimationFrame, var0.x, var0.y); + } + + if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var1 = World.SequenceDefinition_get(var0.sequence); + if (var1.field1867 == 1 && var0.field1066 > 0 && var0.field1073 <= Client.cycle && var0.field1067 < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var1 = World.SequenceDefinition_get(var0.sequence); + if (var1 != null && var1.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + ParamComposition.method2926(var1, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var1.frameIds.length) { + var0.sequenceFrame -= var1.frameCount; + ++var0.field1056; + if (var0.field1056 >= var1.field1872) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { + ParamComposition.method2926(var1, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field1868; + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; + } + + } +} diff --git a/runescape-client/src/main/java/class110.java b/runescape-client/src/main/java/class110.java new file mode 100644 index 0000000000..8661dd3d39 --- /dev/null +++ b/runescape-client/src/main/java/class110.java @@ -0,0 +1,109 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dx") +public class class110 extends class103 { + @ObfuscatedName("s") + boolean field1342; + @ObfuscatedName("t") + byte field1339; + @ObfuscatedName("v") + byte field1340; + @ObfuscatedName("j") + byte field1341; + @ObfuscatedName("l") + byte field1338; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class110(class106 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1342 = var1.readUnsignedByte() == 1; + this.field1339 = var1.readByte(); + this.field1340 = var1.readByte(); + this.field1341 = var1.readByte(); + this.field1338 = var1.readByte(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.allowGuests = this.field1342; + var1.field1359 = this.field1339; + var1.field1368 = this.field1340; + var1.field1369 = this.field1341; + var1.field1383 = this.field1338; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;ZB)V", + garbageValue = "92" + ) + public static void method2318(AbstractArchive var0, AbstractArchive var1, boolean var2) { + ObjectComposition.ObjectDefinition_archive = var0; + ObjectComposition.ObjectDefinition_modelsArchive = var1; + ObjectComposition.ObjectDefinition_isLowDetail = var2; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-182277228" + ) + public static boolean method2322(int var0) { + return (var0 >> 21 & 1) != 0; + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILbd;ZS)I", + garbageValue = "-13449" + ) + static int method2324(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { + if (var0 == 6750) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { + if (var0 == 6754) { + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + NPCComposition var4 = UserComparator6.getNpcDefinition(var3); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } + } else { + --Interpreter.Interpreter_intStackSize; + return 1; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + --class1.Interpreter_stringStackSize; + return 1; + } + } +} diff --git a/runescape-client/src/main/java/class111.java b/runescape-client/src/main/java/class111.java new file mode 100644 index 0000000000..a6320deca6 --- /dev/null +++ b/runescape-client/src/main/java/class111.java @@ -0,0 +1,49 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dr") +public class class111 extends class119 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -721991731 + ) + int field1348; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + final class120 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldi;)V" + ) + class111(class120 var1) { + this.this$0 = var1; + this.field1348 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "1209873443" + ) + void vmethod2558(Buffer var1) { + this.field1348 = var1.readUnsignedShort(); + var1.readUnsignedByte(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); + } + + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldt;B)V", + garbageValue = "-7" + ) + void vmethod2555(ClanChannel var1) { + var1.removeMember(this.field1348); + } +} diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java new file mode 100644 index 0000000000..15e8c53a17 --- /dev/null +++ b/runescape-client/src/main/java/class112.java @@ -0,0 +1,75 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("da") +public class class112 extends class103 { + @ObfuscatedName("s") + String field1352; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class112(class106 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1352 = var1.readStringCp1252NullTerminated(); + var1.readInt(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.name = this.field1352; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lag;", + garbageValue = "-1781321199" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class15.World_worlds[++World.World_listCount - 1] : null; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "74" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (Huffman.loadInterface(var0)) { + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + class78.runScript(var4, 5000000, 0); + } + } + + } + } + } +} diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java new file mode 100644 index 0000000000..477f18699d --- /dev/null +++ b/runescape-client/src/main/java/class113.java @@ -0,0 +1,102 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dw") +public class class113 extends class103 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1690465903 + ) + int field1356; + @ObfuscatedName("t") + String field1355; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class113(class106 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1356 = var1.readInt(); + this.field1355 = var1.readStringCp1252NullTerminated(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2377(this.field1356, this.field1355); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Lnf;I)Ljava/lang/String;", + garbageValue = "-82208438" + ) + public static String method2347(CharSequence var0, LoginType var1) { + if (var0 == null) { + return null; + } else { + int var2 = 0; + + int var3; + boolean var4; + char var5; + for (var3 = var0.length(); var2 < var3; ++var2) { + var5 = var0.charAt(var2); + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; + if (!var4) { + break; + } + } + + while (var3 > var2) { + var5 = var0.charAt(var3 - 1); + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; + if (!var4) { + break; + } + + --var3; + } + + int var10 = var3 - var2; + if (var10 >= 1 && var10 <= class346.method6099(var1)) { + StringBuilder var9 = new StringBuilder(var10); + + for (int var6 = var2; var6 < var3; ++var6) { + char var7 = var0.charAt(var6); + if (AbstractWorldMapIcon.method3714(var7)) { + char var8 = DevicePcmPlayerProvider.method109(var7); + if (var8 != 0) { + var9.append(var8); + } + } + } + + if (var9.length() == 0) { + return null; + } else { + return var9.toString(); + } + } else { + return null; + } + } + } +} diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java new file mode 100644 index 0000000000..44eecf65b3 --- /dev/null +++ b/runescape-client/src/main/java/class115.java @@ -0,0 +1,69 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dm") +public class class115 extends class119 { + @ObfuscatedName("s") + String field1388; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -534205427 + ) + int field1389; + @ObfuscatedName("v") + byte field1390; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + final class120 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldi;)V" + ) + class115(class120 var1) { + this.this$0 = var1; + this.field1388 = null; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "1209873443" + ) + void vmethod2558(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); + } + + this.field1388 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1389 = var1.readUnsignedShort(); + this.field1390 = var1.readByte(); + var1.readLong(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldt;B)V", + garbageValue = "-7" + ) + void vmethod2555(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); + var2.username = new Username(this.field1388); + var2.world = this.field1389; + var2.rank = this.field1390; + var1.addMember(var2); + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-618186627" + ) + static void method2431() { + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + } +} diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java new file mode 100644 index 0000000000..406408da53 --- /dev/null +++ b/runescape-client/src/main/java/class116.java @@ -0,0 +1,101 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("du") +public class class116 extends class119 { + @ObfuscatedName("hx") + @ObfuscatedGetter( + intValue = 413358465 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1705350263 + ) + int field1394; + @ObfuscatedName("t") + byte field1395; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 832856967 + ) + int field1391; + @ObfuscatedName("j") + String field1393; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + final class120 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldi;)V" + ) + class116(class120 var1) { + this.this$0 = var1; + this.field1394 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "1209873443" + ) + void vmethod2558(Buffer var1) { + var1.readUnsignedByte(); + this.field1394 = var1.readUnsignedShort(); + this.field1395 = var1.readByte(); + this.field1391 = var1.readUnsignedShort(); + var1.readLong(); + this.field1393 = var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldt;B)V", + garbageValue = "-7" + ) + void vmethod2555(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1394); + var2.rank = this.field1395; + var2.world = this.field1391; + var2.username = new Username(this.field1393); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)Lbd;", + garbageValue = "-2105993700" + ) + static Script method2440(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); + if (var2 != null) { + return var2; + } else { + String var3 = String.valueOf(var0); + int var4 = ApproximateRouteStrategy.archive12.getGroupId(var3); + if (var4 == -1) { + return null; + } else { + byte[] var5 = ApproximateRouteStrategy.archive12.takeFileFlat(var4); + if (var5 != null) { + if (var5.length <= 1) { + return null; + } + + var2 = ModelData0.newScript(var5); + if (var2 != null) { + Script.Script_cached.put(var2, (long)(var0 << 16)); + return var2; + } + } + + return null; + } + } + } +} diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java new file mode 100644 index 0000000000..3c3e3bfd5d --- /dev/null +++ b/runescape-client/src/main/java/class117.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("dv") +public class class117 extends class103 { + @ObfuscatedName("hv") + @ObfuscatedGetter( + intValue = -372121489 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -249649709 + ) + int field1401; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class117(class106 var1) { + this.this$0 = var1; + this.field1401 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1401 = var1.readUnsignedShort(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2366(this.field1401); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljava/lang/String;Ljava/lang/String;I)Lof;", + garbageValue = "1355330323" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite var5; + if (!class290.method5208(var0, var3, var4)) { + var5 = null; + } else { + IndexedSprite var7 = new IndexedSprite(); + var7.width = class398.SpriteBuffer_spriteWidth; + var7.height = class398.SpriteBuffer_spriteHeight; + var7.xOffset = class398.SpriteBuffer_xOffsets[0]; + var7.yOffset = class398.SpriteBuffer_yOffsets[0]; + var7.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[0]; + var7.subHeight = class374.SpriteBuffer_spriteHeights[0]; + var7.palette = class118.SpriteBuffer_spritePalette; + var7.pixels = class398.SpriteBuffer_pixels[0]; + class398.SpriteBuffer_xOffsets = null; + class398.SpriteBuffer_yOffsets = null; + ClanChannelMember.SpriteBuffer_spriteWidths = null; + class374.SpriteBuffer_spriteHeights = null; + class118.SpriteBuffer_spritePalette = null; + class398.SpriteBuffer_pixels = null; + var5 = var7; + } + + return var5; + } +} diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java new file mode 100644 index 0000000000..bef5e11b1c --- /dev/null +++ b/runescape-client/src/main/java/class118.java @@ -0,0 +1,189 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; +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("db") +public class class118 extends class103 { + @ObfuscatedName("f") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = 4952915824565352757L + ) + long field1403; + @ObfuscatedName("t") + String field1402; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1924588311 + ) + int field1404; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class118(class106 var1) { + this.this$0 = var1; + this.field1403 = -1L; + this.field1402 = null; + this.field1404 = 0; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1403 = var1.readLong(); + } + + this.field1402 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1404 = var1.readUnsignedShort(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2362(this.field1403, this.field1402, this.field1404); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "13273" + ) + public static int method2461(int var0) { + return class232.field2801[var0]; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lnv;IB)V", + garbageValue = "-118" + ) + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); + var2.size = var0.readUnsignedByte(); + var2.id = var0.readInt(); + var2.operations = new int[var2.size]; + var2.creationErrors = new int[var2.size]; + var2.fields = new Field[var2.size]; + var2.intReplaceValues = new int[var2.size]; + var2.methods = new Method[var2.size]; + var2.arguments = new byte[var2.size][][]; + + for (int var3 = 0; var3 < var2.size; ++var3) { + try { + int var4 = var0.readUnsignedByte(); + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = var0.readUnsignedByte(); + String[] var8 = new String[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); + byte[][] var10 = new byte[var7][]; + int var12; + if (var4 == 3) { + for (int var11 = 0; var11 < var7; ++var11) { + var12 = var0.readInt(); + var10[var11] = new byte[var12]; + var0.readBytes(var10[var11], 0, var12); + } + } + + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; + + for (var12 = 0; var12 < var7; ++var12) { + var21[var12] = Widget.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = Widget.loadClassFromDescriptor(var20); + if (Widget.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = Widget.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var14 = var13; + + for (int var15 = 0; var15 < var14.length; ++var15) { + Method var16 = var14[var15]; + if (Reflection.getMethodName(var16).equals(var6)) { + Class[] var17 = Reflection.getParameterTypes(var16); + if (var21.length == var17.length) { + boolean var18 = true; + + for (int var19 = 0; var19 < var21.length; ++var19) { + if (var21[var19] != var17[var19]) { + var18 = false; + break; + } + } + + if (var18 && var22 == var16.getReturnType()) { + var2.methods[var3] = var16; + } + } + } + } + + var2.arguments[var3] = var10; + } + } else { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = 0; + if (var4 == 1) { + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (Widget.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(Widget.loadClassFromDescriptor(var5), var6); + } + } catch (ClassNotFoundException var24) { + var2.creationErrors[var3] = -1; + } catch (SecurityException var25) { + var2.creationErrors[var3] = -2; + } catch (NullPointerException var26) { + var2.creationErrors[var3] = -3; + } catch (Exception var27) { + var2.creationErrors[var3] = -4; + } catch (Throwable var28) { + var2.creationErrors[var3] = -5; + } + } + + class41.reflectionChecks.addFirst(var2); + } +} diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java new file mode 100644 index 0000000000..06eb2598ff --- /dev/null +++ b/runescape-client/src/main/java/class119.java @@ -0,0 +1,350 @@ +import java.util.Arrays; +import java.util.Date; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("dh") +public abstract class class119 extends Node { + class119() { + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "1209873443" + ) + abstract void vmethod2558(Buffer var1); + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldt;B)V", + garbageValue = "-7" + ) + abstract void vmethod2555(ClanChannel var1); + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(II)Lga;", + garbageValue = "422805975" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; + } else { + var1 = class7.method59(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); + if (var1 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1372218131" + ) + static int method2472(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { + class1.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + MusicPatchNode.intToString(var9, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + long var13 = 86400000L * ((long)var10 + 11745L); + Interpreter.Interpreter_calendar.setTime(new Date(var13)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var17 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; + return 1; + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + class1.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Skeleton.method3972(WorldMapSection2.compareStrings(Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1], GrandExchangeOfferWorldComparator.clientLanguage)); + return 1; + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var11 = ClanChannel.archive13.takeFile(var5, 0); + var12 = new Font(var11); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var11 = ClanChannel.archive13.takeFile(var5, 0); + var12 = new Font(var11); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + class1.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4; + } + + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + (char)var9; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class303.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class267.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator9.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + StringBuilder var15 = new StringBuilder(var3.length()); + boolean var16 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var16 = true; + } else if (var7 == '>') { + var16 = false; + } else if (!var16) { + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var15.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + class1.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); + return 1; + } else if (var0 == 4122) { + var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else { + return 2; + } + } + } else { + class1.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; + if (MouseHandler.localPlayer.appearance != null && MouseHandler.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } + } + + @ObfuscatedName("fi") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-43" + ) + static void method2471() { + Client.mouseLastLastPressedTimeMillis = -1L; + class6.mouseRecorder.index = 0; + class255.hasFocus = true; + Client.hadFocus = true; + Client.field635 = -1L; + BufferedSource.method5986(); + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1211 = null; + Client.packetWriter.field1213 = null; + Client.packetWriter.field1212 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1209 = 0; + Client.rebootTimer = 0; + Client.logoutTimer = 0; + Client.hintArrowType = 0; + class115.method2431(); + MouseHandler.MouseHandler_idleCycles = 0; + GrandExchangeOffer.method5168(); + Client.isItemSelected = 0; + Client.isSpellSelected = false; + Client.soundEffectCount = 0; + Client.camAngleY = 0; + Client.oculusOrbState = 0; + class367.field4127 = null; + Client.minimapState = 0; + Client.field638 = -1; + Client.destinationX = 0; + Client.destinationY = 0; + Client.playerAttackOption = AttackOption.AttackOption_hidden; + Client.npcAttackOption = AttackOption.AttackOption_hidden; + Client.npcCount = 0; + Players.Players_count = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Players.field1167[var0] = null; + Players.field1170[var0] = 1; + } + + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; + Client.projectiles.clear(); + Client.graphicsObjects.clear(); + + for (var0 = 0; var0 < 4; ++var0) { + for (int var4 = 0; var4 < 104; ++var4) { + for (int var2 = 0; var2 < 104; ++var2) { + Client.groundItems[var0][var4][var2] = null; + } + } + } + + Client.pendingSpawns = new NodeDeque(); + Canvas.friendSystem.clear(); + + for (var0 = 0; var0 < GrandExchangeOfferAgeComparator.VarpDefinition_fileCount; ++var0) { + VarpDefinition var1 = FriendSystem.VarpDefinition_get(var0); + if (var1 != null) { + Varps.Varps_temp[var0] = 0; + Varps.Varps_main[var0] = 0; + } + } + + Decimator.varcs.clearTransient(); + Client.followerIndex = -1; + if (Client.rootInterface != -1) { + class4.method20(Client.rootInterface); + } + + for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { + class161.closeInterface(var3, true); + } + + Client.rootInterface = -1; + Client.interfaceParents = new NodeHashTable(8); + Client.meslayerContinueWidget = null; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + + for (var0 = 0; var0 < 8; ++var0) { + Client.playerMenuActions[var0] = null; + Client.playerOptionsPriorities[var0] = false; + } + + ItemContainer.itemContainers = new NodeHashTable(32); + Client.isLoading = true; + + for (var0 = 0; var0 < 100; ++var0) { + Client.field616[var0] = true; + } + + PacketBufferNode var5 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(MusicPatch.getWindowedMode()); + var5.packetBuffer.writeShort(MouseRecorder.canvasWidth); + var5.packetBuffer.writeShort(Client.canvasHeight); + Client.packetWriter.addNode(var5); + MouseRecorder.friendsChat = null; + class41.guestClanSettings = null; + Arrays.fill(Client.currentClanSettings, (Object)null); + FriendLoginUpdate.guestClanChannel = null; + Arrays.fill(Client.currentClanChannels, (Object)null); + + for (var0 = 0; var0 < 8; ++var0) { + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + ModeWhere.grandExchangeEvents = null; + } +} diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java deleted file mode 100644 index fe001f0d8e..0000000000 --- a/runescape-client/src/main/java/class12.java +++ /dev/null @@ -1,98 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("i") -public class class12 extends class16 { - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("gh") - @ObfuscatedGetter( - intValue = -1417181599 - ) - static int field111; - @ObfuscatedName("f") - String field112; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 667023111 - ) - int field109; - @ObfuscatedName("v") - byte field110; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ls;" - ) - final class19 this$0; - - @ObfuscatedSignature( - descriptor = "(Ls;)V" - ) - class12(class19 var1) { - this.this$0 = var1; - this.field112 = null; // L: 54 - } // L: 58 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "851460888" - ) - void vmethod331(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 61 - --var1.offset; // L: 62 - var1.readLong(); // L: 63 - } - - this.field112 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65 - this.field109 = var1.readUnsignedShort(); // L: 66 - this.field110 = var1.readByte(); // L: 67 - var1.readLong(); // L: 68 - } // L: 69 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ly;I)V", - garbageValue = "-1362614343" - ) - void vmethod332(ClanChannel var1) { - ClanChannelMember var2 = new ClanChannelMember(); // L: 72 - var2.name = this.field112; // L: 73 - var2.world = this.field109; // L: 74 - var2.rank = this.field110; // L: 75 - var1.addMember(var2); // L: 76 - } // L: 77 - - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "655976642" - ) - static void method209(int var0, int var1) { - int[] var2 = new int[9]; // L: 1727 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1728 - int var4 = var3 * 32 + 15 + 128; // L: 1729 - int var5 = NetSocket.method2676(var4); // L: 1730 - int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 1731 - int var8 = var1 - 334; // L: 1734 - if (var8 < 0) { // L: 1735 - var8 = 0; - } else if (var8 > 100) { // L: 1736 - var8 = 100; - } - - int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 1737 - int var7 = var9 * var5 / 256; // L: 1738 - var2[var3] = var7 * var6 >> 16; // L: 1741 - } - - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); // L: 1743 - } // L: 1744 -} diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java new file mode 100644 index 0000000000..fa5c818972 --- /dev/null +++ b/runescape-client/src/main/java/class120.java @@ -0,0 +1,112 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("di") +public class class120 { + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = 1039431283 + ) + public static int field1417; + @ObfuscatedName("du") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive0") + static Archive archive0; + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = -5578461861884698391L + ) + long field1418; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = 8528346205656473465L + ) + long field1412; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + IterableNodeDeque field1410; + + @ObfuscatedSignature( + descriptor = "(Lnv;)V" + ) + public class120(Buffer var1) { + this.field1412 = -1L; + this.field1410 = new IterableNodeDeque(); + this.method2483(var1); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "1" + ) + void method2483(Buffer var1) { + this.field1418 = var1.readLong(); + this.field1412 = var1.readLong(); + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 1) { + var3 = new class115(this); + } else if (var2 == 4) { + var3 = new class126(this); + } else if (var2 == 3) { + var3 = new class111(this); + } else if (var2 == 2) { + var3 = new class109(this); + } else { + if (var2 != 5) { + throw new RuntimeException(""); + } + + var3 = new class116(this); + } + + ((class119)var3).vmethod2558(var1); + this.field1410.addFirst((Node)var3); + } + + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldt;I)V", + garbageValue = "1046798651" + ) + public void method2475(ClanChannel var1) { + if (var1.key == this.field1418 && var1.field1433 == this.field1412) { + for (class119 var2 = (class119)this.field1410.last(); var2 != null; var2 = (class119)this.field1410.previous()) { + var2.vmethod2555(var1); + } + + ++var1.field1433; + } else { + throw new RuntimeException(""); + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V", + garbageValue = "2" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + TaskHandler.addChatMessage(var0, var1, var2, (String)null); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1217280037" + ) + public static boolean method2484(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field38[var0] : false; + } +} diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java new file mode 100644 index 0000000000..ef4f5c619b --- /dev/null +++ b/runescape-client/src/main/java/class121.java @@ -0,0 +1,893 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ds") +public class class121 extends class103 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 725724105 + ) + int field1421; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1189710327 + ) + int field1420; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class121(class106 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1421 = var1.readInt(); + this.field1420 = var1.readInt(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2371(this.field1421, this.field1420); + } + + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-337711179" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + Decimator.clientPreferences.roofsHidden = !Decimator.clientPreferences.roofsHidden; + MilliClock.savePreferences(); + if (Decimator.clientPreferences.roofsHidden) { + class120.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + class120.addGameMessage(99, "", "Roofs will only be removed selectively"); + } + } + + if (var0.equalsIgnoreCase("displayfps")) { + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { + PcmPlayer.worldMap.showCoord = !PcmPlayer.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { + WorldMapSection0.method3580(); + } + } + + PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(var0.length() + 1); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1536626137" + ) + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { + if (var2 >= 2000) { + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2617, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6693(KeyHandler.selectedItemSlot); + var8.packetBuffer.method6703(Tiles.selectedItemWidget); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(class103.selectedItemId); + var8.packetBuffer.writeShort(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6786(NPC.baseY + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 2) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6693(var3); + var8.packetBuffer.method6786(NPC.baseY + var1); + var8.packetBuffer.writeInt(PcmPlayer.selectedSpellWidget); + var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6786(Client.field564); + var8.packetBuffer.method6786(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var8); + } else if (var2 == 3) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6693(NPC.baseY + var1); + var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 4) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2638, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6692(NPC.baseY + var1); + var8.packetBuffer.method6692(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 5) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2591, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6692(NPC.baseY + var1); + var8.packetBuffer.method6693(var3); + var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 6) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(NPC.baseY + var1); + var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6692(var3); + var8.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6786(class103.selectedItemId); + var9.packetBuffer.method6701(Tiles.selectedItemWidget); + var9.packetBuffer.method6692(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(KeyHandler.selectedItemSlot); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(Client.field564); + var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var9.packetBuffer.method6703(PcmPlayer.selectedSpellWidget); + var9.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6786(var3); + var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2574, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2609, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6693(var3); + var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6692(var3); + Client.packetWriter.addNode(var9); + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6693(var3); + var9.packetBuffer.writeShort(class103.selectedItemId); + var9.packetBuffer.method6703(Tiles.selectedItemWidget); + var9.packetBuffer.method6786(KeyHandler.selectedItemSlot); + var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 15) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6786(Client.field564); + var9.packetBuffer.method6703(PcmPlayer.selectedSpellWidget); + var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6786(Client.selectedSpellChildIndex); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6786(NPC.baseY + var1); + var8.packetBuffer.method6786(KeyHandler.selectedItemSlot); + var8.packetBuffer.method6701(Tiles.selectedItemWidget); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6692(var3); + var8.packetBuffer.method6786(class103.selectedItemId); + var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); + Client.packetWriter.addNode(var8); + } else if (var2 == 17) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2565, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(PcmPlayer.selectedSpellWidget); + var8.packetBuffer.method6692(var3); + var8.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6692(Client.selectedSpellChildIndex); + var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6693(NPC.baseY + var1); + var8.packetBuffer.method6693(Client.field564); + Client.packetWriter.addNode(var8); + } else if (var2 == 18) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2594, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6692(var3); + var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6692(NPC.baseY + var1); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 19) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6786(NPC.baseY + var1); + var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6786(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 20) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6693(NPC.baseY + var1); + var8.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 21) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2584, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(var3); + var8.packetBuffer.method6692(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6786(NPC.baseY + var1); + var8.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 22) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); + var8.packetBuffer.method6786(NPC.baseY + var1); + var8.packetBuffer.method6693(var3); + var8.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + WorldMapIcon_1.scene.setViewportWalking(); + } else { + WorldMapIcon_1.scene.menuOpen(GrandExchangeEvent.Client_plane, var0, var1, true); + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = UrlRequester.getWidget(var1); + boolean var12 = true; + if (var16.contentType > 0) { + var12 = class376.method6560(var16); + } + + if (var12) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var10); + } + } else { + if (var2 == 25) { + var16 = ObjectSound.getWidgetChild(var1, var0); + if (var16 != null) { + WorldMapIcon_1.Widget_runOnTargetLeave(); + ApproximateRouteStrategy.selectSpell(var1, var0, class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = PcmPlayer.Widget_getSpellActionName(var16); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { + Client.selectedSpellName = var16.dataText + ScriptFrame.colorStartTag(16777215); + } else { + Client.selectedSpellName = ScriptFrame.colorStartTag(65280) + var16.spellName + ScriptFrame.colorStartTag(16777215); + } + } + + return; + } + + if (var2 == 26) { + PcmPlayer.method506(); + } else { + int var11; + Widget var14; + if (var2 == 28) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = UrlRequester.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var11 = var14.cs1Instructions[0][1]; + Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; + ApproximateRouteStrategy.changeGameOptions(var11); + } + } else if (var2 == 29) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = UrlRequester.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var11 = var14.cs1Instructions[0][1]; + if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { + Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; + ApproximateRouteStrategy.changeGameOptions(var11); + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { + Tile.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = ObjectSound.getWidgetChild(var1, var0); + AttackOption.invalidateWidget(Client.meslayerContinueWidget); + } + } else if (var2 == 31) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2628, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6703(Tiles.selectedItemWidget); + var8.packetBuffer.writeShort(class103.selectedItemId); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method6692(var3); + var8.packetBuffer.method6692(var0); + var8.packetBuffer.method6692(KeyHandler.selectedItemSlot); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 32) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6786(var3); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method6692(var0); + var8.packetBuffer.method6703(PcmPlayer.selectedSpellWidget); + var8.packetBuffer.method6693(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 33) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2562, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method6693(var0); + var8.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 34) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method6786(var3); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 35) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2581, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(var3); + var8.packetBuffer.method6701(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 36) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.method6786(var3); + var8.packetBuffer.method6701(var1); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 37) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6701(var1); + var8.packetBuffer.method6786(var3); + var8.packetBuffer.method6692(var0); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else { + if (var2 == 38) { + WorldMapIcon_1.Widget_runOnTargetLeave(); + var16 = UrlRequester.getWidget(var1); + Client.isItemSelected = 1; + KeyHandler.selectedItemSlot = var0; + Tiles.selectedItemWidget = var1; + class103.selectedItemId = var3; + AttackOption.invalidateWidget(var16); + Client.selectedItemName = ScriptFrame.colorStartTag(16748608) + KeyHandler.ItemDefinition_get(var3).name + ScriptFrame.colorStartTag(16777215); + if (Client.selectedItemName == null) { + Client.selectedItemName = "null"; + } + + return; + } + + if (var2 == 39) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2572, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method6692(var0); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 40) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6701(var1); + var8.packetBuffer.method6692(var0); + var8.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 41) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2635, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method6692(var3); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 42) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2566, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(var3); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.method6701(var1); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 43) { + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6701(var1); + var8.packetBuffer.method6692(var3); + var8.packetBuffer.method6786(var0); + Client.packetWriter.addNode(var8); + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + } else if (var2 == 44) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6786(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 45) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 46) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6786(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 47) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6693(var3); + var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 48) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6786(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 49) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 50) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 51) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else { + label634: { + if (var2 != 57) { + if (var2 == 58) { + var16 = ObjectSound.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6692(var16.itemId); + var9.packetBuffer.method6701(var1); + var9.packetBuffer.writeShort(var0); + var9.packetBuffer.method6693(Client.field564); + var9.packetBuffer.method6701(PcmPlayer.selectedSpellWidget); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var9); + } + break label634; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2611, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method6693(NPC.baseY + var1); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); + Client.packetWriter.addNode(var8); + break label634; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var8); + break label634; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var13 = Client.npcs[var3]; + if (var13 != null) { + NPCComposition var17 = var13.definition; + if (var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 != null) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); + var10.packetBuffer.method6692(var17.id); + Client.packetWriter.addNode(var10); + } + } + break label634; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2586, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var8); + break label634; + } + + if (var2 == 1005) { + var16 = UrlRequester.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { + class120.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + KeyHandler.ItemDefinition_get(var3).name); + } else { + var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2586, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6693(var3); + Client.packetWriter.addNode(var9); + } + + Client.field512 = 0; + Canvas.field77 = UrlRequester.getWidget(var1); + Client.field513 = var0; + break label634; + } + + if (var2 != 1007) { + if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { + PcmPlayer.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + break label634; + } + } + + var16 = ObjectSound.getWidgetChild(var1, var0); + if (var16 != null) { + class183.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); + } + } + } + } + } + } + } + } + } + + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + AttackOption.invalidateWidget(UrlRequester.getWidget(Tiles.selectedItemWidget)); + } + + if (Client.isSpellSelected) { + WorldMapIcon_1.Widget_runOnTargetLeave(); + } + + if (Canvas.field77 != null && Client.field512 == 0) { + AttackOption.invalidateWidget(Canvas.field77); + } + + } +} diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java new file mode 100644 index 0000000000..6f2b84dfac --- /dev/null +++ b/runescape-client/src/main/java/class122.java @@ -0,0 +1,182 @@ +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("dq") +public class class122 extends class103 { + @ObfuscatedName("en") + @ObfuscatedGetter( + intValue = -1989302825 + ) + static int field1425; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 780925071 + ) + int field1428; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class122(class106 var1) { + this.this$0 = var1; + this.field1428 = -1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1428 = var1.readUnsignedShort(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2368(this.field1428); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "176327609" + ) + static int method2507(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + Interpreter.Interpreter_intStackSize -= 3; + class127.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + class41.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + Interpreter.Interpreter_intStackSize -= 2; + UrlRequest.method2136(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + return 1; + } else { + int var3; + int var4; + if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { + if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { + return 2; + } else { + var3 = 0; + var4 = 0; + if (var0 == 3210) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + } else if (var0 == 3182) { + var3 = 6; + } else if (var0 == 3204) { + var3 = 7; + } else if (var0 == 3206) { + var3 = 8; + } else if (var0 == 3208) { + var3 = 9; + } + + if (var3 == 6) { + float var5 = 200.0F * ((float)Decimator.clientPreferences.field1117 - 0.5F); + var4 = 100 - Math.round(var5); + } else if (var3 == 7) { + var4 = Math.round((float)Decimator.clientPreferences.musicVolume / 2.55F); + } else if (var3 == 8) { + var4 = Math.round((float)Decimator.clientPreferences.soundEffectsVolume / 1.27F); + } else if (var3 == 9) { + var4 = Math.round((float)Decimator.clientPreferences.areaSoundEffectsVolume / 1.27F); + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + return 1; + } + } else { + var3 = 0; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var0 == 3209) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + } else if (var0 == 3181) { + var3 = 6; + } else if (var0 == 3203) { + var3 = 7; + } else if (var0 == 3205) { + var3 = 8; + } else if (var0 == 3207) { + var3 = 9; + } + + if (var3 == 6) { + var4 = 100 - Math.min(Math.max(var4, 0), 100); + BuddyRankComparator.method2200((double)(0.5F + (float)var4 / 200.0F)); + } else if (var3 == 7) { + var4 = Math.min(Math.max(var4, 0), 100); + TaskHandler.method2582(Math.round((float)var4 * 2.55F)); + } else if (var3 == 8) { + var4 = Math.min(Math.max(var4, 0), 100); + class98.updateSoundEffectVolume(Math.round(1.27F * (float)var4)); + } else if (var3 == 9) { + var4 = Math.min(Math.max(var4, 0), 100); + class16.method175(Math.round(1.27F * (float)var4)); + } + + return 1; + } + } + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "-17" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; + } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; + return var8 * (128 - var7) + var7 * var9 >> 7; + } else { + return 0; + } + } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(Lio;I)Lio;", + garbageValue = "906479328" + ) + static Widget method2505(Widget var0) { + int var1 = class6.method43(MusicPatchNode.getWidgetFlags(var0)); + if (var1 == 0) { + return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { + var0 = UrlRequester.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; + } + } +} diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index 50098f365d..4893b13c4a 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -1,5 +1,296 @@ +import java.io.IOException; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") -public interface class124 { +@ObfuscatedName("dp") +public class class124 { + @ObfuscatedName("pp") + @ObfuscatedSignature( + descriptor = "Loo;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Llp;ZI)V", + garbageValue = "-50568438" + ) + public static void method2538(AbstractSocket var0, boolean var1) { + if (NetCache.NetCache_socket != null) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var8) { + } + + NetCache.NetCache_socket = null; + } + + NetCache.NetCache_socket = var0; + Buffer var2; + if (NetCache.NetCache_socket != null) { + try { + var2 = new Buffer(4); + var2.writeByte(var1 ? 2 : 3); + var2.writeMedium(0); + NetCache.NetCache_socket.write(var2.array, 0, 4); + } catch (IOException var7) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var6) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + NetCache.NetCache_responseHeaderBuffer.offset = 0; + NetCache.NetCache_currentResponse = null; + UserComparator9.NetCache_responseArchiveBuffer = null; + NetCache.field3608 = 0; + + while (true) { + NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); + if (var9 == null) { + while (true) { + var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); + if (var9 == null) { + if (NetCache.field3612 != 0) { + try { + var2 = new Buffer(4); + var2.writeByte(4); + var2.writeByte(NetCache.field3612); + var2.writeShort(0); + NetCache.NetCache_socket.write(var2.array, 0, 4); + } catch (IOException var5) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var4) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + NetCache.NetCache_loadTime = 0; + NetCache.field3596 = UrlRequester.method2125(); + return; + } + + NetCache.NetCache_pendingWritesQueue.addLast(var9); + NetCache.NetCache_pendingWrites.put(var9, var9.key); + ++NetCache.NetCache_pendingWritesCount; + --NetCache.NetCache_pendingResponsesCount; + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); + ++NetCache.NetCache_pendingPriorityWritesCount; + --NetCache.NetCache_pendingPriorityResponsesCount; + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1004936278" + ) + public static int method2535(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "1690322396" + ) + public static int method2534(int var0, int var1, int var2) { + int var3 = class118.method2461(var2 - var1 + 1); + var3 <<= var1; + return var0 & ~var3; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIIIZI)Lom;", + garbageValue = "1735012652" + ) + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; + } + + long var6 = ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16) + ((long)var3 << 42); + SpritePixels var8; + if (!var5) { + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } + + ItemComposition var9 = KeyHandler.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; + + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { + var9 = KeyHandler.ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); + if (var19 == null) { + return null; + } else { + SpritePixels var20 = null; + if (var9.noteTemplate != -1) { + var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var20 == null) { + return null; + } + } else if (var9.notedId != -1) { + var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var20 == null) { + return null; + } + } else if (var9.placeholderTemplate != -1) { + var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var20 == null) { + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + var8 = new SpritePixels(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method3895(16, 16); + Rasterizer3D.field2249 = false; + if (var9.placeholderTemplate != -1) { + var20.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; + if (var5) { + var16 = (int)(1.5D * (double)var16); + } else if (var2 == 2) { + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var19.calculateBoundsCylinder(); + var19.method4260(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + if (var9.notedId != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + if (var9.noteTemplate != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + ArchiveLoader.ItemDefinition_fontPlain11.draw(class249.method4824(var1), 0, 9, 16776960, 1); + } + + if (!var5) { + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field2249 = true; + return var8; + } + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(Lio;IIIIIII)V", + garbageValue = "752569677" + ) + static final void method2536(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field454) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; + } + + Client.field454 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + AttackOption.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + AttackOption.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + AttackOption.invalidateWidget(var0); + Client.field454 = true; + } + } + + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + AttackOption.invalidateWidget(var0); + } + } + + } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "93" + ) + static final void method2539() { + Client.field609 = Client.cycleCntr; + } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index daa23fc3e6..948b7d7ada 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -1,166 +1,430 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dw") -public class class125 implements class124 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljp;" +@ObfuscatedName("dg") +public class class125 extends class103 { + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = 3441919683600058763L ) - @Export("KitDefinition_archive") - public static AbstractArchive KitDefinition_archive; + long field1445; + @ObfuscatedName("t") + String field1446; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "-29327102" + descriptor = "(Ldn;)V" ) - @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) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { // L: 21 - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { // L: 29 - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - 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; + class125(class106 var1) { + this.this$0 = var1; + this.field1445 = -1L; + this.field1446 = null; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1445 = var1.readLong(); + } + + this.field1446 = var1.readStringCp1252NullTerminatedOrNull(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2365(this.field1445, this.field1446); + } + + @ObfuscatedName("s") + public static final int method2543(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (0.0D != var2) { + double var12; + if (var4 < 0.5D) { + var12 = (var2 + 1.0D) * var4; + } else { + var12 = var2 + var4 - var2 * var4; + } + + double var14 = var4 * 2.0D - var12; + double var16 = var0 + 0.3333333333333333D; + if (var16 > 1.0D) { + --var16; + } + + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (var16 * 6.0D < 1.0D) { + var6 = var14 + var16 * 6.0D * (var12 - var14); + } else if (var16 * 2.0D < 1.0D) { + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { + var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; + } else { + var6 = var14; + } + + if (var0 * 6.0D < 1.0D) { + var8 = 6.0D * (var12 - var14) * var0 + var14; + } else if (var0 * 2.0D < 1.0D) { + var8 = var12; + } else if (3.0D * var0 < 2.0D) { + var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; + } else { + var8 = var14; + } + + if (6.0D * var20 < 1.0D) { + var10 = var14 + var20 * 6.0D * (var12 - var14); + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (3.0D * var20 < 2.0D) { + var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; + } else { + var10 = var14; + } + } + + int var22 = (int)(256.0D * var6); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IB)I", + garbageValue = "2" + ) + public static int method2540(CharSequence var0, int var1) { + return ScriptFrame.method852(var0, var1, true); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lnv;IIIIIII)V", + garbageValue = "-56264699" + ) + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; + + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + if (var1 == 0) { + int[] var14 = Tiles.Tiles_heights[0][var2]; + int var11 = var2 + var4 + 932731; + int var12 = var3 + var5 + 556238; + int var13 = ServerPacket.method4428(var11 + 45365, var12 + 91923, 4) - 128 + (ServerPacket.method4428(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (ServerPacket.method4428(var11, var12, 1) - 128 >> 2); + var13 = (int)((double)var13 * 0.3D) + 35; + if (var13 < 10) { + var13 = 10; + } else if (var13 > 60) { + var13 = 60; + } + + var14[var3] = -var13 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + } + break; + } + + if (var7 == 1) { + int var8 = var0.readUnsignedByte(); + if (var8 == 1) { + var8 = 0; + } + + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; + } + break; + } + + if (var7 <= 49) { + ChatChannel.field894[var1][var2][var3] = var0.readByte(); + Tiles.field915[var1][var2][var3] = (byte)((var7 - 2) / 4); + Tiles.field909[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + class339.field3936[var1][var2][var3] = (byte)(var7 - 81); + } + } } else { - var1 = 63; // L: 40 + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + break; + } + + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } + + if (var7 <= 49) { + var0.readUnsignedByte(); + } + } } - return var1; // L: 41 } - @ObfuscatedName("f") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "([BI)Loa;", - garbageValue = "-996987451" + descriptor = "(ILbd;ZS)I", + garbageValue = "-8604" ) - @Export("convertJpgToSprite") - public static final SpritePixels convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; + static int method2550(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + Interpreter.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + class124.privateChatMode = FloorOverlayDefinition.method3134(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + if (class124.privateChatMode == null) { + class124.privateChatMode = PrivateChatMode.field4298; + } - 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 + Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + PacketBufferNode var13 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(Client.publicChatMode); + var13.packetBuffer.writeByte(class124.privateChatMode.field4300); + var13.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var13); + return 1; + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var6 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2600, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var8) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var8); + var6.packetBuffer.writeByte(var7 - 1); + var6.packetBuffer.writeByte(var9); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = class1.Messages_getByChannelAndID(var3, var7); + if (var5 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = TaskHandler.Messages_getMessage(var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (class124.privateChatMode == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class124.privateChatMode.field4300; + } + + return 1; + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = class103.method2258(var7, var8, GrandExchangeOfferWorldComparator.clientLanguage, -1); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + class1.Interpreter_stringStackSize -= 2; + var8 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; + String var11 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; + var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2623, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(0); + int var10 = var12.packetBuffer.offset; + var12.packetBuffer.writeStringCp1252NullTerminated(var8); + SpriteMask.method4690(var12.packetBuffer, var11); + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { + var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var6 = class103.method2258(var7, var8, GrandExchangeOfferWorldComparator.clientLanguage, var9); + Client.packetWriter.addNode(var6); + return 1; + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class41.Messages_getHistorySize(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PlayerComposition.Messages_getLastChatID(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpriteMask.method4691(var3); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + class121.doCheat(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field629 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = Client.field629; + return 1; + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { + var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + System.out.println(var8); + return 1; + } else if (var0 == 5024) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 5025) { + ++Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 5030) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = class1.Messages_getByChannelAndID(var3, var7); + if (var5 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 5031) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = TaskHandler.Messages_getMessage(var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + if (MouseHandler.localPlayer != null && MouseHandler.localPlayer.username != null) { + var8 = MouseHandler.localPlayer.username.getName(); + } else { + var8 = ""; + } + + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8; + return 1; + } + } + } + } } - - return new SpritePixels(0, 0); // L: 32 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "-494495560" - ) - public static void method2587(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; // L: 18 - SoundSystem.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 - } // L: 20 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "127" - ) - public static int method2586(CharSequence var0) { - int var1 = var0.length(); // L: 151 - int var2 = 0; // L: 152 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 153 - var2 = (var2 << 5) - var2 + var0.charAt(var3); - } - - return var2; // L: 154 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1592870252" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 865 - var1 /= 2; - } - - if (var2 > 192) { // L: 866 - var1 /= 2; - } - - if (var2 > 217) { // L: 867 - var1 /= 2; - } - - if (var2 > 243) { // L: 868 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 869 - return var3; // L: 870 } } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index 452985cefb..2896a00dff 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -1,306 +1,68 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; 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("dv") -public enum class126 implements Enumerated -{ - @ObfuscatedName("f") +@ObfuscatedName("dy") +public class class126 extends class119 { + @ObfuscatedName("ct") + public static char field1449; + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "Ljs;" ) - field1478(3, 0), - @ObfuscatedName("e") + @Export("archive9") + static Archive archive9; + @ObfuscatedName("hp") @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "[Lom;" ) - field1472(1, 1), + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + @ObfuscatedName("s") + String field1452; + @ObfuscatedName("t") + byte field1454; @ObfuscatedName("v") + byte field1450; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "Ldi;" ) - field1475(0, 2), - @ObfuscatedName("y") + final class120 this$0; + @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "(Ldi;)V" ) - field1471(2, 3); - - @ObfuscatedName("h") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = -137966849 - ) - static int field1477; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1230952189 - ) - public final int field1476; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1895212337 - ) - @Export("id") - final int id; - - class126(int var3, int var4) { - this.field1476 = var3; // L: 16 - this.id = var4; // L: 17 - } // L: 18 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; + class126(class120 var1) { + this.this$0 = var1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IILfv;Lfl;I)Z", - garbageValue = "773199709" + descriptor = "(Lnv;I)V", + garbageValue = "1209873443" ) - public static final boolean method2595(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 - class160.directions[var6][var7] = 99; // L: 25 - class160.distances[var6][var7] = 0; // L: 26 - byte var10 = 0; // L: 27 - int var11 = 0; // L: 28 - class160.bufferX[var10] = var0; // L: 29 - byte var10001 = var10; - int var18 = var10 + 1; - class160.bufferY[var10001] = var1; // L: 30 - int[][] var12 = var3.flags; // L: 31 - - while (var11 != var18) { // L: 34 - var4 = class160.bufferX[var11]; // L: 35 - var5 = class160.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 - Login.field1033 = var4; // L: 43 - GrandExchangeOfferOwnWorldComparator.field608 = var5; // L: 44 - return true; // L: 45 - } - - int var15 = class160.distances[var16][var17] + 1; // L: 47 - if (var16 > 0 && class160.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48 - class160.bufferX[var18] = var4 - 1; // L: 49 - class160.bufferY[var18] = var5; // L: 50 - var18 = var18 + 1 & 4095; // L: 51 - class160.directions[var16 - 1][var17] = 2; // L: 52 - class160.distances[var16 - 1][var17] = var15; // L: 53 - } - - if (var16 < 127 && class160.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55 - class160.bufferX[var18] = var4 + 1; // L: 56 - class160.bufferY[var18] = var5; // L: 57 - var18 = var18 + 1 & 4095; // L: 58 - class160.directions[var16 + 1][var17] = 8; // L: 59 - class160.distances[var16 + 1][var17] = var15; // L: 60 - } - - if (var17 > 0 && class160.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62 - class160.bufferX[var18] = var4; - class160.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class160.directions[var16][var17 - 1] = 1; - class160.distances[var16][var17 - 1] = var15; - } - - if (var17 < 127 && class160.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class160.bufferX[var18] = var4; // L: 70 - class160.bufferY[var18] = var5 + 1; // L: 71 - var18 = var18 + 1 & 4095; // L: 72 - class160.directions[var16][var17 + 1] = 4; // L: 73 - class160.distances[var16][var17 + 1] = var15; // L: 74 - } - - if (var16 > 0 && var17 > 0 && class160.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 - class160.bufferX[var18] = var4 - 1; // L: 77 - class160.bufferY[var18] = var5 - 1; // L: 78 - var18 = var18 + 1 & 4095; // L: 79 - class160.directions[var16 - 1][var17 - 1] = 3; // L: 80 - class160.distances[var16 - 1][var17 - 1] = var15; // L: 81 - } - - if (var16 < 127 && var17 > 0 && class160.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 - class160.bufferX[var18] = var4 + 1; // L: 84 - class160.bufferY[var18] = var5 - 1; // L: 85 - var18 = var18 + 1 & 4095; // L: 86 - class160.directions[var16 + 1][var17 - 1] = 9; // L: 87 - class160.distances[var16 + 1][var17 - 1] = var15; // L: 88 - } - - if (var16 > 0 && var17 < 127 && class160.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 - class160.bufferX[var18] = var4 - 1; // L: 91 - class160.bufferY[var18] = var5 + 1; // L: 92 - var18 = var18 + 1 & 4095; // L: 93 - class160.directions[var16 - 1][var17 + 1] = 6; // L: 94 - class160.distances[var16 - 1][var17 + 1] = var15; // L: 95 - } - - if (var16 < 127 && var17 < 127 && class160.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 - class160.bufferX[var18] = var4 + 1; // L: 98 - class160.bufferY[var18] = var5 + 1; // L: 99 - var18 = var18 + 1 & 4095; // L: 100 - class160.directions[var16 + 1][var17 + 1] = 12; // L: 101 - class160.distances[var16 + 1][var17 + 1] = var15; // L: 102 - } + void vmethod2558(Buffer var1) { + this.field1452 = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field1452 != null) { + var1.readUnsignedByte(); + this.field1454 = var1.readByte(); + this.field1450 = var1.readByte(); } - Login.field1033 = var4; // L: 105 - GrandExchangeOfferOwnWorldComparator.field608 = var5; // L: 106 - return false; // L: 107 } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "985430780" + descriptor = "(Ldt;B)V", + garbageValue = "-7" ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); // L: 133 - var2.size = var0.readUnsignedByte(); // L: 134 - var2.id = var0.readInt(); // L: 135 - var2.operations = new int[var2.size]; // L: 136 - var2.creationErrors = new int[var2.size]; // L: 137 - var2.fields = new Field[var2.size]; // L: 138 - var2.intReplaceValues = new int[var2.size]; // L: 139 - var2.methods = new Method[var2.size]; // L: 140 - var2.arguments = new byte[var2.size][][]; // L: 141 - - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 - try { - int var4 = var0.readUnsignedByte(); // L: 144 - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 - if (var4 == 3 || var4 == 4) { // L: 155 - var5 = var0.readStringCp1252NullTerminated(); // L: 156 - var6 = var0.readStringCp1252NullTerminated(); // L: 157 - var7 = var0.readUnsignedByte(); // L: 158 - String[] var8 = new String[var7]; // L: 159 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 160 - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); // L: 161 - byte[][] var10 = new byte[var7][]; // L: 162 - int var12; - if (var4 == 3) { // L: 163 - for (int var11 = 0; var11 < var7; ++var11) { // L: 164 - var12 = var0.readInt(); // L: 165 - var10[var11] = new byte[var12]; // L: 166 - var0.readBytes(var10[var11], 0, var12); // L: 167 - } - } - - var2.operations[var3] = var4; // L: 170 - Class[] var21 = new Class[var7]; // L: 171 - - for (var12 = 0; var12 < var7; ++var12) { // L: 172 - var21[var12] = FontName.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = FontName.loadClassFromDescriptor(var20); // L: 173 - if (FontName.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 - throw new SecurityException(); - } - - Method[] var13 = FontName.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 (var21.length == var17.length) { // L: 183 - boolean var18 = true; // L: 184 - - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185 - if (var17[var19] != var21[var19]) { // L: 186 - var18 = false; // L: 187 - break; // L: 188 - } - } - - if (var18 && var22 == var16.getReturnType()) { // L: 191 - var2.methods[var3] = var16; // L: 192 - } - } - } - } - - var2.arguments[var3] = var10; // L: 199 - } - } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 146 - var6 = var0.readStringCp1252NullTerminated(); // L: 147 - var7 = 0; // L: 148 - if (var4 == 1) { // L: 149 - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; // L: 150 - var2.intReplaceValues[var3] = var7; // L: 151 - if (FontName.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(FontName.loadClassFromDescriptor(var5), var6); // L: 153 - } - } catch (ClassNotFoundException var24) { // L: 202 - var2.creationErrors[var3] = -1; // L: 203 - } catch (SecurityException var25) { // L: 205 - var2.creationErrors[var3] = -2; // L: 206 - } catch (NullPointerException var26) { // L: 208 - var2.creationErrors[var3] = -3; // L: 209 - } catch (Exception var27) { // L: 211 - var2.creationErrors[var3] = -4; // L: 212 - } catch (Throwable var28) { // L: 214 - var2.creationErrors[var3] = -5; // L: 215 - } + void vmethod2555(ClanChannel var1) { + var1.name = this.field1452; + if (this.field1452 != null) { + var1.field1430 = this.field1454; + var1.field1436 = this.field1450; } - class69.reflectionChecks.addFirst(var2); // L: 218 - } // L: 219 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-47" - ) - @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/class127.java b/runescape-client/src/main/java/class127.java new file mode 100644 index 0000000000..a5cc60a88c --- /dev/null +++ b/runescape-client/src/main/java/class127.java @@ -0,0 +1,164 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dl") +public class class127 extends class103 { + @ObfuscatedName("f") + @Export("ByteArrayPool_altSizeArrayCounts") + public static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1174076049 + ) + int field1458; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = -8036860125565611309L + ) + long field1455; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldn;" + ) + final class106 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldn;)V" + ) + class127(class106 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "0" + ) + void vmethod2562(Buffer var1) { + this.field1458 = var1.readInt(); + this.field1455 = var1.readLong(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ldj;I)V", + garbageValue = "1598392944" + ) + void vmethod2567(ClanSettings var1) { + var1.method2400(this.field1458, this.field1455); + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lgl;IIIB)Z", + garbageValue = "-1" + ) + static final boolean method2569(Model var0, int var1, int var2, int var3) { + if (!class183.method3659()) { + return false; + } else { + int var4; + int var5; + int var6; + int var7; + int var10; + int var11; + int var12; + int var15; + int var16; + if (!ViewportMouse.ViewportMouse_false0) { + var4 = Scene.Scene_cameraPitchSine; + var5 = Scene.Scene_cameraPitchCosine; + var6 = Scene.Scene_cameraYawSine; + var7 = Scene.Scene_cameraYawCosine; + byte var8 = 50; + short var9 = 3500; + var10 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var8 / Rasterizer3D.Rasterizer3D_zoom; + var11 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var8 / Rasterizer3D.Rasterizer3D_zoom; + var12 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; + int var13 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; + int var14 = Rasterizer3D.method3930(var11, var8, var5, var4); + var15 = Rasterizer3D.method3915(var11, var8, var5, var4); + var11 = var14; + var14 = Rasterizer3D.method3930(var13, var9, var5, var4); + var16 = Rasterizer3D.method3915(var13, var9, var5, var4); + var13 = var14; + var14 = Rasterizer3D.method3942(var10, var15, var7, var6); + var15 = Rasterizer3D.method3913(var10, var15, var7, var6); + var10 = var14; + var14 = Rasterizer3D.method3942(var12, var16, var7, var6); + var16 = Rasterizer3D.method3913(var12, var16, var7, var6); + ViewportMouse.field2477 = (var10 + var14) / 2; + ViewportMouse.field2478 = (var11 + var13) / 2; + GrandExchangeOfferNameComparator.field3628 = (var15 + var16) / 2; + ViewportMouse.field2479 = (var14 - var10) / 2; + ViewportMouse.field2480 = (var13 - var11) / 2; + ViewportMouse.field2481 = (var16 - var15) / 2; + ScriptFrame.field372 = Math.abs(ViewportMouse.field2479); + FillMode.field4259 = Math.abs(ViewportMouse.field2480); + ViewportMouse.field2482 = Math.abs(ViewportMouse.field2481); + } + + var4 = var0.xMid + var1; + var5 = var2 + var0.yMid; + var6 = var3 + var0.zMid; + var7 = var0.xMidOffset; + var15 = var0.yMidOffset; + var16 = var0.zMidOffset; + var10 = ViewportMouse.field2477 - var4; + var11 = ViewportMouse.field2478 - var5; + var12 = GrandExchangeOfferNameComparator.field3628 - var6; + if (Math.abs(var10) > var7 + ScriptFrame.field372) { + return false; + } else if (Math.abs(var11) > var15 + FillMode.field4259) { + return false; + } else if (Math.abs(var12) > var16 + ViewportMouse.field2482) { + return false; + } else if (Math.abs(var12 * ViewportMouse.field2480 - var11 * ViewportMouse.field2481) > var16 * FillMode.field4259 + var15 * ViewportMouse.field2482) { + return false; + } else if (Math.abs(var10 * ViewportMouse.field2481 - var12 * ViewportMouse.field2479) > var16 * ScriptFrame.field372 + var7 * ViewportMouse.field2482) { + return false; + } else { + return Math.abs(var11 * ViewportMouse.field2479 - var10 * ViewportMouse.field2480) <= var7 * FillMode.field4259 + var15 * ScriptFrame.field372; + } + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-1521180157" + ) + static final boolean method2561(int var0, int var1) { + ObjectComposition var2 = ClanChannel.getObjectDefinition(var0); + if (var1 == 11) { + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; + } + + return var2.method2993(var1); + } + + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-752653495" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (Decimator.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var0; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = 0; + ++Client.soundEffectCount; + } + + } +} diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java deleted file mode 100644 index d8d44cbb0e..0000000000 --- a/runescape-client/src/main/java/class13.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("k") -public class class13 extends class14 { - @ObfuscatedName("at") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = 2406216224100242295L - ) - long field117; - @ObfuscatedName("e") - String field121; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class13(class2 var1) { - this.this$0 = var1; - this.field117 = -1L; // L: 194 - this.field121 = null; // L: 195 - } // L: 197 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 200 - --var1.offset; // L: 201 - this.field117 = var1.readLong(); // L: 202 - } - - this.field121 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 - } // L: 205 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method129(this.field117, this.field121); // L: 208 - } // L: 209 -} diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java deleted file mode 100644 index 84bf620d09..0000000000 --- a/runescape-client/src/main/java/class136.java +++ /dev/null @@ -1,33 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("et") -public class class136 { - @ObfuscatedName("v") - public short[] field1542; - @ObfuscatedName("y") - public short[] field1541; - - class136(int var1) { - ItemComposition var2 = class250.ItemDefinition_get(var1); // L: 12 - if (var2.method3086()) { // L: 13 - this.field1542 = new short[var2.recolorTo.length]; // L: 14 - System.arraycopy(var2.recolorTo, 0, this.field1542, 0, this.field1542.length); // L: 15 - } - - if (var2.method3139()) { // L: 17 - this.field1541 = new short[var2.retextureTo.length]; // L: 18 - System.arraycopy(var2.retextureTo, 0, this.field1541, 0, this.field1541.length); // L: 19 - } - - } // L: 21 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1546323198" - ) - public static boolean method2696(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; // L: 9 - } -} diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java new file mode 100644 index 0000000000..cc25ee33f8 --- /dev/null +++ b/runescape-client/src/main/java/class137.java @@ -0,0 +1,169 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("er") +public class class137 { + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("v") + public short[] field1515; + @ObfuscatedName("j") + public short[] field1518; + + public class137(int var1) { + ItemComposition var2 = KeyHandler.ItemDefinition_get(var1); + if (var2.method3064()) { + this.field1515 = new short[var2.recolorTo.length]; + System.arraycopy(var2.recolorTo, 0, this.field1515, 0, this.field1515.length); + } + + if (var2.method3065()) { + this.field1518 = new short[var2.retextureTo.length]; + System.arraycopy(var2.retextureTo, 0, this.field1518, 0, this.field1518.length); + } + + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;Ljy;Ljy;B)V", + garbageValue = "111" + ) + public static void method2686(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + Widget.Widget_archive = var0; + UserComparator3.Widget_modelsArchive = var1; + SoundSystem.Widget_spritesArchive = var2; + Login.Widget_fontsArchive = var3; + Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; + class100.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "([BIIIIIIILgw;[Lfy;B)V", + garbageValue = "74" + ) + static final void method2684(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + Buffer var10 = new Buffer(var0); + int var11 = -1; + + while (true) { + int var12 = var10.method6880(); + if (var12 == 0) { + return; + } + + var11 += var12; + int var13 = 0; + + while (true) { + int var14 = var10.readUShortSmart(); + if (var14 == 0) { + break; + } + + var13 += var14 - 1; + int var15 = var13 & 63; + int var16 = var13 >> 6 & 63; + int var17 = var13 >> 12; + int var18 = var10.readUnsignedByte(); + int var19 = var18 >> 2; + int var20 = var18 & 3; + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { + ObjectComposition var21 = ClanChannel.getObjectDefinition(var11); + int var24 = var16 & 7; + int var25 = var15 & 7; + int var27 = var21.sizeX; + int var28 = var21.sizeY; + int var29; + if ((var20 & 1) == 1) { + var29 = var27; + var27 = var28; + var28 = var29; + } + + int var26 = var7 & 3; + int var23; + if (var26 == 0) { + var23 = var24; + } else if (var26 == 1) { + var23 = var25; + } else if (var26 == 2) { + var23 = 7 - var24 - (var27 - 1); + } else { + var23 = 7 - var25 - (var28 - 1); + } + + var29 = var2 + var23; + int var30 = var3 + WorldMapRegion.method3454(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); + if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { + int var31 = var1; + if ((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) { + var31 = var1 - 1; + } + + CollisionMap var32 = null; + if (var31 >= 0) { + var32 = var9[var31]; + } + + Client.method1382(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); + } + } + } + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lag;Lag;IZI)I", + garbageValue = "-1599131261" + ) + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { + var4 = 2001; + } + + if (var5 == -1) { + var5 = 2001; + } + } + + return var4 - var5; + } else if (var2 == 2) { + return var0.location - var1.location; + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { + return 0; + } else { + return var3 ? -1 : 1; + } + } else if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); + } + } else if (var2 == 4) { + return var0.method1388() ? (var1.method1388() ? 0 : 1) : (var1.method1388() ? -1 : 0); + } else if (var2 == 5) { + return var0.method1386() ? (var1.method1386() ? 0 : 1) : (var1.method1386() ? -1 : 0); + } else if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; + } + } +} diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 968c7f3d00..da186da08f 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,82 +1,34 @@ -import java.lang.management.GarbageCollectorMXBean; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; +import java.applet.Applet; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("g") -public abstract class class14 extends Node { - @ObfuscatedName("aa") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("io") - @ObfuscatedGetter( - intValue = 570617391 - ) - static int field124; - - class14() { - } // L: 68 - - @ObfuscatedName("f") +@ObfuscatedName("a") +public class class14 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-1705738842" ) - abstract void vmethod363(Buffer var1); + public static void method147(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", + garbageValue = "-1375544194" ) - abstract void vmethod354(ClanSettings var1); + public static Object method148(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); + } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "1354695002" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "1083001337" ) - static final void method229(String var0, int var1) { - PacketBufferNode var2 = InterfaceParent.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); // L: 252 - var2.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 253 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 254 - var2.packetBuffer.method6640(var1); // L: 255 - Client.packetWriter.addNode(var2); // L: 256 - } // L: 257 - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(Liv;Lef;IIZI)V", - garbageValue = "-3145938" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 10150 - byte var6 = -1; // L: 10151 - String var7 = null; // L: 10152 - if (var5 != null && var5[var3] != null) { // L: 10153 - if (var3 == 0) { // L: 10154 - var6 = 33; - } else if (var3 == 1) { // L: 10155 - var6 = 34; - } else if (var3 == 2) { // L: 10156 - var6 = 35; - } else if (var3 == 3) { // L: 10157 - var6 = 36; - } else { - var6 = 37; // L: 10158 - } - - var7 = var5[var3]; // L: 10159 - } else if (var3 == 4) { // L: 10162 - var6 = 37; // L: 10163 - var7 = "Drop"; // L: 10164 - } - - if (var6 != -1 && var7 != null) { // L: 10167 - PacketWriter.insertMenuItem(var7, SecureRandomFuture.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10168 - } - - } // L: 10170 + public static Object method155(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); + } } diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java deleted file mode 100644 index b096618d31..0000000000 --- a/runescape-client/src/main/java/class143.java +++ /dev/null @@ -1,265 +0,0 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("eg") -public class class143 { - @ObfuscatedName("lz") - @ObfuscatedGetter( - intValue = 592275981 - ) - @Export("menuY") - static int menuY; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-349868767" - ) - public static int method2815(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 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1661040540" - ) - @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("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1187310793" - ) - static void method2810() { - Login.Login_username = Login.Login_username.trim(); // L: 710 - if (Login.Login_username.length() == 0) { // L: 711 - CollisionMap.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 712 - } else { - long var1 = WorldMapElement.method2721(); // L: 716 - byte var0; - if (var1 == 0L) { // L: 717 - var0 = 5; - } else { - String var4 = Login.Login_username; // L: 720 - Random var5 = new Random(); // L: 722 - Buffer var6 = new Buffer(128); // L: 723 - Buffer var7 = new Buffer(128); // L: 724 - int[] var8 = new int[]{var5.nextInt(), var5.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 725 726 727 728 729 - var6.writeByte(10); // L: 730 - - int var9; - for (var9 = 0; var9 < 4; ++var9) { // L: 731 - var6.writeInt(var5.nextInt()); // L: 732 - } - - var6.writeInt(var8[0]); // L: 734 - var6.writeInt(var8[1]); // L: 735 - var6.writeLong(var1); // L: 736 - var6.writeLong(0L); // L: 737 - - for (var9 = 0; var9 < 4; ++var9) { // L: 738 - var6.writeInt(var5.nextInt()); // L: 739 - } - - var6.encryptRsa(class80.field983, class80.field984); // L: 741 - var7.writeByte(10); // L: 742 - - for (var9 = 0; var9 < 3; ++var9) { // L: 743 - var7.writeInt(var5.nextInt()); // L: 744 - } - - var7.writeLong(var5.nextLong()); // L: 746 - var7.writeLongMedium(var5.nextLong()); // L: 747 - if (Client.randomDatData != null) { // L: 749 - var7.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 750 - } else { - byte[] var21 = PlatformInfo.method6115(); // L: 753 - var7.writeBytes(var21, 0, var21.length); // L: 754 - } - - var7.writeLong(var5.nextLong()); // L: 756 - var7.encryptRsa(class80.field983, class80.field984); // L: 757 - var9 = class44.stringCp1252NullTerminatedByteSize(var4); // L: 758 - if (var9 % 8 != 0) { // L: 759 - var9 += 8 - var9 % 8; - } - - Buffer var10 = new Buffer(var9); // L: 760 - var10.writeStringCp1252NullTerminated(var4); // L: 761 - var10.offset = var9; // L: 762 - var10.xteaEncryptAll(var8); // L: 763 - Buffer var11 = new Buffer(var7.offset + var6.offset + var10.offset + 5); // L: 764 - var11.writeByte(2); // L: 765 - var11.writeByte(var6.offset); // L: 766 - var11.writeBytes(var6.array, 0, var6.offset); // L: 767 - var11.writeByte(var7.offset); // L: 768 - var11.writeBytes(var7.array, 0, var7.offset); // L: 769 - var11.writeShort(var10.offset); // L: 770 - var11.writeBytes(var10.array, 0, var10.offset); // L: 771 - byte[] var13 = var11.array; // L: 773 - int var15 = var13.length; // L: 776 - StringBuilder var16 = new StringBuilder(); // L: 778 - - int var19; - for (int var17 = 0; var17 < var15 + 0; var17 += 3) { // L: 779 - int var18 = var13[var17] & 255; // L: 780 - var16.append(class303.field3747[var18 >>> 2]); // L: 781 - if (var17 < var15 - 1) { // L: 782 - var19 = var13[var17 + 1] & 255; // L: 783 - var16.append(class303.field3747[(var18 & 3) << 4 | var19 >>> 4]); // L: 784 - if (var17 < var15 - 2) { // L: 785 - int var20 = var13[var17 + 2] & 255; // L: 786 - var16.append(class303.field3747[(var19 & 15) << 2 | var20 >>> 6]).append(class303.field3747[var20 & 63]); // L: 787 - } else { - var16.append(class303.field3747[(var19 & 15) << 2]).append("="); // L: 789 - } - } else { - var16.append(class303.field3747[(var18 & 3) << 4]).append("=="); // L: 791 - } - } - - String var14 = var16.toString(); // L: 793 - var14 = var14; // L: 797 - - byte var3; - try { - URL var22 = new URL(class19.method283("services", false) + "m=accountappeal/login.ws"); // L: 799 - URLConnection var27 = var22.openConnection(); // L: 800 - var27.setDoInput(true); // L: 801 - var27.setDoOutput(true); // L: 802 - var27.setConnectTimeout(5000); // L: 803 - OutputStreamWriter var23 = new OutputStreamWriter(var27.getOutputStream()); // L: 804 - var23.write("data2=" + Renderable.method4251(var14) + "&dest=" + Renderable.method4251("passwordchoice.ws")); // L: 805 - var23.flush(); // L: 806 - InputStream var24 = var27.getInputStream(); // L: 807 - var11 = new Buffer(new byte[1000]); // L: 808 - - while (true) { - var19 = var24.read(var11.array, var11.offset, 1000 - var11.offset); // L: 810 - if (var19 == -1) { // L: 811 - var23.close(); // L: 818 - var24.close(); // L: 819 - String var25 = new String(var11.array); // L: 820 - if (var25.startsWith("OFFLINE")) { // L: 821 - var3 = 4; // L: 822 - } else if (var25.startsWith("WRONG")) { // L: 825 - var3 = 7; // L: 826 - } else if (var25.startsWith("RELOAD")) { // L: 829 - var3 = 3; // L: 830 - } else if (var25.startsWith("Not permitted for social network accounts.")) { // L: 833 - var3 = 6; // L: 834 - } else { - var11.xteaDecryptAll(var8); // L: 837 - - while (var11.offset > 0 && var11.array[var11.offset - 1] == 0) { // L: 838 - --var11.offset; // L: 839 - } - - var25 = new String(var11.array, 0, var11.offset); // L: 841 - if (EnumComposition.method2831(var25)) { // L: 842 - AttackOption.openURL(var25, true, false); // L: 843 - var3 = 2; // L: 844 - } else { - var3 = 5; // L: 846 - } - } - break; - } - - var11.offset += var19; // L: 812 - if (var11.offset >= 1000) { // L: 813 - var3 = 5; // L: 814 - break; - } - } - } catch (Throwable var26) { // L: 848 - var26.printStackTrace(); // L: 849 - var3 = 5; // L: 850 - } - - var0 = var3; // L: 853 - } - - switch(var0) { // L: 855 - case 2: - CollisionMap.setLoginResponseString(Strings.field3499, Strings.field3500, Strings.field3286); // L: 872 - Login.loginIndex = 6; // L: 873 - break; - case 3: - CollisionMap.setLoginResponseString("", "Error connecting to server.", ""); // L: 863 - break; // L: 864 - case 4: - CollisionMap.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 857 - break; // L: 858 - case 5: - CollisionMap.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 860 - break; // L: 861 - case 6: - CollisionMap.setLoginResponseString("", "Error connecting to server.", ""); // L: 869 - break; // L: 870 - case 7: - CollisionMap.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: 866 - } - - } - } // L: 713 876 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2116352910" - ) - public static void method2811() { - NPCComposition.NpcDefinition_cached.clear(); // L: 269 - NPCComposition.NpcDefinition_cachedModels.clear(); // L: 270 - } // L: 271 - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-578637844" - ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 4505 - byte var2 = 4; // L: 4506 - int var3 = var2 + 6; // L: 4507 - int var4 = var2 + 6; // L: 4508 - int var5 = AbstractSocket.fontPlain12.lineWidth(var0, 250); // L: 4509 - int var6 = AbstractSocket.fontPlain12.lineCount(var0, 250) * 13; // L: 4510 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); // L: 4511 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 16777215); // L: 4512 - AbstractSocket.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4513 - AccessFile.method6437(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2); // L: 4514 - if (var1) { // L: 4515 - AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 4516 - } else { - ReflectionCheck.method1229(var3, var4, var5, var6); // L: 4519 - } - - } - } // L: 4521 -} diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java new file mode 100644 index 0000000000..4519d63e66 --- /dev/null +++ b/runescape-client/src/main/java/class144.java @@ -0,0 +1,121 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ed") +public class class144 { + @ObfuscatedName("f") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); + class232.method4453(); + AbstractByteArrayCopier.method4860(); + MenuAction.method1655(); + class7.method58(); + NPCComposition.NpcDefinition_cached.clear(); + NPCComposition.NpcDefinition_cachedModels.clear(); + VarbitComposition.method2898(); + class52.method1651(); + AbstractRasterProvider.method7053(); + VarbitComposition.VarbitDefinition_cached.clear(); + VarpDefinition.VarpDefinition_cached.clear(); + class99.field1271.method6513(); + GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites.method6513(); + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + MilliClock.method2671(); + ParamComposition.ParamDefinition_cached.clear(); + ScriptFrame.method851(); + UrlRequester.method2126(); + Canvas.method123(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + class120.archive0.clearFiles(); + Language.archive1.clearFiles(); + Decimator.archive3.clearFiles(); + InvDefinition.archive4.clearFiles(); + Skeleton.archive5.clearFiles(); + class108.archive6.clearFiles(); + class74.archive7.clearFiles(); + class270.archive8.clearFiles(); + class126.archive9.clearFiles(); + ClanChannelMember.archive10.clearFiles(); + class339.archive11.clearFiles(); + ApproximateRouteStrategy.archive12.clearFiles(); + WorldMapIcon_1.scene.clear(); + + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); + } + + System.gc(); + class234.musicPlayerStatus = 1; + class234.musicTrackArchive = null; + class234.musicTrackGroupId = -1; + UserComparator6.musicTrackFileId = -1; + HorizontalAlignment.musicTrackVolume = 0; + EnumComposition.musicTrackBoolean = false; + ClanChannel.pcmSampleLength = 2; + Client.currentTrackGroupId = -1; + Client.field647 = false; + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var1.stream1 != null) { + TileItem.pcmStreamMixer.removeSubStream(var1.stream1); + var1.stream1 = null; + } + + if (var1.stream2 != null) { + TileItem.pcmStreamMixer.removeSubStream(var1.stream2); + var1.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + class16.updateGameState(10); + } + + @ObfuscatedName("la") + @ObfuscatedSignature( + descriptor = "([BIB)V", + garbageValue = "-17" + ) + static void method2802(byte[] var0, int var1) { + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; + } + + class308.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); + } + + @ObfuscatedName("lf") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "298776696" + ) + static void method2803(Buffer var0) { + if (Client.randomDatData != null) { + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var1 = InvDefinition.method2698(); + var0.writeBytes(var1, 0, var1.length); + } + } +} diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 97787cb6a0..4af571f2ed 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -1,136 +1,43 @@ +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("t") -public class class15 extends class14 { - @ObfuscatedName("gl") - @ObfuscatedGetter( - intValue = 1795345059 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("gc") - @ObfuscatedGetter( - intValue = -809778825 - ) - static int field128; - @ObfuscatedName("mq") - @ObfuscatedGetter( - intValue = 2042655841 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("f") - String field125; - // $FF: synthetic field +@ObfuscatedName("q") +public class class15 { + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lv;" + descriptor = "[Lag;" ) - final class2 this$0; + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive18") + static Archive archive18; - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class15(class2 var1) { - this.this$0 = var1; // L: 229 + static { + ImageIO.setUseCache(false); } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" + descriptor = "(III)Z", + garbageValue = "-728287916" ) - void vmethod363(Buffer var1) { - this.field125 = var1.readStringCp1252NullTerminated(); // L: 232 - var1.readInt(); // L: 233 - } // L: 234 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.name = this.field125; // L: 237 - } // L: 238 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;IZI)Lgi;", - garbageValue = "-91677995" - ) - public static Frames method240(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 - } - } + static boolean method162(int var0, int var1) { + return var0 != 4 || var1 < 8; } - @ObfuscatedName("gi") + @ObfuscatedName("jq") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "201138696" + descriptor = "(ZS)V", + garbageValue = "-27783" ) - static void method238() { - if (Client.renderSelf) { // L: 4766 - class160.addPlayerToScene(class262.localPlayer, false); // L: 4767 - } - - } // L: 4769 - - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "959129058" - ) - static final void method241(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7744 - if (Client.showMouseOverText) { // L: 7745 - int var2 = HealthBarUpdate.method2283(); // L: 7746 - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7748 - var3 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7749 - var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; - } else { - var3 = class0.method1(var2); // L: 7750 - } - - if (Client.menuOptionsCount > 2) { // L: 7751 - var3 = var3 + SecureRandomFuture.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } - - class309.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7752 - } - } - } // L: 7753 + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; + } } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 12f603f23a..335e5bf52a 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,305 +1,198 @@ +import java.applet.Applet; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("x") -public abstract class class16 extends Node { - @ObfuscatedName("m") - static byte[][][] field132; - @ObfuscatedName("dw") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive9") - static Archive archive9; +@ObfuscatedName("u") +public class class16 { + @ObfuscatedName("s") + @Export("applet") + static Applet applet; + @ObfuscatedName("t") + static String field87; - class16() { - } // L: 48 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "851460888" - ) - abstract void vmethod331(Buffer var1); - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ly;I)V", - garbageValue = "-1362614343" - ) - abstract void vmethod332(ClanChannel var1); - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2069823141" - ) - public static int method245(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { // L: 99 100 103 - var2 = var2 << 1 | var0 & 1; // L: 101 - var0 >>>= 1; // L: 102 - } - - return var2; // L: 105 + static { + applet = null; + field87 = ""; } - @ObfuscatedName("hs") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ZLns;B)V", - garbageValue = "58" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "309186678" ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field783 = 0; // L: 7480 - Client.field636 = 0; // L: 7481 - class171.method3610(); // L: 7482 + public static String method176(CharSequence var0) { + int var2 = var0.length(); + char[] var3 = new char[var2]; - int var2; - NPC var4; - int var5; - int var6; - int var7; - int var8; - int var10; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7485 - var2 = var1.readBits(15); // L: 7486 - if (var2 == 32767) { // L: 7487 - break; - } - - boolean var3 = false; // L: 7488 - if (Client.npcs[var2] == null) { // L: 7489 - Client.npcs[var2] = new NPC(); // L: 7490 - var3 = true; // L: 7491 - } - - var4 = Client.npcs[var2]; // L: 7493 - Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7494 - var4.npcCycle = Client.cycle; // L: 7495 - var4.definition = class248.getNpcDefinition(var1.readBits(14)); // L: 7499 - if (var0) { // L: 7500 - var6 = var1.readBits(8); // L: 7501 - if (var6 > 127) { // L: 7502 - var6 -= 256; - } - } else { - var6 = var1.readBits(5); // L: 7505 - if (var6 > 15) { // L: 7506 - var6 -= 32; - } - } - - if (var0) { // L: 7508 - var7 = var1.readBits(8); // L: 7509 - if (var7 > 127) { // L: 7510 - var7 -= 256; - } - } else { - var7 = var1.readBits(5); // L: 7513 - if (var7 > 15) { // L: 7514 - var7 -= 32; - } - } - - var8 = var1.readBits(1); // L: 7516 - if (var8 == 1) { // L: 7517 - Client.field763[++Client.field636 - 1] = var2; - } - - var5 = var1.readBits(1); // L: 7518 - boolean var9 = var1.readBits(1) == 1; // L: 7519 - if (var9) { // L: 7520 - var1.readBits(32); // L: 7521 - } - - var10 = Client.defaultRotations[var1.readBits(3)]; // L: 7523 - if (var3) { // L: 7524 - var4.orientation = var4.rotation = var10; - } - - var4.field1225 = var4.definition.size; // L: 7525 - var4.field1275 = var4.definition.rotation; // L: 7526 - if (var4.field1275 == 0) { // L: 7527 - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; // L: 7528 - var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7529 - var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7530 - var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7531 - var4.idleSequence = var4.definition.idleSequence; // L: 7532 - var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7533 - var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7534 - var4.method2347(class262.localPlayer.pathX[0] + var6, class262.localPlayer.pathY[0] + var7, var5 == 1); // L: 7535 + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = '*'; } - var1.exportIndex(); // L: 7537 + String var1 = new String(var3); + return var1; + } - int var14; - for (var2 = 0; var2 < Client.field636; ++var2) { // L: 7540 - var14 = Client.field763[var2]; // L: 7541 - var4 = Client.npcs[var14]; // L: 7542 - var5 = var1.readUnsignedByte(); // L: 7543 - int var15; - if ((var5 & 128) != 0) { // L: 7544 - var6 = var1.readUnsignedShort(); // L: 7545 - var7 = var1.readUnsignedShort(); // L: 7546 - var8 = var4.x - (var6 - class15.baseX - class15.baseX) * 64; // L: 7547 - var15 = var4.y - (var7 - WorldMapSprite.baseY - WorldMapSprite.baseY) * 64; // L: 7548 - if (var8 != 0 || var15 != 0) { // L: 7549 - var4.field1280 = (int)(Math.atan2((double)var8, (double)var15) * 325.949D) & 2047; + @ObfuscatedName("ez") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "1" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + Script.client.method224(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { + Client.loginState = 0; + Client.field438 = 0; + Client.field439 = 0; + Client.timer.method5662(var0); + if (var0 != 20) { + Interpreter.method1579(false); } } - if ((var5 & 64) != 0) { // L: 7551 - var4.definition = class248.getNpcDefinition(var1.method6652()); // L: 7552 - var4.field1225 = var4.definition.size; // L: 7553 - var4.field1275 = var4.definition.rotation; // L: 7554 - var4.walkSequence = var4.definition.walkSequence; // L: 7555 - var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7556 - var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7557 - var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7558 - var4.idleSequence = var4.definition.idleSequence; // L: 7559 - var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7560 - var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7561 + if (var0 != 20 && var0 != 40 && Client.field644 != null) { + Client.field644.close(); + Client.field644 = null; } - if ((var5 & 16) != 0) { // L: 7563 - var6 = var1.readUnsignedShort(); // L: 7564 - if (var6 == 65535) { // L: 7565 - var6 = -1; - } - - var7 = var1.method6642(); // L: 7566 - if (var6 == var4.sequence && var6 != -1) { // L: 7567 - var8 = WorldMapScaleHandler.SequenceDefinition_get(var6).field1894; // L: 7568 - if (var8 == 1) { // L: 7569 - var4.sequenceFrame = 0; // L: 7570 - var4.sequenceFrameCycle = 0; // L: 7571 - var4.sequenceDelay = var7; // L: 7572 - var4.field1258 = 0; // L: 7573 - } - - if (var8 == 2) { // L: 7575 - var4.field1258 = 0; // L: 7576 - } - } else if (var6 == -1 || var4.sequence == -1 || WorldMapScaleHandler.SequenceDefinition_get(var6).field1892 >= WorldMapScaleHandler.SequenceDefinition_get(var4.sequence).field1892) { // L: 7579 - var4.sequence = var6; // L: 7580 - var4.sequenceFrame = 0; // L: 7581 - var4.sequenceFrameCycle = 0; // L: 7582 - var4.sequenceDelay = var7; // L: 7583 - var4.field1258 = 0; // L: 7584 - var4.field1281 = var4.pathLength; // L: 7585 - } + if (Client.gameState == 25) { + Client.field463 = 0; + Client.field459 = 0; + Client.field460 = 1; + Client.field461 = 0; + Client.field549 = 1; } - if ((var5 & 2) != 0) { // L: 7589 - var4.overheadText = var1.readStringCp1252NullTerminated(); // L: 7590 - var4.overheadTextCyclesRemaining = 100; // L: 7591 - } + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + MusicPatch.method4636(ClanChannelMember.archive10, class270.archive8, true, Client.gameState == 11 ? 4 : 0); + } else if (var0 == 11) { + MusicPatch.method4636(ClanChannelMember.archive10, class270.archive8, false, 4); + } else if (Login.clearLoginScreen) { + class304.titleboxSprite = null; + Login.titlebuttonSprite = null; + Login.runesSprite = null; + Login.leftTitleSprite = null; + Login.rightTitleSprite = null; + UserComparator4.logoSprite = null; + FileSystem.title_muteSprite = null; + GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite = null; + class172.options_buttons_2Sprite = null; + WorldMapAreaData.worldSelectBackSprites = null; + GraphicsObject.worldSelectFlagSprites = null; + ApproximateRouteStrategy.worldSelectArrows = null; + ChatChannel.worldSelectStars = null; + MidiPcmStream.field2846 = null; + class6.loginScreenRunesAnimation.method1917(); + class234.musicPlayerStatus = 1; + class234.musicTrackArchive = null; + class234.musicTrackGroupId = -1; + UserComparator6.musicTrackFileId = -1; + HorizontalAlignment.musicTrackVolume = 0; + EnumComposition.musicTrackBoolean = false; + ClanChannel.pcmSampleLength = 2; + if (NetCache.NetCache_socket != null) { + try { + Buffer var1 = new Buffer(4); + var1.writeByte(2); + var1.writeMedium(0); + NetCache.NetCache_socket.write(var1.array, 0, 4); + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var3) { + } - if ((var5 & 1) != 0) { // L: 7593 - var6 = var1.readUnsignedByte(); // L: 7594 - int var11; - int var12; - if (var6 > 0) { // L: 7595 - for (var7 = 0; var7 < var6; ++var7) { // L: 7596 - var15 = -1; // L: 7598 - var10 = -1; // L: 7599 - var11 = -1; // L: 7600 - var8 = var1.readUShortSmart(); // L: 7601 - if (var8 == 32767) { // L: 7602 - var8 = var1.readUShortSmart(); // L: 7603 - var10 = var1.readUShortSmart(); // L: 7604 - var15 = var1.readUShortSmart(); // L: 7605 - var11 = var1.readUShortSmart(); // L: 7606 - } else if (var8 != 32766) { // L: 7608 - var10 = var1.readUShortSmart(); // L: 7609 - } else { - var8 = -1; // L: 7611 - } - - var12 = var1.readUShortSmart(); // L: 7612 - var4.addHitSplat(var8, var10, var15, var11, Client.cycle, var12); // L: 7613 - } - } - - var7 = var1.method6643(); // L: 7616 - if (var7 > 0) { // L: 7617 - for (var8 = 0; var8 < var7; ++var8) { // L: 7618 - var15 = var1.readUShortSmart(); // L: 7619 - var10 = var1.readUShortSmart(); // L: 7620 - if (var10 != 32767) { // L: 7621 - var11 = var1.readUShortSmart(); // L: 7622 - var12 = var1.method6643(); // L: 7623 - int var13 = var10 > 0 ? var1.method6642() : var12; // L: 7624 - var4.addHealthBar(var15, Client.cycle, var10, var11, var12, var13); // L: 7625 - } else { - var4.removeHealthBar(var15); // L: 7627 + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; } } + + Login.clearLoginScreen = false; } + } else { + MusicPatch.method4636(ClanChannelMember.archive10, class270.archive8, true, 0); } - if ((var5 & 32) != 0) { // L: 7631 - var4.field1264 = var1.method6619(); // L: 7632 - var4.field1268 = var1.readByte(); // L: 7633 - var4.field1265 = var1.readByte(); // L: 7634 - var4.field1267 = var1.method6682(); // L: 7635 - var4.field1276 = var1.method6651() + Client.cycle; // L: 7636 - var4.field1269 = var1.method6652() + Client.cycle; // L: 7637 - var4.field1270 = var1.method6651(); // L: 7638 - var4.pathLength = 1; // L: 7639 - var4.field1281 = 0; // L: 7640 - var4.field1264 += var4.pathX[0]; // L: 7641 - var4.field1268 += var4.pathY[0]; // L: 7642 - var4.field1265 += var4.pathX[0]; // L: 7643 - var4.field1267 += var4.pathY[0]; // L: 7644 - } - - if ((var5 & 4) != 0) { // L: 7646 - var4.targetIndex = var1.method6653(); // L: 7647 - if (var4.targetIndex == 65535) { // L: 7648 - var4.targetIndex = -1; - } - } - - if ((var5 & 8) != 0) { // L: 7650 - var4.spotAnimation = var1.method6651(); // L: 7651 - var6 = var1.method6725(); // L: 7652 - var4.field1263 = var6 >> 16; // L: 7653 - var4.field1262 = (var6 & 65535) + Client.cycle; // L: 7654 - var4.spotAnimationFrame = 0; // L: 7655 - var4.spotAnimationFrameCycle = 0; // L: 7656 - if (var4.field1262 > Client.cycle) { // L: 7657 - var4.spotAnimationFrame = -1; - } - - if (var4.spotAnimation == 65535) { // L: 7658 - var4.spotAnimation = -1; - } - } + Client.gameState = var0; } + } - for (var2 = 0; var2 < Client.field783; ++var2) { // L: 7662 - var14 = Client.field859[var2]; // L: 7663 - if (Client.npcs[var14].npcCycle != Client.cycle) { // L: 7664 - Client.npcs[var14].definition = null; // L: 7665 - Client.npcs[var14] = null; // L: 7666 + @ObfuscatedName("fw") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "362170374" + ) + static boolean method173() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var0.isLoaded()) { + return false; + } + + ++Client.archiveLoadersDone; } - } - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7669 - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + return true; } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7670 - if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7671 - throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7672 - } - } - + return true; } - } // L: 7675 + } + + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(Lbx;IB)V", + garbageValue = "-49" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + if (var0.field1073 >= Client.cycle) { + World.method1426(var0); + } else if (var0.field1067 >= Client.cycle) { + Message.method878(var0); + } else { + ObjectComposition.method3013(var0); + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field1073 = 0; + var0.field1067 = 0; + var0.x = var0.pathX[0] * 128 + var0.field1023 * 64; + var0.y = var0.pathY[0] * 128 + var0.field1023 * 64; + var0.method1872(); + } + + if (MouseHandler.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field1073 = 0; + var0.field1067 = 0; + var0.x = var0.field1023 * 64 + var0.pathX[0] * 128; + var0.y = var0.field1023 * 64 + var0.pathY[0] * 128; + var0.method1872(); + } + + ReflectionCheck.method848(var0); + class109.method2313(var0); + } + + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "976649995" + ) + static final void method175(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + Decimator.clientPreferences.areaSoundEffectsVolume = var0; + MilliClock.savePreferences(); + } } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java deleted file mode 100644 index ee70f2b30d..0000000000 --- a/runescape-client/src/main/java/class160.java +++ /dev/null @@ -1,99 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fx") -public class class160 { - @ObfuscatedName("v") - @Export("directions") - public static int[][] directions; - @ObfuscatedName("y") - @Export("distances") - public static int[][] distances; - @ObfuscatedName("r") - @Export("bufferX") - public static int[] bufferX; - @ObfuscatedName("h") - @Export("bufferY") - public static int[] bufferY; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Len;" - ) - @Export("clock") - static Clock clock; - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("fa") - @ObfuscatedGetter( - longValue = 3427195158311582499L - ) - static long field1929; - @ObfuscatedName("hz") - @ObfuscatedGetter( - intValue = 1662594795 - ) - @Export("cameraY") - static int cameraY; - - 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("gj") - @ObfuscatedSignature( - descriptor = "(Lcj;ZI)V", - garbageValue = "-868096923" - ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4778 - var0.isUnanimated = false; // L: 4779 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4780 4781 - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; // L: 4783 - int var3 = var0.y >> 7; // L: 4784 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4785 - long var4 = UserComparator3.calculateTag(0, 0, 0, false, var0.index); // L: 4786 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4787 - var0.isUnanimated = false; // L: 4788 - var0.tileHeight = ItemContainer.getTileHeight(var0.x, var0.y, SoundSystem.Client_plane); // L: 4789 - var0.playerCycle = Client.cycle; // L: 4790 - DevicePcmPlayerProvider.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: 4791 - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4794 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4795 - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4796 - } - - var0.tileHeight = ItemContainer.getTileHeight(var0.x, var0.y, SoundSystem.Client_plane); // L: 4798 - var0.playerCycle = Client.cycle; // L: 4799 - DevicePcmPlayerProvider.scene.drawEntity(SoundSystem.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4800 - } - } - } - - } // L: 4804 - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-18748902" - ) - static boolean method3253(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 8993 - } -} diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java new file mode 100644 index 0000000000..a814d9928d --- /dev/null +++ b/runescape-client/src/main/java/class161.java @@ -0,0 +1,211 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fp") +public class class161 { + @ObfuscatedName("v") + @Export("directions") + static int[][] directions; + @ObfuscatedName("j") + @Export("distances") + static int[][] distances; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 2002565011 + ) + static int field1896; + @ObfuscatedName("f") + @Export("bufferX") + static int[] bufferX; + @ObfuscatedName("o") + @Export("bufferY") + static int[] bufferY; + + static { + directions = new int[128][128]; + distances = new int[128][128]; + bufferX = new int[4096]; + bufferY = new int[4096]; + } + + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2115881206" + ) + static final void method3211() { + int var0 = class107.field1323 * 128 + 64; + int var1 = HitSplatDefinition.field1713 * 128 + 64; + int var2 = class122.getTileHeight(var0, var1, GrandExchangeEvent.Client_plane) - class6.field14; + if (ItemContainer.cameraX < var0) { + ItemContainer.cameraX = (var0 - ItemContainer.cameraX) * class216.field2545 / 1000 + ItemContainer.cameraX + UserComparator6.field1265; + if (ItemContainer.cameraX > var0) { + ItemContainer.cameraX = var0; + } + } + + if (ItemContainer.cameraX > var0) { + ItemContainer.cameraX -= class216.field2545 * (ItemContainer.cameraX - var0) / 1000 + UserComparator6.field1265; + if (ItemContainer.cameraX < var0) { + ItemContainer.cameraX = var0; + } + } + + if (Bounds.cameraY < var2) { + Bounds.cameraY = (var2 - Bounds.cameraY) * class216.field2545 / 1000 + Bounds.cameraY + UserComparator6.field1265; + if (Bounds.cameraY > var2) { + Bounds.cameraY = var2; + } + } + + if (Bounds.cameraY > var2) { + Bounds.cameraY -= class216.field2545 * (Bounds.cameraY - var2) / 1000 + UserComparator6.field1265; + if (Bounds.cameraY < var2) { + Bounds.cameraY = var2; + } + } + + if (WorldMapArchiveLoader.cameraZ < var1) { + WorldMapArchiveLoader.cameraZ = (var1 - WorldMapArchiveLoader.cameraZ) * class216.field2545 / 1000 + WorldMapArchiveLoader.cameraZ + UserComparator6.field1265; + if (WorldMapArchiveLoader.cameraZ > var1) { + WorldMapArchiveLoader.cameraZ = var1; + } + } + + if (WorldMapArchiveLoader.cameraZ > var1) { + WorldMapArchiveLoader.cameraZ -= class216.field2545 * (WorldMapArchiveLoader.cameraZ - var1) / 1000 + UserComparator6.field1265; + if (WorldMapArchiveLoader.cameraZ < var1) { + WorldMapArchiveLoader.cameraZ = var1; + } + } + + var0 = class376.field4165 * 128 + 64; + var1 = ItemLayer.field2147 * 128 + 64; + var2 = class122.getTileHeight(var0, var1, GrandExchangeEvent.Client_plane) - AbstractSocket.field3874; + int var3 = var0 - ItemContainer.cameraX; + int var4 = var2 - Bounds.cameraY; + int var5 = var1 - WorldMapArchiveLoader.cameraZ; + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; + if (var7 < 128) { + var7 = 128; + } + + if (var7 > 383) { + var7 = 383; + } + + if (class116.cameraPitch < var7) { + class116.cameraPitch = (var7 - class116.cameraPitch) * Strings.field3397 / 1000 + class116.cameraPitch + KitDefinition.field1577; + if (class116.cameraPitch > var7) { + class116.cameraPitch = var7; + } + } + + if (class116.cameraPitch > var7) { + class116.cameraPitch -= Strings.field3397 * (class116.cameraPitch - var7) / 1000 + KitDefinition.field1577; + if (class116.cameraPitch < var7) { + class116.cameraPitch = var7; + } + } + + int var9 = var8 - class117.cameraYaw; + if (var9 > 1024) { + var9 -= 2048; + } + + if (var9 < -1024) { + var9 += 2048; + } + + if (var9 > 0) { + class117.cameraYaw = var9 * Strings.field3397 / 1000 + class117.cameraYaw + KitDefinition.field1577; + class117.cameraYaw &= 2047; + } + + if (var9 < 0) { + class117.cameraYaw -= -var9 * Strings.field3397 / 1000 + KitDefinition.field1577; + class117.cameraYaw &= 2047; + } + + int var10 = var8 - class117.cameraYaw; + if (var10 > 1024) { + var10 -= 2048; + } + + if (var10 < -1024) { + var10 += 2048; + } + + if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { + class117.cameraYaw = var8; + } + + } + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-953698862" + ) + static final void method3210() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints == -1) { + var0.delay = 0; + Messages.method2094(var0); + } else { + var0.remove(); + } + } + + } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "(Lbj;ZI)V", + garbageValue = "1096629684" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + class4.method20(var2); + } + + World.method1425(var2); + Widget var4 = UrlRequester.getWidget(var3); + if (var4 != null) { + AttackOption.invalidateWidget(var4); + } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (SoundSystem.method524(Client.menuOpcodes[var5])) { + if (var5 < Client.menuOptionsCount - 1) { + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { + Client.menuActions[var6] = Client.menuActions[var6 + 1]; + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; + } + } + + --var5; + --Client.menuOptionsCount; + } + } + + SecureRandomFuture.method1711(); + if (Client.rootInterface != -1) { + WorldMapData_0.runIntfCloseListeners(Client.rootInterface, 1); + } + + } +} diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java deleted file mode 100644 index 0e1ef2a1e2..0000000000 --- a/runescape-client/src/main/java/class162.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("fc") -public class class162 { - @ObfuscatedName("bs") - static String field1936; -} diff --git a/runescape-client/src/main/java/class163.java b/runescape-client/src/main/java/class163.java new file mode 100644 index 0000000000..8ae378b390 --- /dev/null +++ b/runescape-client/src/main/java/class163.java @@ -0,0 +1,47 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fc") +public class class163 { + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + static AbstractArchive field1913; + @ObfuscatedName("a") + static int[][][] field1914; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)[Lom;", + garbageValue = "1426518701" + ) + static SpritePixels[] method3229() { + SpritePixels[] var0 = new SpritePixels[class398.SpriteBuffer_spriteCount]; + + for (int var1 = 0; var1 < class398.SpriteBuffer_spriteCount; ++var1) { + SpritePixels var2 = var0[var1] = new SpritePixels(); + var2.width = class398.SpriteBuffer_spriteWidth; + var2.height = class398.SpriteBuffer_spriteHeight; + var2.xOffset = class398.SpriteBuffer_xOffsets[var1]; + var2.yOffset = class398.SpriteBuffer_yOffsets[var1]; + var2.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = class374.SpriteBuffer_spriteHeights[var1]; + int var3 = var2.subHeight * var2.subWidth; + byte[] var4 = class398.SpriteBuffer_pixels[var1]; + var2.pixels = new int[var3]; + + for (int var5 = 0; var5 < var3; ++var5) { + var2.pixels[var5] = class118.SpriteBuffer_spritePalette[var4[var5] & 255]; + } + } + + class398.SpriteBuffer_xOffsets = null; + class398.SpriteBuffer_yOffsets = null; + ClanChannelMember.SpriteBuffer_spriteWidths = null; + class374.SpriteBuffer_spriteHeights = null; + class118.SpriteBuffer_spritePalette = null; + class398.SpriteBuffer_pixels = null; + return var0; + } +} diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java deleted file mode 100644 index fe3b19c918..0000000000 --- a/runescape-client/src/main/java/class17.java +++ /dev/null @@ -1,161 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("u") -public class class17 extends class14 { - @ObfuscatedName("f") - boolean field140; - @ObfuscatedName("e") - byte field136; - @ObfuscatedName("v") - byte field137; - @ObfuscatedName("y") - byte field135; - @ObfuscatedName("j") - byte field139; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class17(class2 var1) { - this.this$0 = var1; // L: 248 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field140 = var1.readUnsignedByte() == 1; // L: 251 - this.field136 = var1.readByte(); // L: 252 - this.field137 = var1.readByte(); // L: 253 - this.field135 = var1.readByte(); // L: 254 - this.field139 = var1.readByte(); // L: 255 - } // L: 256 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.allowGuests = this.field140; // L: 259 - var1.field87 = this.field136; // L: 260 - var1.field88 = this.field137; // L: 261 - var1.field93 = this.field135; // L: 262 - var1.field90 = this.field139; // L: 263 - } // L: 264 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-50" - ) - static String method255() { - return class4.clientPreferences.hideUsername ? class22.method315(Login.Login_username) : Login.Login_username; // L: 179 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)Liv;", - garbageValue = "-571050051" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = WorldMapData_1.getWidget(var0); // L: 209 - if (var1 == -1) { // L: 210 - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 211 212 - } - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-148102361" - ) - static int method258(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field959 - 7.0D) * 256.0D); // L: 3567 - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "614337343" - ) - static final void method261() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7351 7352 7395 - if (var0.hitpoints > 0) { // L: 7353 - --var0.hitpoints; - } - - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.hitpoints == 0) { // L: 7354 - if (var0.objectId >= 0) { // L: 7356 - var2 = var0.objectId; // L: 7358 - var3 = var0.field1210; // L: 7359 - var4 = Tiles.getObjectDefinition(var2); // L: 7361 - if (var3 == 11) { // L: 7362 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 7363 - var3 = 4; - } - - var1 = var4.method3019(var3); // L: 7364 - if (!var1) { // L: 7366 - continue; - } - } - - WorldMapEvent.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1209, var0.field1210); // L: 7368 - var0.remove(); // L: 7369 - } else { - if (var0.delay > 0) { // L: 7373 - --var0.delay; - } - - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7374 - if (var0.id >= 0) { // L: 7376 - var2 = var0.id; // L: 7378 - var3 = var0.field1213; // L: 7379 - var4 = Tiles.getObjectDefinition(var2); // L: 7381 - if (var3 == 11) { // L: 7382 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 7383 - var3 = 4; - } - - var1 = var4.method3019(var3); // L: 7384 - if (!var1) { // L: 7386 - continue; - } - } - - WorldMapEvent.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1213); // L: 7388 - var0.delay = -1; // L: 7389 - if (var0.id == var0.objectId && var0.objectId == -1) { // L: 7390 - var0.remove(); - } else if (var0.id == var0.objectId && var0.field1209 == var0.orientation && var0.field1210 == var0.field1213) { // L: 7391 - var0.remove(); - } - } - } - } - - } // L: 7397 -} diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java deleted file mode 100644 index 248836e0b9..0000000000 --- a/runescape-client/src/main/java/class170.java +++ /dev/null @@ -1,171 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fb") -public class class170 implements WorldMapSection { - @ObfuscatedName("qo") - static boolean field2016; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1070894697 - ) - int field2015; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -2078857995 - ) - int field2013; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -492732977 - ) - int field2014; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 748081581 - ) - int field2012; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -522763659 - ) - int field2023; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1748963509 - ) - int field2017; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1793396217 - ) - int field2018; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 589577767 - ) - int field2019; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -724496135 - ) - int field2020; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1652929447 - ) - int field2021; - - class170() { - } // L: 18 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lfa;B)V", - garbageValue = "120" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2023) { // L: 21 - var1.regionLowX = this.field2023; - } - - if (var1.regionHighX < this.field2023) { - var1.regionHighX = this.field2023; // L: 22 - } - - if (var1.regionLowY > this.field2017) { // L: 23 - var1.regionLowY = this.field2017; - } - - if (var1.regionHighY < this.field2017) { // L: 24 - var1.regionHighY = this.field2017; - } - - } // L: 25 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-2105423832" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2015 && var1 < this.field2013 + this.field2015) { // L: 28 - return var2 >= (this.field2014 << 6) + (this.field2018 << 3) && var2 <= (this.field2014 << 6) + (this.field2018 << 3) + 7 && var3 >= (this.field2012 << 6) + (this.field2019 << 3) && var3 <= (this.field2012 << 6) + (this.field2019 << 3) + 7; // L: 31 - } else { - return false; // L: 29 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-173753307" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2023 << 6) + (this.field2020 << 3) && var1 <= (this.field2023 << 6) + (this.field2020 << 3) + 7 && var2 >= (this.field2017 << 6) + (this.field2021 << 3) && var2 <= (this.field2017 << 6) + (this.field2021 << 3) + 7; // L: 35 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "2086451205" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 39 - return null; // L: 40 - } else { - int[] var4 = new int[]{var2 + (this.field2023 * 64 - this.field2014 * 64) + (this.field2020 * 8 - this.field2018 * 8), var3 + (this.field2017 * 64 - this.field2012 * 64) + (this.field2021 * 8 - this.field2019 * 8)}; // L: 42 43 44 - return var4; // L: 45 - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIB)Liw;", - garbageValue = "-36" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 49 - return null; // L: 50 - } else { - int var3 = this.field2014 * 64 - this.field2023 * 64 + (this.field2018 * 8 - this.field2020 * 8) + var1; // L: 52 - int var4 = var2 + (this.field2012 * 64 - this.field2017 * 64) + (this.field2019 * 8 - this.field2021 * 8); // L: 53 - return new Coord(this.field2015, var3, var4); // L: 54 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1313413902" - ) - @Export("read") - public void read(Buffer var1) { - this.field2015 = var1.readUnsignedByte(); // L: 58 - this.field2013 = var1.readUnsignedByte(); // L: 59 - this.field2014 = var1.readUnsignedShort(); // L: 60 - this.field2018 = var1.readUnsignedByte(); // L: 61 - this.field2012 = var1.readUnsignedShort(); // L: 62 - this.field2019 = var1.readUnsignedByte(); // L: 63 - this.field2023 = var1.readUnsignedShort(); // L: 64 - this.field2020 = var1.readUnsignedByte(); // L: 65 - this.field2017 = var1.readUnsignedShort(); // L: 66 - this.field2021 = var1.readUnsignedByte(); // L: 67 - this.method3591(); // L: 68 - } // L: 69 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1129174695" - ) - void method3591() { - } // L: 71 -} diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index a8fe37ca56..040b732904 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -1,185 +1,200 @@ +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("fp") -public class class171 { - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "[Loa;" +@ObfuscatedName("fe") +public class class171 implements WorldMapSection { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1607887237 ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; + int field1997; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -940042015 + ) + int field2002; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1701419305 + ) + int field1999; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 118234657 + ) + int field2006; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1374154033 + ) + int field1998; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1778145223 + ) + int field2005; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 734033743 + ) + int field2003; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 856098009 + ) + int field2004; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -696788433 + ) + int field2000; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1580790943 + ) + int field2001; - @ObfuscatedName("e") + class171() { + } + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-592340813" + descriptor = "(Lfa;I)V", + garbageValue = "206142404" ) - public static int method3614(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0; + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field1998) { + var1.regionLowX = this.field1998; + } + + if (var1.regionHighX < this.field1998) { + var1.regionHighX = this.field1998; + } + + if (var1.regionLowY > this.field2005) { + var1.regionLowY = this.field2005; + } + + if (var1.regionHighY < this.field2005) { + var1.regionHighY = this.field2005; + } + + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIIB)Z", + garbageValue = "1" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field1997 && var1 < this.field1997 + this.field2002) { + return var2 >= (this.field1999 << 6) + (this.field2003 << 3) && var2 <= (this.field1999 << 6) + (this.field2003 << 3) + 7 && var3 >= (this.field2006 << 6) + (this.field2004 << 3) && var3 <= (this.field2006 << 6) + (this.field2004 << 3) + 7; } else { - return var2 == 2 ? 7 - var1 : var0; + return false; } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(DDII)[D", - garbageValue = "-1088637460" + descriptor = "(III)Z", + garbageValue = "2136306285" ) - public static double[] method3616(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; // L: 17 - double[] var6 = new double[var5]; // L: 18 - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - var6[var8] = CollisionMap.method3213((double)var7, var0, var2); // L: 20 - ++var7; // L: 19 - } - - return var6; // L: 22 + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field1998 << 6) + (this.field2000 << 3) && var1 <= (this.field1998 << 6) + (this.field2000 << 3) + 7 && var2 >= (this.field2005 << 6) + (this.field2001 << 3) && var2 <= (this.field2005 << 6) + (this.field2001 << 3) + 7; } - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIILez;II)V", - garbageValue = "671627265" + descriptor = "(IIII)[I", + garbageValue = "634207470" ) - static void method3612(int var0, int var1, int var2, ObjectComposition var3, int var4) { - ObjectSound var5 = new ObjectSound(); // L: 59 - var5.plane = var0; // L: 60 - var5.x = var1 * 128; // L: 61 - var5.y = var2 * 128; // L: 62 - int var6 = var3.sizeX; // L: 63 - int var7 = var3.sizeY; // L: 64 - if (var4 == 1 || var4 == 3) { // L: 65 - var6 = var3.sizeY; // L: 66 - var7 = var3.sizeX; // L: 67 + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; + } else { + int[] var4 = new int[]{var2 + (this.field1998 * 64 - this.field1999 * 64) + (this.field2000 * 8 - this.field2003 * 8), var3 + (this.field2005 * 64 - this.field2006 * 64) + (this.field2001 * 8 - this.field2004 * 8)}; + return var4; } - - var5.field937 = (var6 + var1) * 128; // L: 69 - var5.field944 = (var7 + var2) * 128; // L: 70 - var5.soundEffectId = var3.ambientSoundId; // L: 71 - var5.field939 = var3.field1801 * 128; // L: 72 - var5.field941 = var3.int5; // L: 73 - var5.field943 = var3.int6; // L: 74 - var5.soundEffectIds = var3.soundEffectIds; // L: 75 - if (var3.transforms != null) { // L: 76 - var5.obj = var3; // L: 77 - var5.set(); // L: 78 - } - - ObjectSound.objectSounds.addFirst(var5); // L: 80 - if (var5.soundEffectIds != null) { // L: 81 - var5.field945 = var5.field941 + (int)(Math.random() * (double)(var5.field943 - var5.field941)); - } - - } // L: 82 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1022341437" - ) - public static int[] method3615() { - int[] var0 = new int[KeyHandler.field271]; // L: 249 - - for (int var1 = 0; var1 < KeyHandler.field271; ++var1) { // L: 250 - var0[var1] = KeyHandler.field257[var1]; // L: 251 - } - - return var0; // L: 253 } - @ObfuscatedName("b") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIB)Lij;", + garbageValue = "43" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { + return null; + } else { + int var3 = this.field1999 * 64 - this.field1998 * 64 + (this.field2003 * 8 - this.field2000 * 8) + var1; + int var4 = var2 + (this.field2006 * 64 - this.field2005 * 64) + (this.field2004 * 8 - this.field2001 * 8); + return new Coord(this.field1997, var3, var4); + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnv;I)V", + garbageValue = "342058266" + ) + @Export("read") + public void read(Buffer var1) { + this.field1997 = var1.readUnsignedByte(); + this.field2002 = var1.readUnsignedByte(); + this.field1999 = var1.readUnsignedShort(); + this.field2003 = var1.readUnsignedByte(); + this.field2006 = var1.readUnsignedShort(); + this.field2004 = var1.readUnsignedByte(); + this.field1998 = var1.readUnsignedShort(); + this.field2000 = var1.readUnsignedByte(); + this.field2005 = var1.readUnsignedShort(); + this.field2001 = var1.readUnsignedByte(); + this.method3542(); + } + + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1497317992" + garbageValue = "186697421" ) - public static void method3613() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 177 - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 178 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 179 - } // L: 180 - - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "81" - ) - static boolean method3611() { - return (Client.drawPlayerNames & 4) != 0; // L: 4856 + void method3542() { } - @ObfuscatedName("hl") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-68" + descriptor = "(I)V", + garbageValue = "376137055" ) - static final void method3610() { - PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7678 - var0.importIndex(); // L: 7679 - int var1 = var0.readBits(8); // L: 7680 - int var2; - if (var1 < Client.npcCount) { // L: 7681 - for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7682 - Client.field859[++Client.field783 - 1] = Client.npcIndices[var2]; - } + static void method3555() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); } - if (var1 > Client.npcCount) { // L: 7684 - throw new RuntimeException(""); - } else { - Client.npcCount = 0; // L: 7685 - - for (var2 = 0; var2 < var1; ++var2) { // L: 7686 - int var3 = Client.npcIndices[var2]; // L: 7687 - NPC var4 = Client.npcs[var3]; // L: 7688 - int var5 = var0.readBits(1); // L: 7689 - if (var5 == 0) { // L: 7690 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7691 - var4.npcCycle = Client.cycle; // L: 7692 - } else { - int var6 = var0.readBits(2); // L: 7695 - if (var6 == 0) { // L: 7696 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7697 - var4.npcCycle = Client.cycle; // L: 7698 - Client.field763[++Client.field636 - 1] = var3; // L: 7699 - } else { - int var7; - int var8; - if (var6 == 1) { // L: 7702 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7703 - var4.npcCycle = Client.cycle; // L: 7704 - var7 = var0.readBits(3); // L: 7705 - var4.method2343(var7, (byte)1); // L: 7706 - var8 = var0.readBits(1); // L: 7707 - if (var8 == 1) { // L: 7708 - Client.field763[++Client.field636 - 1] = var3; - } - } else if (var6 == 2) { // L: 7711 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7712 - var4.npcCycle = Client.cycle; // L: 7713 - var7 = var0.readBits(3); // L: 7714 - var4.method2343(var7, (byte)2); // L: 7715 - var8 = var0.readBits(3); // L: 7716 - var4.method2343(var8, (byte)2); // L: 7717 - int var9 = var0.readBits(1); // L: 7718 - if (var9 == 1) { - Client.field763[++Client.field636 - 1] = var3; // L: 7719 - } - } else if (var6 == 3) { // L: 7722 - Client.field859[++Client.field783 - 1] = var3; // L: 7723 - } - } - } - } + } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIIZIB)J", + garbageValue = "-27" + ) + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; } - } // L: 7727 + + return var5; + } } diff --git a/runescape-client/src/main/java/class172.java b/runescape-client/src/main/java/class172.java new file mode 100644 index 0000000000..8bb6a2ae03 --- /dev/null +++ b/runescape-client/src/main/java/class172.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fm") +public class class172 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; +} diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java deleted file mode 100644 index d05efccdb8..0000000000 --- a/runescape-client/src/main/java/class18.java +++ /dev/null @@ -1,226 +0,0 @@ -import java.awt.Component; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("q") -public class class18 extends class14 { - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1954969381 - ) - int field144; - @ObfuscatedName("e") - boolean field145; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class18(class2 var1) { - this.this$0 = var1; - this.field144 = -1; // L: 178 - } // L: 181 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field144 = var1.readUnsignedShort(); // L: 184 - this.field145 = var1.readUnsignedByte() == 1; // L: 185 - } // L: 186 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method133(this.field144, this.field145); // L: 189 - } // L: 190 - - @ObfuscatedName("f") - public static final void method272(long var0) { - if (var0 > 0L) { // L: 9 - if (var0 % 10L == 0L) { // L: 10 - long var2 = var0 - 1L; // L: 11 - - try { - Thread.sleep(var2); // L: 14 - } catch (InterruptedException var8) { // L: 16 - } - - try { - Thread.sleep(1L); // L: 20 - } catch (InterruptedException var7) { // L: 22 - } - } else { - try { - Thread.sleep(var0); // L: 27 - } catch (InterruptedException var6) { // L: 29 - } - } - - } - } // L: 31 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-118293038" - ) - static void method275(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 161 - var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 162 - KeyHandler.field268 = -1; // L: 163 - } // L: 164 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "4" - ) - public static boolean method271(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 239 240 - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1866300199" - ) - static int method262(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2015 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2016 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2017 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2018 - EnumComposition var10 = TextureProvider.getEnum(var3); // L: 2019 - if (var10.outputType != 's') { // L: 2020 - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2021 - if (var9 == var10.keys[var6]) { // L: 2022 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2023 - var10 = null; // L: 2024 - break; - } - } - - if (var10 != null) { // L: 2028 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; // L: 2029 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 2031 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2057 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2058 - EnumComposition var4 = TextureProvider.getEnum(var3); // L: 2059 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.size(); // L: 2060 - return 1; // L: 2061 - } else { - return 2; // L: 2063 - } - } else { - ChatChannel.Interpreter_intStackSize -= 4; // L: 2032 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2033 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2034 - int var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2035 - var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 2036 - EnumComposition var7 = TextureProvider.getEnum(var5); // L: 2037 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2038 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2043 - if (var6 == var7.keys[var8]) { // L: 2044 - if (var9 == 115) { // L: 2045 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2046 - } - - var7 = null; // L: 2047 - break; - } - } - - if (var7 != null) { // L: 2051 - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.defaultStr; // L: 2052 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2053 - } - } - - return 1; // L: 2055 - } else { - if (var9 == 115) { // L: 2039 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2040 - } - - return 1; // L: 2041 - } - } - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(Liv;IIIIIII)V", - garbageValue = "1257309508" - ) - static final void method273(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field689) { // L: 10001 - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; // L: 10002 - } - - Client.field689 = false; // L: 10003 - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10004 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10005 - var0.scrollY -= 4; // L: 10006 - Script.invalidateWidget(var0); // L: 10007 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10009 - var0.scrollY += 4; // L: 10010 - Script.invalidateWidget(var0); // L: 10011 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10013 - var7 = var3 * (var3 - 32) / var4; // L: 10014 - if (var7 < 8) { // L: 10015 - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; // L: 10016 - int var9 = var3 - 32 - var7; // L: 10017 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 10018 - Script.invalidateWidget(var0); // L: 10019 - Client.field689 = true; // L: 10020 - } - } - - if (Client.mouseWheelRotation != 0) { // L: 10023 - var7 = var0.width; // L: 10024 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10025 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 10026 - Script.invalidateWidget(var0); // L: 10027 - } - } - - } // L: 10030 -} diff --git a/runescape-client/src/main/java/class180.java b/runescape-client/src/main/java/class180.java deleted file mode 100644 index a9975c5c1a..0000000000 --- a/runescape-client/src/main/java/class180.java +++ /dev/null @@ -1,33 +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 class180 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lfz;" - ) - static final class180 field2102; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lfz;" - ) - static final class180 field2103; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1733060335 - ) - @Export("value") - final int value; - - static { - field2102 = new class180(0); // L: 4 - field2103 = new class180(1); // L: 5 - } - - class180(int var1) { - this.value = var1; // L: 9 - } // L: 10 -} diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java new file mode 100644 index 0000000000..018e8fb79c --- /dev/null +++ b/runescape-client/src/main/java/class181.java @@ -0,0 +1,78 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fd") +public class class181 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lfd;" + ) + static final class181 field2090; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lfd;" + ) + static final class181 field2089; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lab;" + ) + @Export("pcmPlayerProvider") + static PlayerProvider pcmPlayerProvider; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1062557713 + ) + @Export("value") + final int value; + + static { + field2090 = new class181(0); + field2089 = new class181(1); + } + + class181(int var1) { + this.value = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-1548438368" + ) + public static String method3651(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var10 = var0[var1]; + return var10 == null ? "null" : var10.toString(); + } else { + int var3 = var2 + var1; + int var4 = 0; + + for (int var5 = var1; var5 < var3; ++var5) { + CharSequence var9 = var0[var5]; + if (var9 == null) { + var4 += 4; + } else { + var4 += var9.length(); + } + } + + StringBuilder var8 = new StringBuilder(var4); + + for (int var6 = var1; var6 < var3; ++var6) { + CharSequence var7 = var0[var6]; + if (var7 == null) { + var8.append("null"); + } else { + var8.append(var7); + } + } + + return var8.toString(); + } + } +} diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java deleted file mode 100644 index 105c39e1c0..0000000000 --- a/runescape-client/src/main/java/class182.java +++ /dev/null @@ -1,17 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gl") -public class class182 { - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = -4548001499872116191L - ) - static long field2113; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - static StudioGame field2114; -} diff --git a/runescape-client/src/main/java/class183.java b/runescape-client/src/main/java/class183.java new file mode 100644 index 0000000000..3abce6980a --- /dev/null +++ b/runescape-client/src/main/java/class183.java @@ -0,0 +1,129 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gk") +public class class183 { + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1734195799" + ) + static final boolean method3659() { + return ViewportMouse.ViewportMouse_isInViewport; + } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "2027214543" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ObjectSound.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + UserComparator10.runScriptEvent(var6); + } + + boolean var11 = true; + if (var5.contentType > 0) { + var11 = class376.method6560(var5); + } + + if (var11) { + int var8 = MusicPatchNode.getWidgetFlags(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { + PacketBufferNode var10; + if (var0 == 1) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 2) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2644, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 3) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 4) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 5) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 6) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 7) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 8) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2607, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 9) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 10) { + var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2570, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + } + } + } + } +} diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java deleted file mode 100644 index 105974bdcf..0000000000 --- a/runescape-client/src/main/java/class19.java +++ /dev/null @@ -1,263 +0,0 @@ -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("s") -public class class19 { - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = 2755229533790487225L - ) - long field155; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = -2197636962351973129L - ) - long field152; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - IterableNodeDeque field153; - - @ObfuscatedSignature( - descriptor = "(Lnt;)V" - ) - public class19(Buffer var1) { - this.field152 = -1L; // L: 9 - this.field153 = new IterableNodeDeque(); // L: 10 - this.method277(var1); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1965655263" - ) - void method277(Buffer var1) { - this.field155 = var1.readLong(); - this.field152 = var1.readLong(); - - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 24 35 - Object var3; - if (var2 == 1) { - var3 = new class12(this); - } else if (var2 == 4) { - var3 = new class7(this); // L: 28 - } else if (var2 == 3) { - var3 = new class5(this); - } else if (var2 == 2) { // L: 30 - var3 = new class20(this); - } else { - if (var2 != 5) { // L: 31 - throw new RuntimeException(""); // L: 32 - } - - var3 = new class25(this); - } - - ((class16)var3).vmethod331(var1); // L: 33 - this.field153.addFirst((Node)var3); // L: 34 - } - - } // L: 37 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ly;I)V", - garbageValue = "-11264917" - ) - public void method278(ClanChannel var1) { - if (var1.key == this.field155 && var1.field25 == this.field152) { // L: 40 - for (class16 var2 = (class16)this.field153.last(); var2 != null; var2 = (class16)this.field153.previous()) { // L: 41 - var2.vmethod332(var1); // L: 42 - } - - ++var1.field25; // L: 44 - } else { - throw new RuntimeException(""); - } - } // L: 45 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;Lmo;I)Lmo;", - garbageValue = "1921289241" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 - int var3; - if (var1 == null) { // L: 17 - var3 = UrlRequester.method2504(var2); // L: 18 - var1 = new IterableNodeHashTable(var3); // L: 19 - } - - for (var3 = 0; var3 < var2; ++var3) { // L: 21 - boolean var4 = var0.readUnsignedByte() == 1; // L: 22 - int var5 = var0.readMedium(); // L: 23 - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25 - } else { - var6 = new IntegerNode(var0.readInt()); // L: 26 - } - - var1.put((Node)var6, (long)var5); // L: 27 - } - - return var1; // L: 29 - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "6" - ) - static int method276(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3571 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3572 - Client.field876 = (short)ScriptFrame.method1233(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]); // L: 3573 - if (Client.field876 <= 0) { // L: 3574 - Client.field876 = 256; - } - - Client.field877 = (short)ScriptFrame.method1233(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 3575 - if (Client.field877 <= 0) { // L: 3576 - Client.field877 = 256; - } - - return 1; // L: 3577 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3579 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3580 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3581 - if (Client.zoomHeight <= 0) { // L: 3582 - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3583 - if (Client.zoomWidth <= 0) { // L: 3584 - Client.zoomWidth = 320; - } - - return 1; // L: 3585 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3587 - ChatChannel.Interpreter_intStackSize -= 4; // L: 3588 - Client.field880 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3589 - if (Client.field880 <= 0) { // L: 3590 - Client.field880 = 1; - } - - Client.field864 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3591 - if (Client.field864 <= 0) { // L: 3592 - Client.field864 = 32767; - } else if (Client.field864 < Client.field880) { // L: 3593 - Client.field864 = Client.field880; - } - - Client.field881 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 3594 - if (Client.field881 <= 0) { // L: 3595 - Client.field881 = 1; - } - - Client.field690 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 3596 - if (Client.field690 <= 0) { // L: 3597 - Client.field690 = 32767; - } else if (Client.field690 < Client.field881) { // L: 3598 - Client.field690 = Client.field881; - } - - return 1; // L: 3599 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3601 - if (Client.viewportWidget != null) { // L: 3602 - Interpreter.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3603 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3604 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3605 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3608 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3609 - } - - return 1; // L: 3611 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3613 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3614 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3615 - return 1; // L: 3616 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3618 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class17.method258(Client.field876); // L: 3619 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class17.method258(Client.field877); // L: 3620 - return 1; // L: 3621 - } else if (var0 == 6220) { // L: 3623 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3624 - return 1; // L: 3625 - } else if (var0 == 6221) { // L: 3627 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3628 - return 1; // L: 3629 - } else if (var0 == 6222) { // L: 3631 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AttackOption.canvasWidth; // L: 3632 - return 1; // L: 3633 - } else if (var0 == 6223) { // L: 3635 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class0.canvasHeight; // L: 3636 - return 1; // L: 3637 - } else { - return 2; // L: 3639 - } - } - - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1156700824" - ) - static final void method281(boolean var0) { - if (var0) { // L: 3181 - Client.field656 = Login.field1022 ? class126.field1472 : class126.field1471; // L: 3182 - } else { - Client.field656 = class4.clientPreferences.parameters.containsKey(class125.method2586(Login.Login_username)) ? class126.field1478 : class126.field1475; // L: 3185 - } - - } // L: 3187 - - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2012334489" - ) - static void method282() { - if (class80.worldMap != null) { // L: 4364 - class80.worldMap.method6287(SoundSystem.Client_plane, (class262.localPlayer.x >> 7) + class15.baseX, (class262.localPlayer.y >> 7) + WorldMapSprite.baseY, false); // L: 4365 - class80.worldMap.loadCache(); // L: 4366 - } - - } // L: 4368 - - @ObfuscatedName("lf") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-1620053364" - ) - static String method283(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 11574 - if (Client.gameBuild == 1) { // L: 11575 - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 11576 - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 11577 - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 11578 - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 11579 - var0 = "local"; - } - - String var3 = ""; // L: 11580 - if (Messages.field1397 != null) { // L: 11581 - var3 = "/p=" + Messages.field1397; - } - - String var4 = "runescape.com"; // L: 11582 - return var2 + var0 + "." + var4 + "/l=" + AbstractArchive.clientLanguage + "/a=" + class82.field999 + var3 + "/"; // L: 11583 - } -} diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 2e807c6c38..7467308557 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,126 +1,5 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("v") -public class class2 { - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1819318139 - ) - static int field20; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -5109163209193777569L - ) - long field18; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1849981899 - ) - int field13; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - IterableNodeDeque field14; - - @ObfuscatedSignature( - descriptor = "(Lnt;)V" - ) - public class2(Buffer var1) { - this.field13 = -1; // L: 9 - this.field14 = new IterableNodeDeque(); // L: 10 - this.method23(var1); // L: 28 - } // L: 29 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "834353065" - ) - void method23(Buffer var1) { - this.field18 = var1.readLong(); // L: 32 - this.field13 = var1.readInt(); // L: 33 - - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 - Object var3; - if (var2 == 3) { // L: 37 - var3 = new class13(this); - } else if (var2 == 1) { // L: 38 - var3 = new class8(this); - } else if (var2 == 13) { // L: 39 - var3 = new class26(this); - } else if (var2 == 4) { // L: 40 - var3 = new class17(this); - } else if (var2 == 6) { - var3 = new class10(this); // L: 41 - } else if (var2 == 5) { // L: 42 - var3 = new class22(this); - } else if (var2 == 2) { // L: 43 - var3 = new class23(this); - } else if (var2 == 7) { // L: 44 - var3 = new class21(this); - } else if (var2 == 14) { // L: 45 - var3 = new class18(this); - } else if (var2 == 8) { // L: 46 - var3 = new class6(this); - } else if (var2 == 9) { // L: 47 - var3 = new class0(this); - } else if (var2 == 10) { // L: 48 - var3 = new class4(this); - } else if (var2 == 11) { // L: 49 - var3 = new class1(this); - } else if (var2 == 12) { // L: 50 - var3 = new class15(this); - } else { - if (var2 != 15) { // L: 51 - throw new RuntimeException(""); // L: 52 - } - - var3 = new class27(this); - } - - ((class14)var3).vmethod363(var1); // L: 53 - this.field14.addFirst((Node)var3); // L: 54 - } - - } // L: 57 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;B)V", - garbageValue = "-59" - ) - public void method24(ClanSettings var1) { - if (var1.field82 == this.field18 && this.field13 == var1.field83) { // L: 60 - for (class14 var2 = (class14)this.field14.last(); var2 != null; var2 = (class14)this.field14.previous()) { // L: 61 - var2.vmethod354(var1); // L: 62 - } - - ++var1.field83; // L: 64 - } else { - throw new RuntimeException(""); - } - } // L: 65 - - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "8" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - PcmPlayer.logOut(); // L: 3151 - switch(var0) { // L: 3152 - case 1: - Login.loginIndex = 24; // L: 3156 - CollisionMap.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3157 - break; - case 2: - GameObject.method4432(); // L: 3163 - } - - } // L: 3167 +public interface class2 { } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java deleted file mode 100644 index 867facfd36..0000000000 --- a/runescape-client/src/main/java/class20.java +++ /dev/null @@ -1,163 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("p") -public class class20 extends class16 { - @ObfuscatedName("ru") - @ObfuscatedGetter( - intValue = -114026065 - ) - static int field166; - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "[Loa;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("ox") - @ObfuscatedSignature( - descriptor = "Ldf;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 468630141 - ) - int field162; - @ObfuscatedName("e") - byte field163; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 658289705 - ) - int field161; - @ObfuscatedName("y") - String field164; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ls;" - ) - final class19 this$0; - - @ObfuscatedSignature( - descriptor = "(Ls;)V" - ) - class20(class19 var1) { - this.this$0 = var1; - this.field162 = -1; // L: 100 - } // L: 105 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "851460888" - ) - void vmethod331(Buffer var1) { - this.field162 = var1.readUnsignedShort(); // L: 108 - this.field163 = var1.readByte(); // L: 109 - this.field161 = var1.readUnsignedShort(); // L: 110 - var1.readLong(); // L: 111 - this.field164 = var1.readStringCp1252NullTerminated(); // L: 112 - } // L: 113 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ly;I)V", - garbageValue = "-1362614343" - ) - void vmethod332(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field162); // L: 116 - var2.rank = this.field163; // L: 117 - var2.world = this.field161; // L: 118 - var2.name = this.field164; // L: 119 - } // L: 120 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "-8931" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { // L: 216 - return true; - } else if (!AttackOption.Widget_archive.tryLoadGroup(var0)) { // L: 217 - return false; - } else { - int var1 = AttackOption.Widget_archive.getGroupFileCount(var0); // L: 218 - if (var1 == 0) { // L: 219 - Widget.Widget_loadedInterfaces[var0] = true; // L: 220 - return true; // L: 221 - } else { - if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] == null) { // L: 223 - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { // L: 224 - if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] == null) { // L: 225 - byte[] var3 = AttackOption.Widget_archive.takeFile(var0, var2); // L: 226 - if (var3 != null) { // L: 227 - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 228 - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 229 - if (var3[0] == -1) { // L: 230 - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 231 - } - } - } - } - - Widget.Widget_loadedInterfaces[var0] = true; // L: 235 - return true; // L: 236 - } - } - } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-11" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 8796 - Widget var0 = class17.getWidgetChild(class15.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8797 - if (var0 != null && var0.onTargetLeave != null) { // L: 8798 - ScriptEvent var1 = new ScriptEvent(); // L: 8799 - var1.widget = var0; // L: 8800 - var1.args = var0.onTargetLeave; // L: 8801 - WorldMapSection1.runScriptEvent(var1); // L: 8802 - } - - Client.field634 = -1; // L: 8804 - Client.isSpellSelected = false; // L: 8805 - Script.invalidateWidget(var0); // L: 8806 - } - } // L: 8807 - - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1886471303" - ) - static final void method288() { - PacketBufferNode var0 = InterfaceParent.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); // L: 11242 - Client.packetWriter.addNode(var0); // L: 11243 - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11244 - if (var1.type == 0 || var1.type == 3) { // L: 11245 - InvDefinition.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { // L: 11247 - Script.invalidateWidget(Client.meslayerContinueWidget); // L: 11248 - Client.meslayerContinueWidget = null; // L: 11249 - } - - } // L: 11251 -} diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java deleted file mode 100644 index ee8f6e7e64..0000000000 --- a/runescape-client/src/main/java/class21.java +++ /dev/null @@ -1,658 +0,0 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("c") -public class class21 extends class14 { - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 688651321 - ) - static int field180; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 619101743 - ) - static int field171; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -293151227 - ) - int field179; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 64877513 - ) - int field174; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 20782795 - ) - int field173; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -462967025 - ) - int field172; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class21(class2 var1) { - this.this$0 = var1; - this.field179 = -1; // L: 158 - } // L: 163 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field179 = var1.readUnsignedShort(); // L: 166 - this.field174 = var1.readInt(); // L: 167 - this.field173 = var1.readUnsignedByte(); // L: 168 - this.field172 = var1.readUnsignedByte(); // L: 169 - } // L: 170 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method128(this.field179, this.field174, this.field173, this.field172); // L: 173 - } // L: 174 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Laa;I)V", - garbageValue = "-863685229" - ) - @Export("doCycleTitle") - static void doCycleTitle(GameEngine var0) { - if (Login.worldSelectOpen) { // L: 204 - WorldMapManager.method3538(var0); // L: 205 - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 208 - class4.clientPreferences.titleMusicDisabled = !class4.clientPreferences.titleMusicDisabled; // L: 209 - Actor.savePreferences(); // L: 210 - if (!class4.clientPreferences.titleMusicDisabled) { // L: 211 - Archive var1 = DynamicObject.archive6; // L: 212 - int var2 = var1.getGroupId("scape main"); // L: 214 - int var3 = var1.getFileId(var2, ""); // L: 215 - class105.method2357(var1, var2, var3, 255, false); // L: 216 - } else { - Decimator.method1169(); // L: 219 - } - } - - if (Client.gameState != 5) { // L: 221 - if (-1L == Login.field1019) { // L: 222 - Login.field1019 = ClientPacket.currentTimeMillis() + 1000L; // L: 223 - } - - long var16 = ClientPacket.currentTimeMillis(); // L: 225 - boolean var24; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 228 - while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 232 - var24 = true; // L: 240 - break; - } - - ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 233 - if (!var4.isLoaded()) { // L: 234 - var24 = false; // L: 235 - break; // L: 236 - } - - ++Client.archiveLoadersDone; // L: 238 - } - } else { - var24 = true; // L: 229 - } - - if (var24 && -1L == Login.field1031) { // L: 242 243 - Login.field1031 = var16; // L: 244 - if (Login.field1031 > Login.field1019) { // L: 245 - Login.field1019 = Login.field1031; // L: 246 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 250 - int var18; - if (AbstractArchive.clientLanguage == Language.Language_EN) { // L: 251 - if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 252 - var18 = Login.xPadding + 5; // L: 253 - short var5 = 463; // L: 254 - byte var6 = 100; // L: 255 - byte var7 = 35; // L: 256 - if (MouseHandler.MouseHandler_lastPressedX >= var18 && MouseHandler.MouseHandler_lastPressedX <= var6 + var18 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 257 - if (FaceNormal.loadWorlds()) { // L: 259 - Login.worldSelectOpen = true; // L: 260 - Login.worldSelectPage = 0; // L: 261 - Login.worldSelectPagesCount = 0; // L: 262 - } - - return; // L: 265 - } - } - - if (World.World_request != null) { // L: 268 - ScriptFrame.method1231(); - } - } - - var18 = MouseHandler.MouseHandler_lastButton; // L: 270 - int var25 = MouseHandler.MouseHandler_lastPressedX; // L: 271 - int var26 = MouseHandler.MouseHandler_lastPressedY; // L: 272 - if (var18 == 0) { // L: 273 - var25 = MouseHandler.MouseHandler_x; // L: 274 - var26 = MouseHandler.MouseHandler_y; // L: 275 - } - - if (!UserComparator3.mouseCam && var18 == 4) { // L: 277 - var18 = 1; - } - - short var29; - int var30; - if (Login.loginIndex == 0) { // L: 278 - boolean var35 = false; // L: 279 - - while (SecureRandomCallable.isKeyDown()) { // L: 280 - if (SoundCache.field446 == 84) { // L: 281 - var35 = true; // L: 282 - } - } - - var30 = class25.loginBoxCenter - 80; // L: 285 - var29 = 291; // L: 286 - if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 287 - AttackOption.openURL(class19.method283("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 288 - } - - var30 = class25.loginBoxCenter + 80; // L: 290 - if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20 || var35) { // L: 291 - if ((Client.worldProperties & 33554432) != 0) { // L: 292 - Login.Login_response0 = ""; // L: 293 - Login.Login_response1 = "This is a Beta world."; // L: 294 - Login.Login_response2 = "Your normal account will not be affected."; // L: 295 - Login.Login_response3 = ""; // L: 296 - Login.loginIndex = 1; // L: 297 - GameObject.method4433(); // L: 298 - } else if ((Client.worldProperties & 4) != 0) { // L: 300 - if ((Client.worldProperties & 1024) != 0) { // L: 301 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 302 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 303 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 304 - } else { - Login.Login_response1 = "This is a PvP world."; // L: 307 - Login.Login_response2 = "Players can attack each other"; // L: 308 - Login.Login_response3 = "almost everywhere."; // L: 309 - } - - Login.Login_response0 = "Warning!"; // L: 311 - Login.loginIndex = 1; // L: 312 - GameObject.method4433(); // L: 313 - } else if ((Client.worldProperties & 1024) != 0) { // L: 315 - Login.Login_response1 = "This is a High Risk world."; // L: 316 - Login.Login_response2 = "The Protect Item prayer will"; // L: 317 - Login.Login_response3 = "not work on this world."; // L: 318 - Login.Login_response0 = "Warning!"; // L: 319 - Login.loginIndex = 1; // L: 320 - GameObject.method4433(); // L: 321 - } else { - class69.Login_promptCredentials(false); // L: 324 - } - } - } else { - short var8; - int var27; - if (Login.loginIndex == 1) { // L: 328 - while (true) { - if (!SecureRandomCallable.isKeyDown()) { // L: 329 - var27 = class25.loginBoxCenter - 80; // L: 337 - var8 = 321; // L: 338 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 339 - class69.Login_promptCredentials(false); // L: 340 - } - - var27 = class25.loginBoxCenter + 80; // L: 342 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 343 - Login.loginIndex = 0; // L: 344 - } - break; - } - - if (SoundCache.field446 == 84) { // L: 330 - class69.Login_promptCredentials(false); // L: 331 - } else if (SoundCache.field446 == 13) { // L: 333 - Login.loginIndex = 0; // L: 334 - } - } - } else { - int var11; - short var28; - if (Login.loginIndex == 2) { // L: 347 - var28 = 201; // L: 348 - var27 = var28 + 52; // L: 349 - if (var18 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 350 - Login.currentLoginField = 0; - } - - var27 += 15; // L: 351 - if (var18 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 352 - Login.currentLoginField = 1; - } - - var27 += 15; // L: 353 - var28 = 361; // L: 354 - if (Client.field903 != null) { // L: 355 - var30 = Client.field903.highX / 2; // L: 356 - if (var18 == 1 && var25 >= Client.field903.lowX - var30 && var25 <= var30 + Client.field903.lowX && var26 >= var28 - 15 && var26 < var28) { // L: 357 - switch(Login.field1012) { // L: 358 - case 1: - CollisionMap.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 361 - Login.loginIndex = 5; // L: 362 - return; // L: 363 - case 2: - AttackOption.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 367 - } - } - } - - var30 = class25.loginBoxCenter - 80; // L: 373 - var29 = 321; // L: 374 - if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 375 - Login.Login_username = Login.Login_username.trim(); // L: 376 - if (Login.Login_username.length() == 0) { // L: 377 - CollisionMap.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 378 - return; // L: 379 - } - - if (Login.Login_password.length() == 0) { // L: 381 - CollisionMap.setLoginResponseString("", "Please enter your password.", ""); // L: 382 - return; // L: 383 - } - - CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 385 - class19.method281(false); // L: 386 - Projectile.updateGameState(20); // L: 387 - return; // L: 388 - } - - var30 = Login.loginBoxX + 180 + 80; // L: 390 - if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 391 - Login.loginIndex = 0; // L: 392 - Login.Login_username = ""; // L: 393 - Login.Login_password = ""; // L: 394 - class0.field2 = 0; // L: 395 - ItemLayer.otp = ""; // L: 396 - Login.field1022 = true; // L: 397 - } - - var30 = class25.loginBoxCenter + -117; // L: 399 - var29 = 277; // L: 400 - Login.field1006 = var25 >= var30 && var25 < var30 + class126.field1477 && var26 >= var29 && var26 < var29 + PcmPlayer.field416; // L: 401 - if (var18 == 1 && Login.field1006) { // L: 402 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 403 - if (!Client.Login_isUsernameRemembered && class4.clientPreferences.rememberedUsername != null) { // L: 404 - class4.clientPreferences.rememberedUsername = null; // L: 405 - Actor.savePreferences(); // L: 406 - } - } - - var30 = class25.loginBoxCenter + 24; // L: 409 - var29 = 277; // L: 410 - Login.field1021 = var25 >= var30 && var25 < var30 + class126.field1477 && var26 >= var29 && var26 < var29 + PcmPlayer.field416; // L: 411 - if (var18 == 1 && Login.field1021) { // L: 412 - class4.clientPreferences.hideUsername = !class4.clientPreferences.hideUsername; // L: 413 - if (!class4.clientPreferences.hideUsername) { // L: 414 - Login.Login_username = ""; // L: 415 - class4.clientPreferences.rememberedUsername = null; // L: 416 - GameObject.method4433(); // L: 417 - } - - Actor.savePreferences(); // L: 419 - } - - while (true) { - Transferable var20; - int var33; - do { - while (true) { - label903: - do { - while (true) { - while (SecureRandomCallable.isKeyDown()) { // L: 421 - if (SoundCache.field446 != 13) { // L: 422 - if (Login.currentLoginField != 0) { // L: 431 - continue label903; - } - - char var32 = Timer.field3780; // L: 432 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var32 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 434 435 - } - - if (SoundCache.field446 == 85 && Login.Login_username.length() > 0) { // L: 438 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (SoundCache.field446 == 84 || SoundCache.field446 == 80) { // L: 439 - Login.currentLoginField = 1; - } - - char var12 = Timer.field3780; // L: 441 - boolean var34 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var12) != -1; // L: 443 - if (var34 && Login.Login_username.length() < 320) { // L: 445 - Login.Login_username = Login.Login_username + Timer.field3780; - } - } else { - Login.loginIndex = 0; // L: 423 - Login.Login_username = ""; // L: 424 - Login.Login_password = ""; // L: 425 - class0.field2 = 0; // L: 426 - ItemLayer.otp = ""; // L: 427 - Login.field1022 = true; // L: 428 - } - } - - return; // L: 686 - } - } while(Login.currentLoginField != 1); // L: 447 - - if (SoundCache.field446 == 85 && Login.Login_password.length() > 0) { // L: 448 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 449 - } else if (SoundCache.field446 == 84 || SoundCache.field446 == 80) { // L: 451 - Login.currentLoginField = 0; // L: 452 - if (SoundCache.field446 == 84) { // L: 453 - Login.Login_username = Login.Login_username.trim(); // L: 454 - if (Login.Login_username.length() == 0) { // L: 455 - CollisionMap.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 456 - return; // L: 457 - } - - if (Login.Login_password.length() == 0) { // L: 459 - CollisionMap.setLoginResponseString("", "Please enter your password.", ""); // L: 460 - return; // L: 461 - } - - CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 463 - class19.method281(false); // L: 464 - Projectile.updateGameState(20); // L: 465 - return; // L: 466 - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && SoundCache.field446 == 67) { // L: 469 - Clipboard var19 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 470 - var20 = var19.getContents(class1.client); // L: 471 - var33 = 20 - Login.Login_password.length(); // L: 472 - break; - } - - if (ItemContainer.method2181(Timer.field3780) && PacketWriter.method2496(Timer.field3780) && Login.Login_password.length() < 20) { // L: 489 - Login.Login_password = Login.Login_password + Timer.field3780; // L: 490 - } - } - } while(var33 <= 0); // L: 473 - - try { - String var13 = (String)var20.getTransferData(DataFlavor.stringFlavor); // L: 475 - int var14 = Math.min(var33, var13.length()); // L: 476 - - for (int var15 = 0; var15 < var14; ++var15) { // L: 477 - if (!ItemContainer.method2181(var13.charAt(var15)) || !PacketWriter.method2496(var13.charAt(var15))) { // L: 478 - Login.loginIndex = 3; // L: 479 - return; // L: 480 - } - } - - Login.Login_password = Login.Login_password + var13.substring(0, var14); // L: 483 - } catch (UnsupportedFlavorException var22) { // L: 485 - } catch (IOException var23) { // L: 486 - } - } - } else if (Login.loginIndex == 3) { // L: 496 - var27 = Login.loginBoxX + 180; // L: 497 - var8 = 276; // L: 498 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 499 - class69.Login_promptCredentials(false); // L: 500 - } - - var27 = Login.loginBoxX + 180; // L: 502 - var8 = 326; // L: 503 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 504 - CollisionMap.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 505 - Login.loginIndex = 5; // L: 506 - return; // L: 507 - } - } else { - int var10; - if (Login.loginIndex == 4) { // L: 510 - var27 = Login.loginBoxX + 180 - 80; // L: 511 - var8 = 321; // L: 512 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 513 - ItemLayer.otp.trim(); // L: 514 - if (ItemLayer.otp.length() != 6) { // L: 515 - CollisionMap.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 516 - return; // L: 517 - } - - class0.field2 = Integer.parseInt(ItemLayer.otp); // L: 519 - ItemLayer.otp = ""; // L: 520 - class19.method281(true); // L: 521 - CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 522 - Projectile.updateGameState(20); // L: 523 - return; // L: 524 - } - - if (var18 == 1 && var25 >= Login.loginBoxX + 180 - 9 && var25 <= Login.loginBoxX + 180 + 130 && var26 >= 263 && var26 <= 296) { // L: 526 - Login.field1022 = !Login.field1022; // L: 527 - } - - if (var18 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var26 >= 351 && var26 <= 363) { // L: 529 - AttackOption.openURL(class19.method283("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 530 - } - - var27 = Login.loginBoxX + 180 + 80; // L: 532 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 533 - Login.loginIndex = 0; // L: 534 - Login.Login_username = ""; // L: 535 - Login.Login_password = ""; // L: 536 - class0.field2 = 0; // L: 537 - ItemLayer.otp = ""; // L: 538 - } - - while (SecureRandomCallable.isKeyDown()) { // L: 540 - boolean var9 = false; // L: 541 - - for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 542 - if (Timer.field3780 == "1234567890".charAt(var10)) { // L: 543 - var9 = true; // L: 544 - break; // L: 545 - } - } - - if (SoundCache.field446 == 13) { // L: 548 - Login.loginIndex = 0; // L: 549 - Login.Login_username = ""; // L: 550 - Login.Login_password = ""; // L: 551 - class0.field2 = 0; // L: 552 - ItemLayer.otp = ""; // L: 553 - } else { - if (SoundCache.field446 == 85 && ItemLayer.otp.length() > 0) { // L: 556 - ItemLayer.otp = ItemLayer.otp.substring(0, ItemLayer.otp.length() - 1); - } - - if (SoundCache.field446 == 84) { // L: 557 - ItemLayer.otp.trim(); // L: 558 - if (ItemLayer.otp.length() != 6) { // L: 559 - CollisionMap.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 560 - return; // L: 561 - } - - class0.field2 = Integer.parseInt(ItemLayer.otp); // L: 563 - ItemLayer.otp = ""; // L: 564 - class19.method281(true); // L: 565 - CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 566 - Projectile.updateGameState(20); // L: 567 - return; // L: 568 - } - - if (var9 && ItemLayer.otp.length() < 6) { // L: 570 - ItemLayer.otp = ItemLayer.otp + Timer.field3780; - } - } - } - } else if (Login.loginIndex == 5) { // L: 574 - var27 = Login.loginBoxX + 180 - 80; // L: 575 - var8 = 321; // L: 576 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 577 - class143.method2810(); // L: 578 - return; // L: 579 - } - - var27 = Login.loginBoxX + 180 + 80; // L: 581 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 582 - class69.Login_promptCredentials(true); // L: 583 - } - - var29 = 361; // L: 585 - if (DefaultsGroup.field3891 != null) { // L: 586 - var10 = DefaultsGroup.field3891.highX / 2; // L: 587 - if (var18 == 1 && var25 >= DefaultsGroup.field3891.lowX - var10 && var25 <= var10 + DefaultsGroup.field3891.lowX && var26 >= var29 - 15 && var26 < var29) { // L: 588 - AttackOption.openURL(class19.method283("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 589 - } - } - - while (SecureRandomCallable.isKeyDown()) { // L: 592 - boolean var31 = false; // L: 593 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 594 - if (Timer.field3780 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 595 - var31 = true; // L: 596 - break; // L: 597 - } - } - - if (SoundCache.field446 == 13) { // L: 600 - class69.Login_promptCredentials(true); // L: 601 - } else { - if (SoundCache.field446 == 85 && Login.Login_username.length() > 0) { // L: 604 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (SoundCache.field446 == 84) { // L: 605 - class143.method2810(); // L: 606 - return; // L: 607 - } - - if (var31 && Login.Login_username.length() < 320) { // L: 609 - Login.Login_username = Login.Login_username + Timer.field3780; - } - } - } - } else if (Login.loginIndex != 6) { // L: 613 - if (Login.loginIndex == 7) { // L: 624 - var27 = Login.loginBoxX + 180 - 80; // L: 625 - var8 = 321; // L: 626 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 627 - AttackOption.openURL(class19.method283("secure", true) + "m=dob/set_dob.ws", true, false); // L: 628 - CollisionMap.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 629 - Login.loginIndex = 6; // L: 630 - return; // L: 631 - } - - var27 = Login.loginBoxX + 180 + 80; // L: 633 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 634 - class69.Login_promptCredentials(true); // L: 635 - } - } else if (Login.loginIndex == 8) { // L: 638 - var27 = Login.loginBoxX + 180 - 80; // L: 639 - var8 = 321; // L: 640 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 641 - AttackOption.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 642 - CollisionMap.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 643 - Login.loginIndex = 6; // L: 644 - return; // L: 645 - } - - var27 = Login.loginBoxX + 180 + 80; // L: 647 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 648 - class69.Login_promptCredentials(true); // L: 649 - } - } else if (Login.loginIndex == 12) { // L: 652 - String var21 = ""; // L: 653 - switch(Login.field1011) { // L: 654 - case 0: - var21 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 659 - break; // L: 660 - case 1: - var21 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 656 - break; // L: 657 - default: - class69.Login_promptCredentials(false); // L: 662 - } - - var30 = Login.loginBoxX + 180; // L: 665 - var29 = 276; // L: 666 - if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 667 - AttackOption.openURL(var21, true, false); // L: 668 - CollisionMap.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 669 - Login.loginIndex = 6; // L: 670 - return; // L: 671 - } - - var30 = Login.loginBoxX + 180; // L: 673 - var29 = 326; // L: 674 - if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 675 - class69.Login_promptCredentials(false); // L: 676 - } - } else if (Login.loginIndex == 24) { // L: 679 - var27 = Login.loginBoxX + 180; // L: 680 - var8 = 301; // L: 681 - if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 682 - class69.Login_promptCredentials(false); // L: 683 - } - } - } else { - while (true) { - do { - if (!SecureRandomCallable.isKeyDown()) { // L: 614 - var28 = 321; // L: 619 - if (var18 == 1 && var26 >= var28 - 20 && var26 <= var28 + 20) { // L: 620 - class69.Login_promptCredentials(true); // L: 621 - } - - return; - } - } while(SoundCache.field446 != 84 && SoundCache.field446 != 13); // L: 615 - - class69.Login_promptCredentials(true); // L: 616 - } - } - } - } - } - - } - } - } - } // L: 206 -} diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java deleted file mode 100644 index 2af8983a88..0000000000 --- a/runescape-client/src/main/java/class214.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("hi") -public interface class214 extends class216 { -} diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index f7e0b9ab33..4abdcf8bc3 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -1,65 +1,5 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") -public abstract class class215 implements class217 { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lbz;" - ) - @Export("soundCache") - static SoundCache soundCache; - @ObfuscatedName("ag") - static String field2557; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1817479427 - ) - protected int field2559; - - @ObfuscatedSignature( - descriptor = "(Ljl;Lkn;I)V" - ) - protected class215(StudioGame var1, Language var2, int var3) { - this.field2559 = var3; // L: 10 - } // L: 11 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIIB)V", - garbageValue = "-125" - ) - public static void method4434(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { // L: 39 - int var4 = (var3 + var2) / 2; // L: 40 - int var5 = var2; // L: 41 - String var6 = var0[var4]; // L: 42 - var0[var4] = var0[var3]; // L: 43 - var0[var3] = var6; // L: 44 - int var7 = var1[var4]; // L: 45 - var1[var4] = var1[var3]; // L: 46 - var1[var3] = var7; // L: 47 - - for (int var8 = var2; var8 < var3; ++var8) { // L: 48 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 49 - String var9 = var0[var8]; // L: 50 - var0[var8] = var0[var5]; // L: 51 - var0[var5] = var9; // L: 52 - int var10 = var1[var8]; // L: 53 - var1[var8] = var1[var5]; // L: 54 - var1[var5++] = var10; // L: 55 - } - } - - var0[var3] = var0[var5]; // L: 59 - var0[var5] = var6; // L: 60 - var1[var3] = var1[var5]; // L: 61 - var1[var5] = var7; // L: 62 - method4434(var0, var1, var2, var5 - 1); // L: 63 - method4434(var0, var1, var5 + 1, var3); // L: 64 - } - - } // L: 66 +@ObfuscatedName("ht") +public interface class215 extends class217 { } diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java index cd3180e59a..48fdac8369 100644 --- a/runescape-client/src/main/java/class216.java +++ b/runescape-client/src/main/java/class216.java @@ -1,5 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") -public interface class216 { +@ObfuscatedName("hl") +public abstract class class216 implements class218 { + @ObfuscatedName("rq") + @ObfuscatedGetter( + intValue = -1590779813 + ) + static int field2545; + @ObfuscatedName("ey") + @ObfuscatedGetter( + intValue = 2133191631 + ) + static int field2548; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 2027952581 + ) + protected int field2547; + + @ObfuscatedSignature( + descriptor = "(Ljr;Lkq;I)V" + ) + protected class216(StudioGame var1, Language var2, int var3) { + this.field2547 = var3; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "100" + ) + @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; + } } diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java index d41b42da6c..14f81177bb 100644 --- a/runescape-client/src/main/java/class217.java +++ b/runescape-client/src/main/java/class217.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("hc") -public interface class217 extends Iterable { +public interface class217 { } diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java index 3fe83ca896..41e4ec24aa 100644 --- a/runescape-client/src/main/java/class218.java +++ b/runescape-client/src/main/java/class218.java @@ -1,7 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hm") -public interface class218 { - @ObfuscatedName("f") - void method4438(Object var1); +@ObfuscatedName("hy") +public interface class218 extends Iterable { } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java new file mode 100644 index 0000000000..30971a8e9b --- /dev/null +++ b/runescape-client/src/main/java/class219.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("hn") +public interface class219 { + @ObfuscatedName("s") + void method4344(Object var1); +} diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java deleted file mode 100644 index 65368d3706..0000000000 --- a/runescape-client/src/main/java/class22.java +++ /dev/null @@ -1,119 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("n") -public class class22 extends class14 { - @ObfuscatedName("o") - static byte[][][] field186; - @ObfuscatedName("gd") - @ObfuscatedSignature( - descriptor = "Loa;" - ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1693043909 - ) - int field182; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class22(class2 var1) { - this.this$0 = var1; - this.field182 = -1; // L: 114 - } // L: 116 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field182 = var1.readUnsignedShort(); // L: 119 - } // L: 120 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method127(this.field182); // L: 123 - } // L: 124 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "616364541" - ) - static int method306(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75 - if (var1 == null) { // L: 76 - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 77 78 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "-39" - ) - public static String method315(CharSequence var0) { - int var2 = var0.length(); // L: 190 - char[] var3 = new char[var2]; // L: 192 - - for (int var4 = 0; var4 < var2; ++var4) { // L: 193 - var3[var4] = '*'; - } - - String var1 = new String(var3); // L: 194 - return var1; // L: 196 - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", - garbageValue = "-17" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - PacketWriter.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8950 - } // L: 8951 - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-608958445" - ) - static boolean method314(int var0) { - for (int var1 = 0; var1 < Client.field847; ++var1) { // L: 10857 - if (Client.field786[var1] == var0) { // L: 10858 - return true; - } - } - - return false; // L: 10860 - } - - @ObfuscatedName("lj") - @ObfuscatedSignature( - descriptor = "(Liv;I)I", - garbageValue = "1053231968" - ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 11546 - return var1 != null ? var1.integer : var0.flags; // L: 11547 11548 - } -} diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java deleted file mode 100644 index 823bcc1315..0000000000 --- a/runescape-client/src/main/java/class224.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("hz") -public interface class224 { -} diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java new file mode 100644 index 0000000000..abb2953bce --- /dev/null +++ b/runescape-client/src/main/java/class225.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("hm") +public interface class225 { +} diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java deleted file mode 100644 index 6628f3f874..0000000000 --- a/runescape-client/src/main/java/class226.java +++ /dev/null @@ -1,211 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hj") -public class class226 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2688; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2683; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2684; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2692; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2693; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2687; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2686; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2689; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2690; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhj;" - ) - public static final class226 field2691; - - static { - field2688 = new class226(5); // L: 5 - field2683 = new class226(4); // L: 6 - field2684 = new class226(3); // L: 7 - field2692 = new class226(6); // L: 8 - field2693 = new class226(7); // L: 9 - field2687 = new class226(5); // L: 10 - field2686 = new class226(4); - field2689 = new class226(15); - field2690 = new class226(2); - field2691 = new class226(14); - } - - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "5" - ) - class226(int var1) { - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkn;I)I", - garbageValue = "456849187" - ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); // L: 11 - int var4 = var1.length(); // L: 12 - int var5 = 0; // L: 13 - int var6 = 0; // L: 14 - byte var7 = 0; // L: 15 - byte 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 = (char)var7; // L: 24 - boolean var14 = false; // L: 25 - } else { - var9 = var0.charAt(var5++); // L: 27 - } - - char var10; - if (var8 != 0) { // L: 28 - var10 = (char)var8; // L: 29 - boolean var15 = false; // L: 30 - } else { - var10 = var1.charAt(var6++); // L: 32 - } - - byte var11; - if (var9 == 198) { // L: 35 - var11 = 69; // L: 36 - } else if (var9 == 230) { // L: 39 - var11 = 101; // L: 40 - } else if (var9 == 223) { // L: 43 - var11 = 115; // L: 44 - } else if (var9 == 338) { // L: 47 - var11 = 69; // L: 48 - } else if (var9 == 339) { // L: 51 - var11 = 101; // L: 52 - } else { - var11 = 0; // L: 55 - } - - var7 = var11; // L: 57 - byte var12; - if (var10 == 198) { // L: 60 - var12 = 69; // L: 61 - } else if (var10 == 230) { // L: 64 - var12 = 101; // L: 65 - } else if (var10 == 223) { // L: 68 - var12 = 115; // L: 69 - } else if (var10 == 338) { // L: 72 - var12 = 69; // L: 73 - } else if (var10 == 339) { // L: 76 - var12 = 101; // L: 77 - } else { - var12 = 0; // L: 80 - } - - var8 = var12; // L: 82 - var9 = class244.standardizeChar(var9, var2); // L: 83 - var10 = class244.standardizeChar(var10, var2); // L: 84 - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85 - var9 = Character.toLowerCase(var9); // L: 86 - var10 = Character.toLowerCase(var10); // L: 87 - if (var10 != var9) { // L: 88 - return SpotAnimationDefinition.lowercaseChar(var9, var2) - SpotAnimationDefinition.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); // L: 91 - - int var17; - char var20; - for (var17 = 0; var17 < var16; ++var17) { // L: 92 - if (var2 == Language.Language_FR) { // L: 93 - var5 = var3 - 1 - var17; // L: 94 - var6 = var4 - 1 - var17; // L: 95 - } else { - var6 = var17; // L: 97 - var5 = var17; - } - - char var18 = var0.charAt(var5); // L: 98 - var20 = var1.charAt(var6); // L: 99 - if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { // L: 100 - var18 = Character.toLowerCase(var18); // L: 101 - var20 = Character.toLowerCase(var20); // L: 102 - if (var20 != var18) { - return SpotAnimationDefinition.lowercaseChar(var18, var2) - SpotAnimationDefinition.lowercaseChar(var20, var2); // L: 103 - } - } - } - - var17 = var3 - var4; // L: 106 - if (var17 != 0) { // L: 107 - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { // L: 108 - var20 = var0.charAt(var19); // L: 109 - char var13 = var1.charAt(var19); // L: 110 - if (var20 != var13) { // L: 111 - return SpotAnimationDefinition.lowercaseChar(var20, var2) - SpotAnimationDefinition.lowercaseChar(var13, var2); - } - } - - return 0; // L: 113 - } - } - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1374315028" - ) - @Export("updateSoundEffectVolume") - static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11132 - class4.clientPreferences.soundEffectsVolume = var0; // L: 11133 - Actor.savePreferences(); // L: 11134 - } // L: 11135 -} diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java new file mode 100644 index 0000000000..89f1210a33 --- /dev/null +++ b/runescape-client/src/main/java/class227.java @@ -0,0 +1,82 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hv") +public class class227 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2679; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2675; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2678; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2676; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2677; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2680; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2674; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2683; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2681; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final class227 field2682; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1856289655 + ) + static int field2673; + + static { + field2679 = new class227(4); + field2675 = new class227(15); + field2678 = new class227(2); + field2676 = new class227(14); + field2677 = new class227(4); + field2680 = new class227(3); + field2674 = new class227(5); + field2683 = new class227(7); + field2681 = new class227(5); + field2682 = new class227(6); + } + + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "4" + ) + class227(int var1) { + } +} diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java deleted file mode 100644 index eea7049752..0000000000 --- a/runescape-client/src/main/java/class23.java +++ /dev/null @@ -1,81 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("l") -public class class23 extends class14 { - @ObfuscatedName("c") - @Export("operatingSystemName") - public static String operatingSystemName; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 339931933 - ) - int field190; - @ObfuscatedName("e") - byte field189; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class23(class2 var1) { - this.this$0 = var1; - this.field190 = -1; // L: 128 - } // L: 131 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field190 = var1.readUnsignedShort(); // L: 134 - this.field189 = var1.readByte(); // L: 135 - } // L: 136 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method131(this.field190, this.field189); // L: 139 - } // L: 140 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Ler;", - garbageValue = "202044265" - ) - @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 = class125.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("f") - @ObfuscatedSignature( - descriptor = "(I)[Lhl;", - garbageValue = "-2126823269" - ) - static LoginPacket[] method318() { - return new LoginPacket[]{LoginPacket.field2809, LoginPacket.field2804, LoginPacket.field2802, LoginPacket.field2801, LoginPacket.field2806, LoginPacket.field2803}; // L: 22 - } -} diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java deleted file mode 100644 index a32d2645ba..0000000000 --- a/runescape-client/src/main/java/class230.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hq") -public class class230 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("soundEffectsArchive") - static AbstractArchive soundEffectsArchive; - @ObfuscatedName("d") - @Export("Tiles_hue") - static int[] Tiles_hue; -} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index 6788db27ef..fdfee29f5f 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,24 +1,30 @@ -import net.runelite.mapping.Export; +import java.io.IOException; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hr") public class class231 { - @ObfuscatedName("f") - static int[] field2817; - @ObfuscatedName("o") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "24" + ) + static final void method4431(boolean var0) { + class262.playPcmPlayers(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2573, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); - static { - new Object(); - field2817 = new int[33]; // L: 8 - field2817[0] = 0; // L: 11 - int var0 = 2; // L: 12 + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.hadNetworkError = true; + } + } - for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field2817[var1] = var0 - 1; // L: 14 - var0 += var0; // L: 15 } - - } // L: 17 + } } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java new file mode 100644 index 0000000000..da7d942e4b --- /dev/null +++ b/runescape-client/src/main/java/class232.java @@ -0,0 +1,30 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hq") +public class class232 { + @ObfuscatedName("s") + static int[] field2801; + + static { + new Object(); + field2801 = new int[33]; + field2801[0] = 0; + int var0 = 2; + + for (int var1 = 1; var1 < 33; ++var1) { + field2801[var1] = var0 - 1; + var0 += var0; + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-346907916" + ) + public static void method4453() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + } +} diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java deleted file mode 100644 index a41fb4e266..0000000000 --- a/runescape-client/src/main/java/class233.java +++ /dev/null @@ -1,87 +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("hu") -public class class233 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("musicPatchesArchive") - static AbstractArchive musicPatchesArchive; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("musicSamplesArchive") - static AbstractArchive musicSamplesArchive; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1830470507 - ) - @Export("musicPlayerStatus") - public static int musicPlayerStatus; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 737536913 - ) - @Export("musicTrackGroupId") - static int musicTrackGroupId; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 2069397721 - ) - @Export("musicTrackFileId") - static int musicTrackFileId; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1994370717 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - - static { - musicPlayerStatus = 0; // L: 11 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-7" - ) - static void method4541() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 66 - - while (var0.hasNext()) { // L: 71 - Message var1 = (Message)var0.next(); // L: 67 - var1.clearIsFromIgnored(); // L: 69 - } - - } // L: 72 - - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "850" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (UrlRequester.pcmPlayer1 != null) { // L: 3751 - UrlRequester.pcmPlayer1.run(); - } - - if (SoundCache.pcmPlayer0 != null) { // L: 3752 - SoundCache.pcmPlayer0.run(); - } - - } // L: 3753 -} diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java new file mode 100644 index 0000000000..af70e0e9c3 --- /dev/null +++ b/runescape-client/src/main/java/class234.java @@ -0,0 +1,272 @@ +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("ix") +public class class234 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("musicPatchesArchive") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Liv;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1251786971 + ) + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1396376771 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("z") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("gc") + @Export("regions") + static int[] regions; + + static { + musicPlayerStatus = 0; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "-18" + ) + static int method4463(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var3; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 * var3; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else { + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { + Interpreter.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.INVPOW) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; + } + } else if (var0 == ScriptOpcodes.AND) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == ScriptOpcodes.OR) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == ScriptOpcodes.SCALE) { + Interpreter.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); + return 1; + } else if (var0 == ScriptOpcodes.BITCOUNT) { + var3 = class124.method2535(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBarUpdate.method1894(var3, var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class124.method2534(var3, var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = 31 - var5; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; + return 1; + } else if (var0 == 4030) { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3 = class124.method2534(var3, var5, var6); + var7 = class118.method2461(var6 - var5 + 1); + if (var4 > var7) { + var4 = var7; + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; + return 1; + } else if (var0 == 4032) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = AttackOption.method2006(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4033) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = PacketWriter.method2117(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4034) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = class245.method4716(var3, var4); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 == 4035) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); + return 1; + } else { + return 2; + } + } + } +} diff --git a/runescape-client/src/main/java/class24.java b/runescape-client/src/main/java/class24.java deleted file mode 100644 index 6daf3c3af0..0000000000 --- a/runescape-client/src/main/java/class24.java +++ /dev/null @@ -1,18 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("w") -public class class24 { - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 2105932695 - ) - @Export("idxCount") - public static int idxCount; - - @ObfuscatedName("y") - public static boolean method329(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; // L: 60 - } -} diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java deleted file mode 100644 index 77a92a54e6..0000000000 --- a/runescape-client/src/main/java/class244.java +++ /dev/null @@ -1,159 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ip") -public class class244 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("WorldMapElement_archive") - public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1663390297 - ) - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lls;", - garbageValue = "-2119409839" - ) - public static PrivateChatMode method4812(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3885, PrivateChatMode.field3886, PrivateChatMode.field3881}; // L: 18 - PrivateChatMode[] var2 = var1; // L: 20 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 - PrivateChatMode var4 = var2[var3]; // L: 22 - if (var0 == var4.field3884) { // L: 24 - return var4; - } - } - - return null; // L: 28 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(CLkn;I)C", - garbageValue = "-531451700" - ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 117 - if (var0 >= 192 && var0 <= 198) { // L: 118 - return 'A'; - } - - if (var0 == 199) { // L: 119 - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { // L: 120 - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { // L: 121 - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { // L: 122 - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { // L: 123 - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { // L: 124 - return 'U'; - } - - if (var0 == 221) { // L: 125 - return 'Y'; - } - - if (var0 == 223) { // L: 126 - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { // L: 127 - return 'a'; - } - - if (var0 == 231) { // L: 128 - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { // L: 129 - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { // L: 130 - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { // L: 131 - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { // L: 132 - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { // L: 133 - return 'u'; - } - - if (var0 == 253 || var0 == 255) { // L: 134 - return 'y'; - } - } - - if (var0 == 338) { // L: 136 - return 'O'; - } else if (var0 == 339) { // L: 137 - return 'o'; - } else if (var0 == 376) { // L: 138 - return 'Y'; - } else { - return var0; // L: 139 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lns;I)I", - garbageValue = "-2095765890" - ) - static int method4805(PacketBuffer var0) { - int var1 = var0.readBits(2); // L: 189 - int var2; - if (var1 == 0) { // L: 191 - var2 = 0; - } else if (var1 == 1) { // L: 192 - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); // L: 193 - } else { - var2 = var0.readBits(11); // L: 194 - } - - return var2; // L: 195 - } - - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "(Ljf;Ljava/lang/String;S)V", - garbageValue = "128" - ) - static void method4814(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1708 - Client.archiveLoaders.add(var2); // L: 1709 - Client.field898 += var2.groupCount; // L: 1710 - } // L: 1711 -} diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java new file mode 100644 index 0000000000..60430df07d --- /dev/null +++ b/runescape-client/src/main/java/class245.java @@ -0,0 +1,27 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ii") +public class class245 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "2002807406" + ) + public static int method4716(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "535012743" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Huffman.loadInterface(var0)) { + class270.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + } + } +} diff --git a/runescape-client/src/main/java/class246.java b/runescape-client/src/main/java/class246.java deleted file mode 100644 index 074fa68eaa..0000000000 --- a/runescape-client/src/main/java/class246.java +++ /dev/null @@ -1,96 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("in") -public class class246 { - @ObfuscatedName("f") - public static final short[] field2945; - @ObfuscatedName("e") - public static final short[][] field2944; - @ObfuscatedName("v") - public static final short[] field2943; - @ObfuscatedName("y") - public static final short[][] field2946; - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = 1746003047 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - - static { - field2945 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field2944 = 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 - field2943 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field2946 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13 - } - - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "([Liv;IB)V", - garbageValue = "1" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11056 - Widget var3 = var0[var2]; // L: 11057 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class35.isComponentHidden(var3))) { // L: 11058 11059 11060 - if (var3.type == 0) { // L: 11061 - if (!var3.isIf3 && class35.isComponentHidden(var3) && var3 != MusicPatchNode.mousedOverWidgetIf1) { // L: 11062 - continue; - } - - drawModelComponents(var0, var3.id); // L: 11063 - if (var3.children != null) { // L: 11064 - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11065 - if (var4 != null) { // L: 11066 - class25.method330(var4.group); - } - } - - if (var3.type == 6) { // L: 11068 - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11069 - boolean var7 = Friend.runCs1(var3); // L: 11070 - if (var7) { // L: 11072 - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; // L: 11073 - } - - if (var5 != -1) { // L: 11074 - SequenceDefinition var6 = WorldMapScaleHandler.SequenceDefinition_get(var5); // L: 11075 - - for (var3.modelFrameCycle += Client.field683; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; Script.invalidateWidget(var3)) { // L: 11076 11077 11084 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11078 - ++var3.modelFrame; // L: 11079 - if (var3.modelFrame >= var6.frameIds.length) { // L: 11080 - var3.modelFrame -= var6.frameCount; // L: 11081 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11082 - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field2981 != 0 && !var3.isIf3) { // L: 11088 - int var8 = var3.field2981 >> 16; // L: 11089 - var5 = var3.field2981 << 16 >> 16; // L: 11090 - var8 *= Client.field683; // L: 11091 - var5 *= Client.field683; // L: 11092 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11093 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11094 - Script.invalidateWidget(var3); // L: 11095 - } - } - } - } - - } // L: 11099 -} diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java new file mode 100644 index 0000000000..f6409ae737 --- /dev/null +++ b/runescape-client/src/main/java/class247.java @@ -0,0 +1,20 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("iq") +public class class247 { + @ObfuscatedName("s") + public static final short[] field2941; + @ObfuscatedName("t") + public static final short[][] field2943; + @ObfuscatedName("v") + public static final short[] field2940; + @ObfuscatedName("j") + public static final short[][] field2942; + + static { + field2941 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2943 = 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}}; + field2940 = new short[]{-10304, 9104, -1, -1, -1}; + field2942 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; + } +} diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java deleted file mode 100644 index f21f339bb2..0000000000 --- a/runescape-client/src/main/java/class248.java +++ /dev/null @@ -1,50 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ia") -public class class248 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)Lev;", - garbageValue = "16" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57 - if (var1 != null) { // L: 58 - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59 - var1 = new NPCComposition(); // L: 60 - var1.id = var0; // L: 61 - if (var2 != null) { // L: 62 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 63 - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64 - return var1; // L: 65 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1168533546" - ) - static int method4915(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 145 - return class34.NetCache_currentResponse != null && var2 == class34.NetCache_currentResponse.key ? class254.NetCache_responseArchiveBuffer.offset * 99 / (class254.NetCache_responseArchiveBuffer.array.length - class34.NetCache_currentResponse.padding) + 1 : 0; // L: 146 147 - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1373546761" - ) - static final void method4916() { - Client.field882 = Client.cycleCntr; // L: 11461 - class26.ClanChat_inClanChat = true; // L: 11462 - } // L: 11463 -} diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java new file mode 100644 index 0000000000..3a80975519 --- /dev/null +++ b/runescape-client/src/main/java/class249.java @@ -0,0 +1,75 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ik") +public class class249 { + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "[Lof;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-2048976423" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return PcmPlayer.method510(var0, 10, true); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnu;I)I", + garbageValue = "-312257835" + ) + static int method4826(PacketBuffer var0) { + int var1 = var0.readBits(2); + int var2; + if (var1 == 0) { + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); + } else if (var1 == 2) { + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); + } + + return var2; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "0" + ) + static final String method4824(int var0) { + if (var0 < 100000) { + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + } + } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "51" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class144.logOut(); + switch(var0) { + case 1: + Calendar.method4863(); + break; + case 2: + AbstractSocket.method5924(); + } + + } +} diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java deleted file mode 100644 index 080f24bbff..0000000000 --- a/runescape-client/src/main/java/class25.java +++ /dev/null @@ -1,393 +0,0 @@ -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("a") -public class class25 extends class16 { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1686215047 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1048031623 - ) - int field198; - @ObfuscatedName("e") - byte field200; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1621140089 - ) - int field199; - @ObfuscatedName("y") - String field197; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ls;" - ) - final class19 this$0; - - @ObfuscatedSignature( - descriptor = "(Ls;)V" - ) - class25(class19 var1) { - this.this$0 = var1; - this.field198 = -1; // L: 124 - } // L: 129 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "851460888" - ) - void vmethod331(Buffer var1) { - var1.readUnsignedByte(); // L: 132 - this.field198 = var1.readUnsignedShort(); // L: 133 - this.field200 = var1.readByte(); // L: 134 - this.field199 = var1.readUnsignedShort(); // L: 135 - var1.readLong(); // L: 136 - this.field197 = var1.readStringCp1252NullTerminated(); // L: 137 - var1.readUnsignedByte(); // L: 138 - } // L: 139 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ly;I)V", - garbageValue = "-1362614343" - ) - void vmethod332(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field198); // L: 142 - var2.rank = this.field200; // L: 143 - var2.world = this.field199; // L: 144 - var2.name = this.field197; // L: 145 - } // L: 146 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "([BIIIIIIILgp;[Lfl;B)V", - garbageValue = "32" - ) - static final void method337(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: 178 - int var11 = -1; // L: 179 - - while (true) { - int var12 = var10.method6628(); // L: 181 - if (var12 == 0) { // L: 182 - return; // L: 209 - } - - var11 += var12; // L: 183 - int var13 = 0; // L: 184 - - while (true) { - int var14 = var10.readUShortSmart(); // L: 186 - if (var14 == 0) { // L: 187 - break; - } - - var13 += var14 - 1; // L: 188 - int var15 = var13 & 63; // L: 189 - int var16 = var13 >> 6 & 63; // L: 190 - int var17 = var13 >> 12; // L: 191 - int var18 = var10.readUnsignedByte(); // L: 192 - int var19 = var18 >> 2; // L: 193 - int var20 = var18 & 3; // L: 194 - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 195 - ObjectComposition var21 = Tiles.getObjectDefinition(var11); // L: 196 - int var22 = var2 + AbstractWorldMapIcon.method3787(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 197 - int var23 = var3 + FaceNormal.method4253(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 198 - if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { // L: 199 - int var24 = var1; // L: 200 - if ((Tiles.Tiles_renderFlags[1][var22][var23] & 2) == 2) { // L: 201 - var24 = var1 - 1; - } - - CollisionMap var25 = null; // L: 202 - if (var24 >= 0) { // L: 203 - var25 = var9[var24]; - } - - Player.method2258(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); // L: 204 - } - } - } - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-20" - ) - public static final void method339(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; // L: 74 - ViewportMouse.ViewportMouse_y = var1; // L: 75 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 76 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 77 - ViewportMouse.ViewportMouse_false0 = false; // L: 78 - } // L: 79 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Liv;II)V", - garbageValue = "-709211391" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3035 == null) { // L: 1006 - throw new RuntimeException(); // L: 1007 - } else { - if (var0.field3104 == null) { // L: 1009 - var0.field3104 = new int[var0.field3035.length]; // L: 1010 - } - - var0.field3104[var1] = Integer.MAX_VALUE; // L: 1012 - } - } // L: 1013 - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-1350653396" - ) - static int method336(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3250 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3251 - return 1; // L: 3252 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3254 - ChatChannel.Interpreter_intStackSize -= 3; // L: 3255 - Client.publicChatMode = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3256 - ClanChannel.privateChatMode = class244.method4812(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 3257 - if (ClanChannel.privateChatMode == null) { // L: 3258 - ClanChannel.privateChatMode = PrivateChatMode.field3886; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 3259 - PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2679, Client.packetWriter.isaacCipher); // L: 3261 - var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3262 - var13.packetBuffer.writeByte(ClanChannel.privateChatMode.field3884); // L: 3263 - var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3264 - Client.packetWriter.addNode(var13); // L: 3265 - return 1; // L: 3266 - } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3268 - var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3269 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3270 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3271 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3272 - var6 = InterfaceParent.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 3274 - var6.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3275 - var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3276 - var6.packetBuffer.writeByte(var7 - 1); // L: 3277 - var6.packetBuffer.writeByte(var9); // L: 3278 - Client.packetWriter.addNode(var6); // L: 3279 - return 1; // L: 3280 - } else { - int var3; - Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3282 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3283 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3284 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3285 - var5 = Client.Messages_getByChannelAndID(var3, var7); // L: 3286 - if (var5 != null) { // L: 3287 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.count; // L: 3288 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.cycle; // L: 3289 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3290 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3291 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3292 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3293 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3296 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3297 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3298 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3299 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3300 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3301 - } - - return 1; // L: 3303 - } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3305 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3306 - var4 = Client.Messages_getMessage(var3); // L: 3307 - if (var4 != null) { // L: 3308 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.type; // L: 3309 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.cycle; // L: 3310 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3311 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3312 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3313 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3314 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3317 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3318 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3319 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3320 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3321 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3322 - } - - return 1; // L: 3324 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3326 - if (ClanChannel.privateChatMode == null) { // L: 3327 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ClanChannel.privateChatMode.field3884; // L: 3328 - } - - return 1; // L: 3329 - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3331 - var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3332 - var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3333 - var12 = class342.method6068(var7, var8, AbstractArchive.clientLanguage, -1); // L: 3334 - Client.packetWriter.addNode(var12); // L: 3335 - return 1; // L: 3336 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3338 - UserComparator9.Interpreter_stringStackSize -= 2; // L: 3339 - var8 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3340 - String var11 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3341 - var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 3343 - var12.packetBuffer.writeShort(0); // L: 3344 - int var10 = var12.packetBuffer.offset; // L: 3345 - var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3346 - ModeWhere.method5292(var12.packetBuffer, var11); // L: 3347 - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3348 - Client.packetWriter.addNode(var12); // L: 3349 - return 1; // L: 3350 - } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3352 - var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3353 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3354 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3355 - var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3356 - var6 = class342.method6068(var7, var8, AbstractArchive.clientLanguage, var9); // L: 3357 - Client.packetWriter.addNode(var6); // L: 3358 - return 1; // L: 3359 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3361 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3368 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3369 - return 1; // L: 3370 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3372 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3373 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AbstractArchive.Messages_getHistorySize(var3); // L: 3374 - return 1; // L: 3375 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3377 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3378 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class80.Messages_getLastChatID(var3); // L: 3379 - return 1; // L: 3380 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3382 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3383 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class22.method306(var3); // L: 3384 - return 1; // L: 3385 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3387 - var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3388 - Canvas.doCheat(var8); // L: 3389 - return 1; // L: 3390 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3392 - Client.field642 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3393 - return 1; // L: 3394 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3396 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = Client.field642; // L: 3397 - return 1; // L: 3398 - } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3400 - var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3401 - System.out.println(var8); // L: 3402 - return 1; // L: 3403 - } else if (var0 == 5024) { // L: 3405 - --ChatChannel.Interpreter_intStackSize; // L: 3406 - return 1; // L: 3407 - } else if (var0 == 5025) { // L: 3409 - ++ChatChannel.Interpreter_intStackSize; // L: 3410 - return 1; // L: 3411 - } else if (var0 == 5030) { // L: 3413 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3414 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3415 - var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3416 - var5 = Client.Messages_getByChannelAndID(var3, var7); // L: 3417 - if (var5 != null) { // L: 3418 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.count; // L: 3419 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.cycle; // L: 3420 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3421 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3422 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3423 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3424 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3425 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3426 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3429 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3430 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3431 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3432 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3433 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3434 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3435 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3436 - } - - return 1; // L: 3438 - } else if (var0 == 5031) { // L: 3440 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3441 - var4 = Client.Messages_getMessage(var3); // L: 3442 - if (var4 != null) { // L: 3443 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.type; // L: 3444 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.cycle; // L: 3445 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3446 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3447 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3448 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3449 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3450 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3451 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3454 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3455 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3456 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3457 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3458 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3459 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3460 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3461 - } - - return 1; // L: 3463 - } else { - return 2; // L: 3465 - } - } else { - if (class262.localPlayer != null && class262.localPlayer.username != null) { // L: 3363 - var8 = class262.localPlayer.username.getName(); - } else { - var8 = ""; // L: 3364 - } - - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var8; // L: 3365 - return 1; // L: 3366 - } - } - } - } - } - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1366473716" - ) - static final void method330(int var0) { - if (class20.loadInterface(var0)) { // L: 11051 - class246.drawModelComponents(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1); // L: 11052 - } - } // L: 11053 -} diff --git a/runescape-client/src/main/java/class250.java b/runescape-client/src/main/java/class250.java deleted file mode 100644 index 088986b02c..0000000000 --- a/runescape-client/src/main/java/class250.java +++ /dev/null @@ -1,84 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iz") -public class class250 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - @Export("huffman") - static Huffman huffman; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lef;", - garbageValue = "1474784029" - ) - @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 = ItemComposition.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 (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 - var1.name = "Members object"; // L: 95 - var1.isTradable = false; // L: 96 - - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97 - var1.groundActions[var3] = null; // L: 98 - } - - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100 - if (var3 != 4) { // L: 101 - var1.inventoryActions[var3] = null; // L: 102 - } - } - - var1.shiftClickIndex = -2; // L: 105 - var1.team = 0; // L: 106 - if (var1.params != null) { // L: 107 - boolean var6 = false; // L: 108 - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109 - ParamComposition var5 = UserComparator10.getParamDefinition((int)var4.key); // L: 110 - if (var5.autoDisable) { // L: 111 - var4.remove(); - } else { - var6 = true; // L: 112 - } - } - - if (!var6) { - var1.params = null; // L: 114 - } - } - } - - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117 - return var1; // L: 118 - } - } -} diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java new file mode 100644 index 0000000000..e9f0de3386 --- /dev/null +++ b/runescape-client/src/main/java/class251.java @@ -0,0 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ia") +public class class251 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + @Export("huffman") + static Huffman huffman; + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;III)Lkt;", + garbageValue = "872502144" + ) + public static Font method4840(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + return !class290.method5208(var0, var2, var3) ? null : class314.method5680(var1.takeFile(var2, var3)); + } +} diff --git a/runescape-client/src/main/java/class255.java b/runescape-client/src/main/java/class255.java index 32b02e39c9..e8424c3d87 100644 --- a/runescape-client/src/main/java/class255.java +++ b/runescape-client/src/main/java/class255.java @@ -1,54 +1,125 @@ 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("ib") +public class class255 { + @ObfuscatedName("ap") + @Export("hasFocus") + protected static boolean hasFocus; -@ObfuscatedName("ik") -public enum class255 implements Enumerated -{ - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - field3138(0), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - field3137(1), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - field3142(2), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lik;" - ) - field3139(3), @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "(ILbd;ZI)I", + garbageValue = "-282504769" ) - field3136(4); + static int method4875(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { + Interpreter.Interpreter_intStackSize -= 3; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = UrlRequester.getWidget(var9); + if (var6.children == null) { + var6.children = new Widget[var11 + 1]; + } - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1119623575 - ) - final int field3141; + if (var6.children.length <= var11) { + Widget[] var7 = new Widget[var11 + 1]; - class255(int var3) { - this.field3141 = var3; // L: 14 - } // L: 15 + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3141; // L: 18 + var6.children = var7; + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var11; + var12.isIf3 = true; + var6.children[var11] = var12; + if (var2) { + GrandExchangeOffer.scriptDotWidget = var12; + } else { + Interpreter.scriptActiveWidget = var12; + } + + AttackOption.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { + var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + Widget var10 = UrlRequester.getWidget(var3.id); + var10.children[var3.childIndex] = null; + AttackOption.invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3.children = null; + AttackOption.invalidateWidget(var3); + return 1; + } else if (var0 == 103) { + Interpreter.Interpreter_intStackSize -= 3; + return 1; + } else if (var0 == 104) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + if (var2) { + GrandExchangeOffer.scriptDotWidget = var3; + } else { + Interpreter.scriptActiveWidget = var3; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 202) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] = 0; + return 1; + } else if (var0 == 203) { + Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize + 1] = 0; + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Widget var5 = ObjectSound.getWidgetChild(var9, var4); + if (var5 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + if (var2) { + GrandExchangeOffer.scriptDotWidget = var5; + } else { + Interpreter.scriptActiveWidget = var5; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } } } diff --git a/runescape-client/src/main/java/class256.java b/runescape-client/src/main/java/class256.java new file mode 100644 index 0000000000..948d20a198 --- /dev/null +++ b/runescape-client/src/main/java/class256.java @@ -0,0 +1,56 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iz") +public enum class256 implements Enumerated { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + field3136(0), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + field3132(1), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + field3133(2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + field3131(3), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + field3135(4); + + @ObfuscatedName("p") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -104835219 + ) + final int field3134; + + class256(int var3) { + this.field3134 = var3; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1806959663" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3134; + } +} diff --git a/runescape-client/src/main/java/class26.java b/runescape-client/src/main/java/class26.java deleted file mode 100644 index fba35c88e6..0000000000 --- a/runescape-client/src/main/java/class26.java +++ /dev/null @@ -1,189 +0,0 @@ -import java.io.File; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("aw") -public class class26 extends class14 { - @ObfuscatedName("qg") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("j") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("dr") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("ow") - @ObfuscatedSignature( - descriptor = "Lnz;" - ) - @Export("HitSplatDefinition_cachedSprites") - static class370 HitSplatDefinition_cachedSprites; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -6615327962346059687L - ) - long field212; - @ObfuscatedName("e") - String field206; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1300359525 - ) - int field208; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class26(class2 var1) { - this.this$0 = var1; - this.field212 = -1L; // L: 93 - this.field206 = null; // L: 94 - this.field208 = 0; // L: 95 - } // L: 97 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 100 - --var1.offset; // L: 101 - this.field212 = var1.readLong(); // L: 102 - } - - this.field206 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 - this.field208 = var1.readUnsignedShort(); // L: 105 - } // L: 106 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method126(this.field212, this.field206, this.field208); // L: 109 - } // L: 110 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;I)V", - garbageValue = "-1576725209" - ) - public static void method344(File var0) { - FileSystem.FileSystem_cacheDir = var0; // L: 16 - if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; // L: 18 - } - } // L: 19 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1566691777" - ) - static int method351(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("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2003470705" - ) - protected static final void method350() { - class160.clock.mark(); // L: 406 - - int var0; - for (var0 = 0; var0 < 32; ++var0) { // L: 407 - GameEngine.graphicsTickTimes[var0] = 0L; - } - - for (var0 = 0; var0 < 32; ++var0) { // L: 408 - GameEngine.clientTickTimes[var0] = 0L; - } - - class372.gameCyclesToDo = 0; // L: 409 - } // L: 410 - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "46" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[SoundSystem.Client_plane][var0][var1]; // L: 7442 - if (var2 == null) { // L: 7443 - DevicePcmPlayerProvider.scene.removeGroundItemPile(SoundSystem.Client_plane, var0, var1); // L: 7444 - } else { - long var3 = -99999999L; // L: 7447 - TileItem var5 = null; // L: 7448 - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7449 7450 7458 - ItemComposition var7 = class250.ItemDefinition_get(var6.id); // L: 7451 - long var11 = (long)var7.price; // L: 7452 - if (var7.isStackable == 1) { // L: 7453 - var11 *= (long)(var6.quantity + 1); - } - - if (var11 > var3) { // L: 7454 - var3 = var11; // L: 7455 - var5 = var6; // L: 7456 - } - } - - if (var5 == null) { // L: 7460 - DevicePcmPlayerProvider.scene.removeGroundItemPile(SoundSystem.Client_plane, var0, var1); // L: 7461 - } else { - var2.addLast(var5); // L: 7464 - TileItem var13 = null; // L: 7465 - TileItem var8 = null; // L: 7466 - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7467 7468 7473 - if (var5.id != var6.id) { // L: 7469 - if (var13 == null) { // L: 7470 - var13 = var6; - } - - if (var13.id != var6.id && var8 == null) { // L: 7471 - var8 = var6; - } - } - } - - long var9 = UserComparator3.calculateTag(var0, var1, 3, false, 0); // L: 7475 - DevicePcmPlayerProvider.scene.newGroundItemPile(SoundSystem.Client_plane, var0, var1, ItemContainer.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.Client_plane), var5, var9, var13, var8); // L: 7476 - } - } - } // L: 7445 7462 7477 -} diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java new file mode 100644 index 0000000000..f172734b43 --- /dev/null +++ b/runescape-client/src/main/java/class260.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jc") +public class class260 { + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "98" + ) + static boolean method4894() { + return (Client.drawPlayerNames & 4) != 0; + } +} diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java deleted file mode 100644 index e412853536..0000000000 --- a/runescape-client/src/main/java/class261.java +++ /dev/null @@ -1,227 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jj") -public class class261 { - static { - Math.sqrt(8192.0D); // L: 9 - } // L: 10 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lex;", - garbageValue = "-1540124861" - ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17 - if (var1 != null) { // L: 18 - return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 19 - var1 = new InvDefinition(); // L: 20 - if (var2 != null) { // L: 21 - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22 - return var1; // L: 23 - } - } - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(Liv;IIB)V", - garbageValue = "-13" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 10173 - class22.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10174 - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10177 - var3 = SecureRandomCallable.Widget_getSpellActionName(var0); // L: 10178 - if (var3 != null) { // L: 10179 - class22.insertMenuItemNoShift(var3, SecureRandomFuture.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10180 - } - } - - if (var0.buttonType == 3) { // L: 10184 - class22.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10185 - } - - if (var0.buttonType == 4) { // L: 10188 - class22.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10189 - } - - if (var0.buttonType == 5) { // L: 10192 - class22.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10193 - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10196 - class22.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10197 - } - - int var4; - int var5; - int var15; - if (var0.type == 2) { // L: 10200 - var15 = 0; // L: 10201 - - for (var4 = 0; var4 < var0.height; ++var4) { // L: 10202 - for (var5 = 0; var5 < var0.width; ++var5) { // L: 10203 - int var18 = (var0.paddingX + 32) * var5; // L: 10204 - int var7 = (var0.paddingY + 32) * var4; // L: 10205 - if (var15 < 20) { // L: 10206 - var18 += var0.inventoryXOffsets[var15]; // L: 10207 - var7 += var0.inventoryYOffsets[var15]; // L: 10208 - } - - if (var1 >= var18 && var2 >= var7 && var1 < var18 + 32 && var2 < var7 + 32) { // L: 10210 - Client.dragItemSlotDestination = var15; // L: 10211 - UserComparator2.hoveredItemContainer = var0; // L: 10212 - if (var0.itemIds[var15] > 0) { // L: 10213 - ItemComposition var8 = class250.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 10214 - if (Client.isItemSelected == 1 && class372.method6497(class22.getWidgetFlags(var0))) { // L: 10215 - if (var0.id != class246.selectedItemWidget || var15 != Timer.selectedItemSlot) { // L: 10216 - class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); // L: 10217 - } - } else if (Client.isSpellSelected && class372.method6497(class22.getWidgetFlags(var0))) { // L: 10221 - if ((LoginPacket.selectedSpellFlags & 16) == 16) { // L: 10222 - class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); // L: 10223 - } - } else { - String[] var9 = var8.inventoryActions; // L: 10228 - int var10 = -1; // L: 10229 - boolean var11; - if (Client.shiftClickDrop) { // L: 10230 - var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10233 - if (var11) { // L: 10235 - var10 = var8.getShiftClickIndex(); // L: 10236 - } - } - - if (class372.method6497(class22.getWidgetFlags(var0))) { // L: 10239 - for (int var20 = 4; var20 >= 3; --var20) { // L: 10240 - if (var10 != var20) { // L: 10241 - class14.addWidgetItemMenuItem(var0, var8, var15, var20, false); // L: 10242 - } - } - } - - int var12 = class22.getWidgetFlags(var0); // L: 10246 - var11 = (var12 >> 31 & 1) != 0; // L: 10248 - if (var11) { // L: 10250 - class22.insertMenuItemNoShift("Use", SecureRandomFuture.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); // L: 10251 - } - - Object var10000 = null; // L: 10254 - int var13; - if (class372.method6497(class22.getWidgetFlags(var0))) { - for (var13 = 2; var13 >= 0; --var13) { // L: 10255 - if (var13 != var10) { // L: 10256 - class14.addWidgetItemMenuItem(var0, var8, var15, var13, false); // L: 10257 - } - } - - if (var10 >= 0) { // L: 10259 - class14.addWidgetItemMenuItem(var0, var8, var15, var10, true); // L: 10260 - } - } - - var9 = var0.itemActions; // L: 10263 - if (var9 != null) { // L: 10264 - for (var13 = 4; var13 >= 0; --var13) { // L: 10265 - if (var9[var13] != null) { // L: 10266 - byte var14 = 0; // L: 10267 - if (var13 == 0) { // L: 10268 - var14 = 39; - } - - if (var13 == 1) { // L: 10269 - var14 = 40; - } - - if (var13 == 2) { // L: 10270 - var14 = 41; - } - - if (var13 == 3) { // L: 10271 - var14 = 42; - } - - if (var13 == 4) { // L: 10272 - var14 = 43; - } - - class22.insertMenuItemNoShift(var9[var13], SecureRandomFuture.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); // L: 10273 - } - } - } - - class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); // L: 10278 - } - } - } - - ++var15; // L: 10283 - } - } - } - - if (var0.isIf3) { // L: 10287 - if (Client.isSpellSelected) { // L: 10288 - var4 = class22.getWidgetFlags(var0); // L: 10290 - boolean var21 = (var4 >> 21 & 1) != 0; // L: 10292 - if (var21 && (LoginPacket.selectedSpellFlags & 32) == 32) { // L: 10294 - class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10295 - } - } else { - for (var15 = 9; var15 >= 5; --var15) { // L: 10300 - String var17; - if (!class136.method2696(class22.getWidgetFlags(var0), var15) && var0.onOp == null) { // L: 10303 - var17 = null; // L: 10304 - } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { // L: 10307 - var17 = var0.actions[var15]; // L: 10311 - } else { - var17 = null; // L: 10308 - } - - if (var17 != null) { // L: 10314 - class22.insertMenuItemNoShift(var17, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); // L: 10315 - } - } - - var3 = SecureRandomCallable.Widget_getSpellActionName(var0); // L: 10319 - if (var3 != null) { // L: 10320 - class22.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10321 - } - - for (var4 = 4; var4 >= 0; --var4) { // L: 10324 - String var16; - if (!class136.method2696(class22.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10327 - var16 = null; // L: 10328 - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10331 - var16 = var0.actions[var4]; // L: 10335 - } else { - var16 = null; // L: 10332 - } - - if (var16 != null) { // L: 10338 - PacketWriter.insertMenuItem(var16, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10339 - } - } - - var5 = class22.getWidgetFlags(var0); // L: 10344 - boolean var19 = (var5 & 1) != 0; // L: 10346 - if (var19) { // L: 10348 - class22.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10349 - } - } - } - - } // L: 10354 -} diff --git a/runescape-client/src/main/java/class262.java b/runescape-client/src/main/java/class262.java index f25e65e9be..e886acc904 100644 --- a/runescape-client/src/main/java/class262.java +++ b/runescape-client/src/main/java/class262.java @@ -1,87 +1,42 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jv") public class class262 { + static { + Math.sqrt(8192.0D); + } + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "(Lnv;J)V" ) - static final class262 field3194; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - static final class262 field3193; - @ObfuscatedName("kg") - @ObfuscatedSignature( - descriptor = "Lcj;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1602122901 - ) - final int field3192; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -2082142029 - ) - final int field3195; + static void method4896(Buffer var0, long var1) { + var1 /= 10L; + if (var1 < 0L) { + var1 = 0L; + } else if (var1 > 65535L) { + var1 = 65535L; + } - static { - field3194 = new class262(51, 27, 800, 0, 16, 16); // L: 33 - field3193 = new class262(25, 28, 800, 656, 40, 40); // L: 34 + var0.writeShort((int)var1); } - class262(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3192 = var5; // L: 39 - this.field3195 = var6; // L: 40 - } // L: 41 - - @ObfuscatedName("e") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lnp;", - garbageValue = "724440260" + descriptor = "(B)V", + garbageValue = "0" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(WorldMapDecoration.cacheDir, "preferences" + var0 + ".dat"); // L: 183 - if (var3.exists()) { // L: 184 - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 186 - return var10; // L: 187 - } catch (IOException var9) { // L: 189 - } + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (VarcInt.pcmPlayer1 != null) { + VarcInt.pcmPlayer1.run(); } - String var4 = ""; // L: 191 - if (ClanChannel.cacheGamebuild == 33) { // L: 192 - var4 = "_rc"; - } else if (ClanChannel.cacheGamebuild == 34) { // L: 193 - var4 = "_wip"; + if (WorldMapDecoration.pcmPlayer0 != null) { + WorldMapDecoration.pcmPlayer0.run(); } - File var5 = new File(JagexCache.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 194 - AccessFile var6; - if (!var2 && var5.exists()) { // L: 195 - try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 197 - return var6; // L: 198 - } catch (IOException var8) { // L: 200 - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 203 - return var6; // L: 204 - } catch (IOException var7) { // L: 206 - throw new RuntimeException(); // L: 207 - } } } diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java new file mode 100644 index 0000000000..2fb7f6ca19 --- /dev/null +++ b/runescape-client/src/main/java/class263.java @@ -0,0 +1,164 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jn") +public class class263 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + static final class263 field3191; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + static final class263 field3189; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 352437661 + ) + final int field3190; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -856361589 + ) + final int field3192; + + static { + field3191 = new class263(51, 27, 800, 0, 16, 16); + field3189 = new class263(25, 28, 800, 656, 40, 40); + } + + class263(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3190 = var5; + this.field3192 = var6; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "1353410807" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; + + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } + } + + return var5; + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "525579160" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (VarbitComposition.garbageCollector == null || !VarbitComposition.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + VarbitComposition.garbageCollector = var2; + GameEngine.garbageCollectorLastCheckTimeMs = -1L; + GameEngine.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { + } + } + + if (VarbitComposition.garbageCollector != null) { + long var9 = UrlRequester.method2125(); + long var3 = VarbitComposition.garbageCollector.getCollectionTime(); + if (-1L != GameEngine.garbageCollectorLastCollectionTime) { + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; + if (0L != var7) { + var0 = (int)(100L * var5 / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; + GameEngine.garbageCollectorLastCheckTimeMs = var9; + } + + return var0; + } +} diff --git a/runescape-client/src/main/java/class265.java b/runescape-client/src/main/java/class265.java deleted file mode 100644 index e238766d59..0000000000 --- a/runescape-client/src/main/java/class265.java +++ /dev/null @@ -1,128 +0,0 @@ -import java.awt.FontMetrics; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jg") -public class class265 { - @ObfuscatedName("ah") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "2064916669" - ) - static final void method4984(int var0, int var1, boolean var2) { - if (!var2 || var0 != class12.field111 || RouteStrategy.field1919 != var1) { // L: 5615 - class12.field111 = var0; // L: 5618 - RouteStrategy.field1919 = var1; // L: 5619 - Projectile.updateGameState(25); // L: 5620 - class143.drawLoadingMessage("Loading - please wait.", true); // L: 5621 - int var3 = class15.baseX; // L: 5622 - int var4 = WorldMapSprite.baseY; // L: 5623 - class15.baseX = (var0 - 6) * 8; // L: 5624 - WorldMapSprite.baseY = (var1 - 6) * 8; // L: 5625 - int var5 = class15.baseX - var3; // L: 5626 - int var6 = WorldMapSprite.baseY - var4; // L: 5627 - var3 = class15.baseX; // L: 5628 - var4 = WorldMapSprite.baseY; // L: 5629 - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 5630 - NPC var19 = Client.npcs[var7]; // L: 5631 - if (var19 != null) { // L: 5632 - for (var9 = 0; var9 < 10; ++var9) { // L: 5633 - var10000 = var19.pathX; // L: 5634 - var10000[var9] -= var5; - var10000 = var19.pathY; // L: 5635 - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; // L: 5637 - var19.y -= var6 * 128; // L: 5638 - } - } - - for (var7 = 0; var7 < 2048; ++var7) { // L: 5641 - Player var22 = Client.players[var7]; // L: 5642 - if (var22 != null) { // L: 5643 - for (var9 = 0; var9 < 10; ++var9) { // L: 5644 - var10000 = var22.pathX; // L: 5645 - var10000[var9] -= var5; - var10000 = var22.pathY; // L: 5646 - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; // L: 5648 - var22.y -= var6 * 128; // L: 5649 - } - } - - byte var20 = 0; // L: 5652 - byte var8 = 104; // L: 5653 - byte var21 = 1; // L: 5654 - if (var5 < 0) { // L: 5655 - var20 = 103; // L: 5656 - var8 = -1; // L: 5657 - var21 = -1; // L: 5658 - } - - byte var10 = 0; // L: 5660 - byte var11 = 104; // L: 5661 - byte var12 = 1; // L: 5662 - if (var6 < 0) { // L: 5663 - var10 = 103; // L: 5664 - var11 = -1; // L: 5665 - var12 = -1; // L: 5666 - } - - int var14; - for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5668 - for (var14 = var10; var11 != var14; var14 += var12) { // L: 5669 - int var15 = var5 + var13; // L: 5670 - int var16 = var14 + var6; // L: 5671 - - for (int var17 = 0; var17 < 4; ++var17) { // L: 5672 - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5673 - } else { - Client.groundItems[var17][var13][var14] = null; // L: 5674 - } - } - } - } - - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5678 5679 5683 - var18.x -= var5; // L: 5680 - var18.y -= var6; // L: 5681 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5682 - var18.remove(); - } - } - - if (Client.destinationX != 0) { // L: 5685 - Client.destinationX -= var5; // L: 5686 - Client.destinationY -= var6; // L: 5687 - } - - Client.soundEffectCount = 0; // L: 5689 - Client.isCameraLocked = false; // L: 5690 - ObjectSound.cameraX -= var5 << 7; // L: 5691 - Canvas.cameraZ -= var6 << 7; // L: 5692 - FriendSystem.oculusOrbFocalPointX -= var5 << 7; // L: 5693 - VarbitComposition.oculusOrbFocalPointY -= var6 << 7; // L: 5694 - Client.field853 = -1; // L: 5695 - Client.graphicsObjects.clear(); // L: 5696 - Client.projectiles.clear(); // L: 5697 - - for (var14 = 0; var14 < 4; ++var14) { // L: 5698 - Client.collisionMaps[var14].clear(); - } - - } - } // L: 5616 5699 -} diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index 306198bd4d..f1b1620063 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -1,7 +1,19 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("jz") public class class266 { - @ObfuscatedName("i") - public static boolean field3222; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "2081752940" + ) + public static int method4917(int var0, int var1) { + return (var0 << 8) + var1; + } + + @ObfuscatedName("w") + public static int method4916(long var0) { + return (int)(var0 >>> 14 & 3L); + } } diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java index bae26faaaa..c42303b2ff 100644 --- a/runescape-client/src/main/java/class267.java +++ b/runescape-client/src/main/java/class267.java @@ -3,172 +3,74 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jd") +@ObfuscatedName("jw") public class class267 { - @ObfuscatedName("sz") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljk;" + descriptor = "(II)Z", + garbageValue = "1507594263" ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; + public static boolean method4922(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field46[var0] : false; + } - static { - int var0 = 0; // L: 9 - int var1 = 0; // L: 10 - class262[] var2 = new class262[]{class262.field3194, class262.field3193}; // L: 14 - class262[] var3 = var2; // L: 16 - - for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17 - class262 var5 = var3[var4]; // L: 18 - if (var5.field3192 > var0) { // L: 20 - var0 = var5.field3192; - } - - if (var5.field3195 > var1) { // L: 21 - var1 = var5.field3195; - } - } - - } // L: 25 - - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "2132527544" + descriptor = "(CI)Z", + garbageValue = "1205782874" ) - static int method4991(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1869 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.cycle; // L: 1870 - return 1; // L: 1871 - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1873 - ChatChannel.Interpreter_intStackSize -= 2; // L: 1874 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1875 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1876 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Canvas.method498(var3, var4); // L: 1877 - return 1; // L: 1878 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1880 - ChatChannel.Interpreter_intStackSize -= 2; // L: 1881 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1882 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1883 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class143.ItemContainer_getCount(var3, var4); // L: 1884 - return 1; // L: 1885 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1887 - ChatChannel.Interpreter_intStackSize -= 2; // L: 1888 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1889 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1890 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class26.method351(var3, var4); // L: 1891 - return 1; // L: 1892 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1894 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1895 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class261.getInvDefinition(var3).size; // L: 1896 - return 1; // L: 1897 - } else if (var0 == ScriptOpcodes.STAT) { // L: 1899 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1900 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1901 - return 1; // L: 1902 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1904 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1905 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1906 - return 1; // L: 1907 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1909 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1910 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1911 - return 1; // L: 1912 + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "51" + ) + static int method4924(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 1914 - var3 = SoundSystem.Client_plane; // L: 1915 - var4 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 1916 - var5 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 1917 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1918 - return 1; // L: 1919 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 1921 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1922 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1923 - return 1; // L: 1924 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1926 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1927 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1928 - return 1; // L: 1929 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 1931 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1932 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1933 - return 1; // L: 1934 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1936 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1937 - return 1; // L: 1938 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1940 - ChatChannel.Interpreter_intStackSize -= 2; // L: 1941 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] + 32768; // L: 1942 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1943 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Canvas.method498(var3, var4); // L: 1944 - return 1; // L: 1945 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1947 - ChatChannel.Interpreter_intStackSize -= 2; // L: 1948 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] + 32768; // L: 1949 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1950 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class143.ItemContainer_getCount(var3, var4); // L: 1951 - return 1; // L: 1952 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1954 - ChatChannel.Interpreter_intStackSize -= 2; // L: 1955 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] + 32768; // L: 1956 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1957 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class26.method351(var3, var4); // L: 1958 - return 1; // L: 1959 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1961 - if (Client.staffModLevel >= 2) { // L: 1962 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1963 - } + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } - return 1; // L: 1964 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1966 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1967 - return 1; // L: 1968 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1970 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.worldId; // L: 1971 - return 1; // L: 1972 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1974 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1975 - return 1; // L: 1976 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1978 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.weight; // L: 1979 - return 1; // L: 1980 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1982 - if (Client.playerMod) { // L: 1983 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1984 - } + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else { + return 2; + } + } - return 1; // L: 1985 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1987 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1988 - return 1; // L: 1989 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1991 - ChatChannel.Interpreter_intStackSize -= 4; // L: 1992 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1993 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1994 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 1995 - int var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 1996 - var3 += var4 << 14; // L: 1997 - var3 += var5 << 28; // L: 1998 - var3 += var6; // L: 1999 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 2000 - return 1; // L: 2001 - } else if (var0 == 3326) { // L: 2003 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.field843; // L: 2004 - return 1; // L: 2005 - } else if (var0 == 3327) { // L: 2007 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.field633; // L: 2008 - return 1; // L: 2009 + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(IIIILom;Liy;B)V", + garbageValue = "-72" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + if (var7 > 2500) { + var4.method7114(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); } else { - return 2; // L: 2011 + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); } + } } } diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java new file mode 100644 index 0000000000..e783756fdc --- /dev/null +++ b/runescape-client/src/main/java/class268.java @@ -0,0 +1,43 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jt") +public class class268 { + static { + int var0 = 0; + int var1 = 0; + class263[] var2 = WorldMapDecorationType.method4892(); + + for (int var3 = 0; var3 < var2.length; ++var3) { + class263 var4 = var2[var3]; + if (var4.field3190 > var0) { + var0 = var4.field3190; + } + + if (var4.field3192 > var1) { + var1 = var4.field3192; + } + } + + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "944915508" + ) + public static void method4925() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + } + + if (var0 == null) { + return; + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); + } + } +} diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java deleted file mode 100644 index afe3b481f7..0000000000 --- a/runescape-client/src/main/java/class269.java +++ /dev/null @@ -1,132 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jo") -public enum class269 implements Enumerated -{ - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3535(-1), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3533(0), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3534(1), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3532(2); - - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -2043119815 - ) - final int field3536; - - class269(int var3) { - this.field3536 = var3; // L: 19 - } // L: 20 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3536; // L: 23 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1302219293" - ) - public static int method4992(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 42 - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 43 - var0 = var0 + (var0 >>> 4) & 252645135; // L: 44 - var0 += var0 >>> 8; // L: 45 - var0 += var0 >>> 16; // L: 46 - return var0 & 255; // L: 47 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "405198099" - ) - public static int method5000(int var0) { - if (var0 > 0) { // L: 207 - return 1; - } else { - return var0 < 0 ? -1 : 0; // L: 208 209 - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "-246993316" - ) - static int method4996(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4273 - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4277 - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4281 - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4285 - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4289 - if (var0 != 7031 && var0 != 7032) { // L: 4293 - if (var0 == 7033) { // L: 4298 - --UserComparator9.Interpreter_stringStackSize; // L: 4299 - return 1; // L: 4300 - } else if (var0 != 7036 && var0 != 7037) { // L: 4302 - if (var0 == 7038) { // L: 4306 - --ChatChannel.Interpreter_intStackSize; // L: 4307 - return 1; // L: 4308 - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4310 - return 2; // L: 4314 - } else { - --ChatChannel.Interpreter_intStackSize; // L: 4311 - return 1; // L: 4312 - } - } else { - ChatChannel.Interpreter_intStackSize -= 2; // L: 4303 - return 1; // L: 4304 - } - } else { - --UserComparator9.Interpreter_stringStackSize; // L: 4294 - --ChatChannel.Interpreter_intStackSize; // L: 4295 - return 1; // L: 4296 - } - } else { - --ChatChannel.Interpreter_intStackSize; // L: 4290 - return 1; // L: 4291 - } - } else { - ChatChannel.Interpreter_intStackSize -= 2; // L: 4286 - return 1; // L: 4287 - } - } else { - ChatChannel.Interpreter_intStackSize -= 2; // L: 4282 - return 1; // L: 4283 - } - } else { - ChatChannel.Interpreter_intStackSize -= 3; // L: 4278 - return 1; // L: 4279 - } - } else { - ChatChannel.Interpreter_intStackSize -= 5; // L: 4274 - return 1; // L: 4275 - } - } -} diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java deleted file mode 100644 index fa8f83fd69..0000000000 --- a/runescape-client/src/main/java/class27.java +++ /dev/null @@ -1,510 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ak") -public class class27 extends class14 { - @ObfuscatedName("oz") - @ObfuscatedSignature( - descriptor = "Lnz;" - ) - static class370 field215; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1631949421 - ) - int field216; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class27(class2 var1) { - this.this$0 = var1; - this.field216 = -1; // L: 144 - } // L: 146 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - this.field216 = var1.readUnsignedShort(); // L: 149 - } // L: 150 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method132(this.field216); // L: 153 - } // L: 154 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljp;IB)V", - garbageValue = "-1" - ) - static void method364(AbstractArchive var0, int var1) { - if ((var1 & 536870912) != 0) { // L: 183 - Messages.logoSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 184 - } else if ((var1 & 1073741824) != 0) { // L: 186 - Messages.logoSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 187 - } else { - Messages.logoSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 190 - } - - } // L: 192 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;B)V", - garbageValue = "0" - ) - static void method353(Font var0, Font var1) { - int var4; - int var5; - int var9; - int var11; - int var13; - if (Varcs.worldSelectBackSprites == null) { // L: 1224 - Archive var3 = ModeWhere.archive8; // L: 1226 - var4 = var3.getGroupId("sl_back"); // L: 1228 - var5 = var3.getFileId(var4, ""); // L: 1229 - SpritePixels[] var6; - if (!Message.method1263(var3, var4, var5)) { // L: 1232 - var6 = null; // L: 1233 - } else { - SpritePixels[] var8 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 1238 - var9 = 0; - - while (true) { - if (var9 >= class397.SpriteBuffer_spriteCount) { - ArchiveDisk.method5993(); // L: 1252 - var6 = var8; // L: 1255 - break; - } - - SpritePixels var10 = var8[var9] = new SpritePixels(); // L: 1240 - var10.width = class397.SpriteBuffer_spriteWidth; // L: 1241 - var10.height = class244.SpriteBuffer_spriteHeight; // L: 1242 - var10.xOffset = class397.SpriteBuffer_xOffsets[var9]; // L: 1243 - var10.yOffset = class26.SpriteBuffer_yOffsets[var9]; // L: 1244 - var10.subWidth = Canvas.SpriteBuffer_spriteWidths[var9]; // L: 1245 - var10.subHeight = Clock.SpriteBuffer_spriteHeights[var9]; // L: 1246 - var11 = var10.subHeight * var10.subWidth; // L: 1247 - byte[] var12 = class126.SpriteBuffer_pixels[var9]; // L: 1248 - var10.pixels = new int[var11]; // L: 1249 - - for (var13 = 0; var13 < var11; ++var13) { // L: 1250 - var10.pixels[var13] = class397.SpriteBuffer_spritePalette[var12[var13] & 255]; - } - - ++var9; // L: 1239 - } - } - - Varcs.worldSelectBackSprites = var6; // L: 1259 - } - - if (class364.worldSelectFlagSprites == null) { // L: 1261 - class364.worldSelectFlagSprites = WorldMapLabelSize.method3268(ModeWhere.archive8, "sl_flags", ""); - } - - if (class10.worldSelectArrows == null) { // L: 1262 - class10.worldSelectArrows = WorldMapLabelSize.method3268(ModeWhere.archive8, "sl_arrows", ""); - } - - if (Huffman.worldSelectStars == null) { // L: 1263 - Huffman.worldSelectStars = WorldMapLabelSize.method3268(ModeWhere.archive8, "sl_stars", ""); - } - - if (NetCache.worldSelectLeftSprite == null) { // L: 1264 - NetCache.worldSelectLeftSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "leftarrow", ""); - } - - if (class12.worldSelectRightSprite == null) { // L: 1265 - class12.worldSelectRightSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1266 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1267 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1268 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1269 - if (Huffman.worldSelectStars != null) { // L: 1270 - Huffman.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1271 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1272 - Huffman.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1273 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1274 - } - - if (class10.worldSelectArrows != null) { // L: 1276 - int var22 = Login.xPadding + 280; // L: 1277 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1278 - class10.worldSelectArrows[2].drawAt(var22, 4); - } else { - class10.worldSelectArrows[0].drawAt(var22, 4); // L: 1279 - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1280 - class10.worldSelectArrows[3].drawAt(var22 + 15, 4); - } else { - class10.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1281 - } - - var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1282 - int var23 = Login.xPadding + 390; // L: 1283 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1284 - class10.worldSelectArrows[2].drawAt(var23, 4); - } else { - class10.worldSelectArrows[0].drawAt(var23, 4); // L: 1285 - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1286 - class10.worldSelectArrows[3].drawAt(var23 + 15, 4); - } else { - class10.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1287 - } - - var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1288 - var4 = Login.xPadding + 500; // L: 1289 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1290 - class10.worldSelectArrows[2].drawAt(var4, 4); - } else { - class10.worldSelectArrows[0].drawAt(var4, 4); // L: 1291 - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1292 - class10.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - class10.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1293 - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1294 - var5 = Login.xPadding + 610; // L: 1295 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1296 - class10.worldSelectArrows[2].drawAt(var5, 4); - } else { - class10.worldSelectArrows[0].drawAt(var5, 4); // L: 1297 - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1298 - class10.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - class10.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1299 - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1300 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1302 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1303 - Login.hoveredWorldIndex = -1; // L: 1304 - if (Varcs.worldSelectBackSprites != null) { // L: 1305 - byte var31 = 88; // L: 1306 - byte var32 = 19; // L: 1307 - var4 = 765 / (var31 + 1) - 1; // L: 1308 - var5 = 480 / (var32 + 1); // L: 1309 - - int var24; - int var25; - do { - var24 = var5; // L: 1311 - var25 = var4; // L: 1312 - if (var5 * (var4 - 1) >= World.World_count) { // L: 1313 - --var4; - } - - if (var4 * (var5 - 1) >= World.World_count) { // L: 1314 - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { // L: 1315 - --var5; - } - } while(var24 != var5 || var25 != var4); // L: 1316 - - var24 = (765 - var31 * var4) / (var4 + 1); // L: 1318 - if (var24 > 5) { // L: 1319 - var24 = 5; - } - - var25 = (480 - var5 * var32) / (var5 + 1); // L: 1320 - if (var25 > 5) { // L: 1321 - var25 = 5; - } - - int var26 = (765 - var4 * var31 - var24 * (var4 - 1)) / 2; // L: 1322 - var9 = (480 - var32 * var5 - var25 * (var5 - 1)) / 2; // L: 1323 - int var27 = (var5 + World.World_count - 1) / var5; // L: 1324 - Login.worldSelectPagesCount = var27 - var4; // L: 1325 - if (NetCache.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1326 - NetCache.worldSelectLeftSprite.drawAt(8, class0.canvasHeight / 2 - NetCache.worldSelectLeftSprite.subHeight / 2); // L: 1327 - } - - if (class12.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1329 - class12.worldSelectRightSprite.drawAt(AttackOption.canvasWidth - class12.worldSelectRightSprite.subWidth - 8, class0.canvasHeight / 2 - class12.worldSelectRightSprite.subHeight / 2); // L: 1330 - } - - var11 = var9 + 23; // L: 1332 - int var28 = var26 + Login.xPadding; // L: 1333 - var13 = 0; // L: 1334 - boolean var14 = false; // L: 1335 - int var15 = Login.worldSelectPage; // L: 1336 - - int var16; - for (var16 = var15 * var5; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1337 1338 - World var17 = World.World_worlds[var16]; // L: 1341 - boolean var18 = true; // L: 1342 - String var19 = Integer.toString(var17.population); // L: 1343 - if (var17.population == -1) { // L: 1344 - var19 = "OFF"; // L: 1345 - var18 = false; // L: 1346 - } else if (var17.population > 1980) { // L: 1348 - var19 = "FULL"; // L: 1349 - var18 = false; // L: 1350 - } - - int var21 = 0; // L: 1353 - byte var20; - if (var17.isBeta()) { // L: 1354 - if (var17.isMembersOnly()) { // L: 1355 - var20 = 7; - } else { - var20 = 6; // L: 1356 - } - } else if (var17.isDeadman()) { // L: 1358 - var21 = 16711680; // L: 1359 - if (var17.isMembersOnly()) { // L: 1360 - var20 = 5; - } else { - var20 = 4; // L: 1361 - } - } else if (var17.method1778()) { // L: 1363 - if (var17.isMembersOnly()) { // L: 1364 - var20 = 9; - } else { - var20 = 8; // L: 1365 - } - } else if (var17.isPvp()) { // L: 1367 - if (var17.isMembersOnly()) { // L: 1368 - var20 = 3; - } else { - var20 = 2; // L: 1369 - } - } else if (var17.isMembersOnly()) { // L: 1372 - var20 = 1; - } else { - var20 = 0; // L: 1373 - } - - if (MouseHandler.MouseHandler_x >= var28 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var31 + var28 && MouseHandler.MouseHandler_y < var32 + var11 && var18) { // L: 1375 - Login.hoveredWorldIndex = var16; // L: 1376 - Varcs.worldSelectBackSprites[var20].drawTransOverlayAt(var28, var11, 128, 16777215); // L: 1377 - var14 = true; // L: 1378 - } else { - Varcs.worldSelectBackSprites[var20].drawAt(var28, var11); // L: 1380 - } - - if (class364.worldSelectFlagSprites != null) { // L: 1381 - class364.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var28 + 29, var11); - } - - var0.drawCentered(Integer.toString(var17.id), var28 + 15, var32 / 2 + var11 + 5, var21, -1); // L: 1382 - var1.drawCentered(var19, var28 + 60, var32 / 2 + var11 + 5, 268435455, -1); // L: 1383 - var11 = var11 + var25 + var32; // L: 1384 - ++var13; // L: 1385 - if (var13 >= var5) { - var11 = var9 + 23; // L: 1386 - var28 = var28 + var24 + var31; // L: 1387 - var13 = 0; // L: 1388 - ++var15; // L: 1389 - } - } - - if (var14) { // L: 1392 - var16 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1393 - int var29 = var1.ascent + 8; // L: 1394 - int var30 = MouseHandler.MouseHandler_y + 25; // L: 1395 - if (var29 + var30 > 480) { // L: 1396 - var30 = MouseHandler.MouseHandler_y - 25 - var29; // L: 1397 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var30, var16, var29, 16777120); // L: 1399 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var30, var16, var29, 0); // L: 1400 - var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var30 + var1.ascent + 4, 0, -1); // L: 1401 - } - } - - AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 1404 - } // L: 1405 - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(Liv;IB)I", - garbageValue = "1" - ) - static final int method355(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10070 - try { - int[] var2 = var0.cs1Instructions[var1]; // L: 10072 - int var3 = 0; // L: 10073 - int var4 = 0; // L: 10074 - byte var5 = 0; // L: 10075 - - while (true) { - int var6 = var2[var4++]; // L: 10077 - int var7 = 0; // L: 10078 - byte var8 = 0; // L: 10079 - if (var6 == 0) { // L: 10080 - return var3; - } - - if (var6 == 1) { // L: 10081 - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { // L: 10082 - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { // L: 10083 - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { // L: 10084 - var9 = var2[var4++] << 16; // L: 10085 - var9 += var2[var4++]; // L: 10086 - var10 = WorldMapData_1.getWidget(var9); // L: 10087 - var11 = var2[var4++]; // L: 10088 - if (var11 != -1 && (!class250.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10089 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10090 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10091 - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { // L: 10095 - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { // L: 10096 - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { // L: 10097 - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { // L: 10098 - var7 = class262.localPlayer.combatLevel; - } - - if (var6 == 9) { // L: 10099 - for (var9 = 0; var9 < 25; ++var9) { // L: 10100 - if (Skills.Skills_enabled[var9]) { // L: 10101 - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { // L: 10104 - var9 = var2[var4++] << 16; // L: 10105 - var9 += var2[var4++]; // L: 10106 - var10 = WorldMapData_1.getWidget(var9); // L: 10107 - var11 = var2[var4++]; // L: 10108 - if (var11 != -1 && (!class250.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10109 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10110 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10111 - var7 = 999999999; // L: 10112 - break; // L: 10113 - } - } - } - } - - if (var6 == 11) { // L: 10118 - var7 = Client.runEnergy; - } - - if (var6 == 12) { // L: 10119 - var7 = Client.weight; - } - - if (var6 == 13) { // L: 10120 - var9 = Varps.Varps_main[var2[var4++]]; // L: 10121 - int var13 = var2[var4++]; // L: 10122 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10123 - } - - if (var6 == 14) { // L: 10125 - var9 = var2[var4++]; // L: 10126 - var7 = ScriptFrame.getVarbit(var9); // L: 10127 - } - - if (var6 == 15) { // L: 10129 - var8 = 1; - } - - if (var6 == 16) { // L: 10130 - var8 = 2; - } - - if (var6 == 17) { // L: 10131 - var8 = 3; - } - - if (var6 == 18) { // L: 10132 - var7 = (class262.localPlayer.x >> 7) + class15.baseX; - } - - if (var6 == 19) { // L: 10133 - var7 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; - } - - if (var6 == 20) { // L: 10134 - var7 = var2[var4++]; - } - - if (var8 == 0) { // L: 10135 - if (var5 == 0) { // L: 10136 - var3 += var7; - } - - if (var5 == 1) { // L: 10137 - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { // L: 10138 - var3 /= var7; - } - - if (var5 == 3) { // L: 10139 - var3 *= var7; - } - - var5 = 0; // L: 10140 - } else { - var5 = var8; // L: 10142 - } - } - } catch (Exception var14) { // L: 10145 - return -1; // L: 10146 - } - } else { - return -2; - } - } -} diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java new file mode 100644 index 0000000000..3afb1c2cec --- /dev/null +++ b/runescape-client/src/main/java/class270.java @@ -0,0 +1,659 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jo") +public enum class270 implements Enumerated { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ljo;" + ) + field3530(-1), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljo;" + ) + field3533(0), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ljo;" + ) + field3531(1), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ljo;" + ) + field3536(2); + + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("il") + @ObfuscatedGetter( + intValue = -1213067545 + ) + static int field3532; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -148347785 + ) + final int field3529; + + class270(int var3) { + this.field3529 = var3; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1806959663" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3529; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "530995962" + ) + static final void method4928() { + MouseHandler.method369("You can't add yourself to your own ignore list"); + } + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "([Lio;IIIIIIIB)V", + garbageValue = "0" + ) + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || MusicPatchNode.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (FloorUnderlayDefinition.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != Coord.mousedOverWidgetIf1 && FloorUnderlayDefinition.isComponentHidden(var9)) { + continue; + } + + int var10 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { + var12 = var2; + var13 = var3; + var14 = var4; + var15 = var5; + } else { + int var16; + if (var9.type == 9) { + var16 = var10; + var17 = var11; + var18 = var10 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var10) { + var16 = var18; + var18 = var10; + } + + if (var19 < var11) { + var17 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; + } else { + var16 = var10 + var9.width; + var17 = var11 + var9.height; + var12 = var10 > var2 ? var10 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; + } + } + + if (var9 == Client.clickedWidget) { + Client.field588 = true; + Client.field678 = var10; + Client.field676 = var11; + } + + boolean var33 = false; + if (var9.field3031) { + switch(Client.field569) { + case 0: + var33 = true; + case 1: + default: + break; + case 2: + if (Client.field483 == var9.id >>> 16) { + var33 = true; + } + break; + case 3: + if (var9.id == Client.field483) { + var33 = true; + } + } + } + + if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var26; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent) { + var26.remove(); + var26.widget.containsMouse = false; + } + } + + if (class106.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + KeyHandler.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { + var26.remove(); + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var34) { + GameBuild.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + MenuAction.checkIfMinimapClicked(var9, var10, var11); + } else { + if (var9.contentType == 1400) { + PcmPlayer.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var34) { + if (var9.contentType == 1400) { + PcmPlayer.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); + } else { + GameEngine.Widget_addToMenu(var9, var17 - var10, var18 - var11); + } + } + + boolean var21; + int var23; + if (var33) { + for (int var20 = 0; var20 < var9.field2987.length; ++var20) { + var21 = false; + boolean var27 = false; + if (!var21 && var9.field2987[var20] != null) { + for (var23 = 0; var23 < var9.field2987[var20].length; ++var23) { + boolean var24 = false; + if (var9.field2966 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2987[var20][var23]]; + } + + if (class310.method5655(var9.field2987[var20][var23]) || var24) { + var21 = true; + if (var9.field2966 != null && var9.field2966[var20] > Client.cycle) { + break; + } + + byte var32 = var9.field3033[var20][var23]; + if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var27 = true; + break; + } + } + } + } + + if (var27) { + if (var20 < 10) { + class183.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + WorldMapIcon_1.Widget_runOnTargetLeave(); + ApproximateRouteStrategy.selectSpell(var9.id, var9.childIndex, class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var9)), var9.itemId); + Client.selectedSpellActionName = PcmPlayer.Widget_getSpellActionName(var9); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + ScriptFrame.colorStartTag(16777215); + } + + var23 = var9.field2993[var20]; + if (var9.field2966 == null) { + var9.field2966 = new int[var9.field2987.length]; + } + + if (var9.field3035 == null) { + var9.field3035 = new int[var9.field2987.length]; + } + + if (var23 != 0) { + if (var9.field2966[var20] == 0) { + var9.field2966[var20] = var23 + Client.cycle + var9.field3035[var20]; + } else { + var9.field2966[var20] = var23 + Client.cycle; + } + } else { + var9.field2966[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field2966 != null) { + var9.field2966[var20] = 0; + } + } + } + + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var34 = true; + } else { + var34 = false; + } + + boolean var35 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { + var35 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + var21 = true; + } + + if (var21) { + ItemContainer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { + PcmPlayer.worldMap.method6159(var17, var18, var34 & var35, var34 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && Players.method2021(MusicPatchNode.getWidgetFlags(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field585 = true; + Client.field586 = var10; + Client.field587 = var11; + } + + if (var9.hasListener) { + ScriptEvent var22; + if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseY = Client.mouseWheelRotation; + var22.args = var9.onScroll; + Client.scriptEvents.addFirst(var22); + } + + if (Client.clickedWidget != null || Client.dragInventoryWidget != null || Client.isMenuOpen) { + var21 = false; + var35 = false; + var34 = false; + } + + if (!var9.isClicked && var21) { + var9.isClicked = true; + if (var9.onClick != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var22.args = var9.onClick; + Client.scriptEvents.addFirst(var22); + } + } + + if (var9.isClicked && var35 && var9.onClickRepeat != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var22); + } + + if (var9.isClicked && !var35) { + var9.isClicked = false; + if (var9.onRelease != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onRelease; + Client.field685.addFirst(var22); + } + } + + if (var35 && var9.onHold != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onHold; + Client.scriptEvents.addFirst(var22); + } + + if (!var9.containsMouse && var34) { + var9.containsMouse = true; + if (var9.onMouseOver != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var22); + } + } + + if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var22); + } + + if (var9.containsMouse && !var34) { + var9.containsMouse = false; + if (var9.onMouseLeave != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseLeave; + Client.field685.addFirst(var22); + } + } + + if (var9.onTimer != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onTimer; + Client.field611.addFirst(var22); + } + + ScriptEvent var25; + int var36; + int var37; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3095) { + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3095 <= 32) { + label821: + for (var37 = var9.field3095; var37 < Client.changedVarpCount; ++var37) { + var23 = Client.changedVarps[var37 & 31]; + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { + if (var23 == var9.varTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var25); + break label821; + } + } + } + } else { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3095 = Client.changedVarpCount; + } + + if (var9.onInvTransmit != null && Client.field574 > var9.field3096) { + if (var9.invTransmitTriggers != null && Client.field574 - var9.field3096 <= 32) { + label797: + for (var37 = var9.field3096; var37 < Client.field574; ++var37) { + var23 = Client.changedItemContainers[var37 & 31]; + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { + if (var23 == var9.invTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var25); + break label797; + } + } + } + } else { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3096 = Client.field574; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3097) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3097 <= 32) { + label773: + for (var37 = var9.field3097; var37 < Client.changedSkillsCount; ++var37) { + var23 = Client.changedSkills[var37 & 31]; + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { + if (var23 == var9.statTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var25); + break label773; + } + } + } + } else { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3097 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field3094 && var9.onChatTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field609 > var9.field3094 && var9.onFriendTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field603 > var9.field3094 && var9.onClanTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field604 > var9.field3094 && var9.field3074 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3074; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field605 > var9.field3094 && var9.field3072 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3072; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field606 > var9.field3094 && var9.onStockTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field479 > var9.field3094 && var9.field3078 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3078; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field516 > var9.field3094 && var9.onMiscTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3094 = Client.cycleCntr; + if (var9.onKey != null) { + for (var37 = 0; var37 < Client.field450; ++var37) { + ScriptEvent var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = Client.field430[var37]; + var31.keyPressed = Client.field633[var37]; + var31.args = var9.onKey; + Client.scriptEvents.addFirst(var31); + } + } + + ScriptEvent var30; + int[] var38; + if (var9.field3067 != null) { + var38 = Clock.method2682(); + + for (var23 = 0; var23 < var38.length; ++var23) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = var38[var23]; + var30.args = var9.field3067; + Client.scriptEvents.addFirst(var30); + } + } + + if (var9.field3068 != null) { + var38 = ClientPreferences.method1942(); + + for (var23 = 0; var23 < var38.length; ++var23) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = var38[var23]; + var30.args = var9.field3068; + Client.scriptEvents.addFirst(var30); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || Client.dragInventoryWidget != null || Client.isMenuOpen) { + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { + Coord.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + Coord.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + ModeWhere.field3698 = var9; + } + + if (var9.scrollHeight > var9.height) { + class124.method2536(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var28 != null) { + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var29.isMouseInputEvent) { + var29.remove(); + var29.widget.containsMouse = false; + } + } + + if (class106.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + KeyHandler.addCancelMenuEntry(); + } + } + + class245.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); + } + } + } + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java deleted file mode 100644 index 55ff2ce0ec..0000000000 --- a/runescape-client/src/main/java/class28.java +++ /dev/null @@ -1,30 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ad") -public class class28 implements class31 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;)Lnt;" - ) - public Buffer vmethod381(Buffer var1) { - Buffer var2 = new Buffer(100); // L: 9 - this.method367(var1, var2); // L: 10 - return var2; // L: 11 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lnt;Lnt;)V" - ) - void method367(Buffer var1, Buffer var2) { - class36 var3 = new class36(var1); // L: 15 - class33 var4 = new class33(var3); // L: 16 - - long var5; - for (var5 = 0L; !var4.method389(var3.method430(), var3.method425(), var5); ++var5) { // L: 17 18 19 - } - - var2.writeLong(var5); // L: 21 - } // L: 22 -} diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java deleted file mode 100644 index a9d59a8abd..0000000000 --- a/runescape-client/src/main/java/class281.java +++ /dev/null @@ -1,191 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("jv") -public class class281 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "-1059362880" - ) - @Export("sortItemsByName") - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { // L: 9 - int var4 = (var3 + var2) / 2; // L: 10 - int var5 = var2; // L: 11 - String var6 = var0[var4]; // L: 12 - var0[var4] = var0[var3]; // L: 13 - var0[var3] = var6; // L: 14 - short var7 = var1[var4]; // L: 15 - var1[var4] = var1[var3]; // L: 16 - var1[var3] = var7; // L: 17 - - for (int var8 = var2; var8 < var3; ++var8) { // L: 18 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 - String var9 = var0[var8]; // L: 20 - var0[var8] = var0[var5]; // L: 21 - var0[var5] = var9; // L: 22 - short var10 = var1[var8]; // L: 23 - var1[var8] = var1[var5]; // L: 24 - var1[var5++] = var10; // L: 25 - } - } - - var0[var3] = var0[var5]; // L: 29 - var0[var5] = var6; // L: 30 - var1[var3] = var1[var5]; // L: 31 - var1[var5] = var7; // L: 32 - sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 - sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 - } - - } // L: 36 - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "0" - ) - static int method5204(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2637 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2638 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2639 - return 1; // L: 2640 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2642 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2643 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2644 - return 1; // L: 2645 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2647 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2648 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2649 - return 1; // L: 2650 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2652 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2653 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2654 - return 1; // L: 2655 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2657 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2658 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2659 - return 1; // L: 2660 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2662 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2663 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2664 - return 1; // L: 2665 - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2667 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2668 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2669 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2670 - return 1; // L: 2671 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2673 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2674 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2675 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2676 - return 1; // L: 2677 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2679 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2680 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2681 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2682 - return 1; // L: 2683 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2685 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2686 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2687 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2688 - return 1; // L: 2689 - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2691 - var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2692 - if (class267.grandExchangeEvents != null) { // L: 2693 - class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2694 - } - - return 1; // L: 2696 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2698 - var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2699 - if (class267.grandExchangeEvents != null) { // L: 2700 - class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2701 - } - - return 1; // L: 2703 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2705 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2706 - var12 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] == 1; // L: 2707 - boolean var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 2708 - if (class267.grandExchangeEvents != null) { // L: 2709 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2710 - class267.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2711 - } - - return 1; // L: 2713 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2715 - var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2716 - if (class267.grandExchangeEvents != null) { // L: 2717 - class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2718 - } - - return 1; // L: 2720 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2722 - var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2723 - if (class267.grandExchangeEvents != null) { // L: 2724 - class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2725 - } - - return 1; // L: 2727 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2729 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class267.grandExchangeEvents == null ? 0 : class267.grandExchangeEvents.events.size(); // L: 2730 - return 1; // L: 2731 - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2733 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2734 - var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2735 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.world; // L: 2736 - return 1; // L: 2737 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2739 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2740 - var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2741 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2742 - return 1; // L: 2743 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2745 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2746 - var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2747 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2748 - return 1; // L: 2749 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2751 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2752 - var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2753 - long var5 = ClientPacket.currentTimeMillis() - WorldMapEvent.field2150 - var4.age; // L: 2754 - int var7 = (int)(var5 / 3600000L); // L: 2755 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2756 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2757 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2758 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var10; // L: 2759 - return 1; // L: 2760 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2762 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2763 - var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2764 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2765 - return 1; // L: 2766 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2768 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2769 - var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2770 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2771 - return 1; // L: 2772 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2774 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2775 - var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2776 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2777 - return 1; // L: 2778 - } else { - return 2; // L: 2780 - } - } - } - } - } -} diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java new file mode 100644 index 0000000000..924ad6bfc1 --- /dev/null +++ b/runescape-client/src/main/java/class282.java @@ -0,0 +1,23 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jg") +public class class282 { + @ObfuscatedName("o") + public static short[] field3634; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 1086292669 + ) + static int field3639; + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[II)V", + garbageValue = "-166028996" + ) + public static void method5133(String[] var0, int[] var1) { + ScriptEvent.method1809(var0, var1, 0, var0.length - 1); + } +} diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java deleted file mode 100644 index 967031dc74..0000000000 --- a/runescape-client/src/main/java/class286.java +++ /dev/null @@ -1,204 +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; - -@ObfuscatedName("ku") -public class class286 { - @ObfuscatedName("gm") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("f") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("v") - int[] field3664; - @ObfuscatedName("y") - int[] field3665; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1113129793 - ) - int field3663; - - public class286() { - this.spriteMap = new HashMap(); // L: 10 - this.bounds = new Bounds(0, 0); // L: 11 - this.field3664 = new int[2048]; // L: 12 - this.field3665 = new int[2048]; // L: 13 - this.field3663 = 0; // L: 14 - class379.field4145 = new int[2000]; // L: 22 - int var1 = 0; // L: 23 - int var2 = 240; // L: 24 - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25 - var4 = class93.method2186((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var1 / 16.0F + 0.075F)); // L: 27 - class379.field4145[var1] = var4; // L: 28 - ++var1; // L: 26 - } - - var2 = 48; // L: 30 - - for (int var6 = var2 / 6; var1 < class379.field4145.length; var2 -= var6) { // L: 31 32 38 - var4 = var1 * 2; // L: 33 - - for (int var5 = class93.method2186((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class379.field4145.length; ++var1) { // L: 34 35 - class379.field4145[var1] = var5; // L: 36 - } - } - - } // L: 41 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1586624720" - ) - void method5250(int var1) { - int var2 = var1 * 2 + 1; // L: 44 - double[] var3 = class171.method3616(0.0D, (double)((float)var1 / 3.0F), var1); // L: 45 - double var4 = var3[var1] * var3[var1]; // L: 46 - int[] var6 = new int[var2 * var2]; // L: 47 - boolean var7 = false; // L: 48 - - for (int var8 = 0; var8 < var2; ++var8) { // L: 49 - for (int var9 = 0; var9 < var2; ++var9) { // L: 50 - int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); // L: 51 - if (!var7 && var10 > 0) { // L: 52 - var7 = true; // L: 53 - } - } - } - - SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 57 - this.spriteMap.put(var1, var11); // L: 58 - } // L: 59 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)Loa;", - garbageValue = "62" - ) - SpritePixels method5244(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 62 - this.method5250(var1); // L: 63 - } - - return (SpritePixels)this.spriteMap.get(var1); // L: 65 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1758461055" - ) - public final void method5245(int var1, int var2) { - if (this.field3663 < this.field3664.length) { // L: 69 - this.field3664[this.field3663] = var1; // L: 70 - this.field3665[this.field3663] = var2; // L: 71 - ++this.field3663; // L: 72 - } - } // L: 73 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-633875575" - ) - public final void method5246() { - this.field3663 = 0; // L: 76 - } // L: 77 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IILoa;FB)V", - garbageValue = "12" - ) - public final void method5247(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); // L: 80 - SpritePixels var6 = this.method5244(var5); // L: 81 - int var7 = var5 * 2 + 1; // L: 82 - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 83 - Bounds var9 = new Bounds(0, 0); // L: 84 - this.bounds.setHigh(var7, var7); // L: 85 - System.nanoTime(); // L: 86 - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3663; ++var10) { // L: 87 - var11 = this.field3664[var10]; // L: 88 - var12 = this.field3665[var10]; // L: 89 - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 90 - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 91 - this.bounds.setLow(var13, var14); // L: 92 - this.bounds.method6009(var8, var9); // L: 93 - this.method5243(var6, var3, var9); // L: 94 - } - - System.nanoTime(); // L: 96 - System.nanoTime(); // L: 97 - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 98 - if (var3.pixels[var10] == 0) { // L: 99 - var3.pixels[var10] = -16777216; // L: 100 - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 103 - if (var11 <= 0) { // L: 104 - var3.pixels[var10] = -16777216; // L: 105 - } else { - if (var11 > class379.field4145.length) { // L: 108 - var11 = class379.field4145.length; - } - - var12 = class379.field4145[var11 - 1]; // L: 109 - var3.pixels[var10] = -16777216 | var12; // L: 110 - } - } - } - - System.nanoTime(); // L: 112 - } // L: 113 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Loa;Loa;Llw;I)V", - garbageValue = "1918246887" - ) - void method5243(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 116 - int var4 = 0; // L: 117 - int var5 = 0; // L: 118 - if (var3.lowX == 0) { // L: 119 - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { // L: 120 - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; // L: 121 - int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 122 - - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 123 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 124 - int[] var10000 = var2.pixels; // L: 125 - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; // L: 127 - var7 += var2.subWidth - var3.highX; // L: 128 - } - - } - } // L: 130 -} diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index 116d0fb9a8..cf9f0ed04c 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -1,51 +1,246 @@ +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("kc") +@ObfuscatedName("ki") public class class287 { - @ObfuscatedName("f") + @ObfuscatedName("s") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Llo;" ) - static final class287 field3672; - @ObfuscatedName("e") + @Export("bounds") + Bounds bounds; + @ObfuscatedName("v") + int[] field3666; + @ObfuscatedName("j") + int[] field3670; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -239642529 + ) + int field3668; + + public class287() { + this.spriteMap = new HashMap(); + this.bounds = new Bounds(0, 0); + this.field3666 = new int[2048]; + this.field3670 = new int[2048]; + this.field3668 = 0; + ScriptFrame.field375 = new int[2000]; + int var1 = 0; + int var2 = 240; + + int var4; + for (byte var3 = 12; var1 < 16; var2 -= var3) { + var4 = class125.method2543((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var1 / 16.0F)); + ScriptFrame.field375[var1] = var4; + ++var1; + } + + var2 = 48; + + for (int var6 = var2 / 6; var1 < ScriptFrame.field375.length; var2 -= var6) { + var4 = var1 * 2; + + for (int var5 = class125.method2543((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < ScriptFrame.field375.length; ++var1) { + ScriptFrame.field375[var1] = var5; + } + } + + } + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "(II)V", + garbageValue = "264341833" ) - static final class287 field3671; + void method5187(int var1) { + int var2 = var1 * 2 + 1; + double var4 = (double)((float)var1 / 3.0F); + int var6 = var1 * 2 + 1; + double[] var7 = new double[var6]; + int var8 = -var1; + + for (int var9 = 0; var8 <= var1; ++var9) { + double var16 = (double)(var8 - 0) / var4; + double var14 = Math.exp(-var16 * var16 / 2.0D) / Math.sqrt(6.283185307179586D); + double var24 = var14 / var4; + var7[var9] = var24; + ++var8; + } + + double[] var18 = var7; + double var19 = var7[var1] * var7[var1]; + int[] var21 = new int[var2 * var2]; + boolean var10 = false; + + for (int var11 = 0; var11 < var2; ++var11) { + for (int var12 = 0; var12 < var2; ++var12) { + int var13 = var21[var12 + var11 * var2] = (int)(var18[var11] * var18[var12] / var19 * 256.0D); + if (!var10 && var13 > 0) { + var10 = true; + } + } + } + + SpritePixels var22 = new SpritePixels(var21, var2, var2); + this.spriteMap.put(var1, var22); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IB)Lom;", + garbageValue = "12" + ) + SpritePixels method5181(int var1) { + if (!this.spriteMap.containsKey(var1)) { + this.method5187(var1); + } + + return (SpritePixels)this.spriteMap.get(var1); + } + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "(III)V", + garbageValue = "-407683126" ) - static final class287 field3673; - - static { - field3672 = new class287(); // L: 4 - field3671 = new class287(); // L: 5 - field3673 = new class287(); // L: 6 - } - - class287() { - } // L: 8 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)Ley;", - garbageValue = "-31" - ) - public static HealthBarDefinition method5260(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 final void method5182(int var1, int var2) { + if (this.field3668 < this.field3666.length) { + this.field3666[this.field3668] = var1; + this.field3670[this.field3668] = var2; + ++this.field3668; } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-126" + ) + public final void method5183() { + this.field3668 = 0; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IILom;FS)V", + garbageValue = "-18850" + ) + public final void method5184(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(18.0F * var4); + SpritePixels var6 = this.method5181(var5); + int var7 = var5 * 2 + 1; + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); + Bounds var9 = new Bounds(0, 0); + this.bounds.setHigh(var7, var7); + System.nanoTime(); + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3668; ++var10) { + var11 = this.field3666[var10]; + var12 = this.field3670[var10]; + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; + int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; + this.bounds.setLow(var13, var14); + this.bounds.method6028(var8, var9); + this.method5199(var6, var3, var9); + } + + System.nanoTime(); + System.nanoTime(); + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { + var3.pixels[var10] = -16777216; + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; + if (var11 <= 0) { + var3.pixels[var10] = -16777216; + } else { + if (var11 > ScriptFrame.field375.length) { + var11 = ScriptFrame.field375.length; + } + + var12 = ScriptFrame.field375[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; + } + } + } + + System.nanoTime(); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lom;Lom;Llo;B)V", + garbageValue = "45" + ) + void method5199(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { + int var4 = 0; + int var5 = 0; + if (var3.lowX == 0) { + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; + int var7 = var3.lowX + var2.subWidth * var3.lowY; + + for (int var8 = 0; var8 < var3.highY; ++var8) { + for (int var9 = 0; var9 < var3.highX; ++var9) { + int[] var10000 = var2.pixels; + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; + var7 += var2.subWidth - var3.highX; + } + + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)J", + garbageValue = "1695667576" + ) + static long method5201(CharSequence var0) { + long var1 = 0L; + int var3 = var0.length(); + + for (int var4 = 0; var4 < var3; ++var4) { + var1 *= 37L; + char var5 = var0.charAt(var4); + if (var5 >= 'A' && var5 <= 'Z') { + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { + var1 += (long)(var5 + 27 - 48); + } + + if (var1 >= 177917621779460413L) { + break; + } + } + + while (0L == var1 % 37L && var1 != 0L) { + var1 /= 37L; + } + + return var1; + } } diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java new file mode 100644 index 0000000000..0ed3fff4b7 --- /dev/null +++ b/runescape-client/src/main/java/class288.java @@ -0,0 +1,79 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kr") +public class class288 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + static final class288 field3672; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + static final class288 field3674; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + static final class288 field3673; + + static { + field3672 = new class288(); + field3674 = new class288(); + field3673 = new class288(); + } + + class288() { + } + + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "42" + ) + static void method5202() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1211 = null; + Client.packetWriter.field1213 = null; + Client.packetWriter.field1212 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1209 = 0; + Client.rebootTimer = 0; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.minimapState = 0; + Client.destinationX = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + MouseHandler.localPlayer = null; + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; + } + } + + ItemContainer.itemContainers = new NodeHashTable(32); + class16.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field616[var0] = true; + } + + PacketBufferNode var2 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(MusicPatch.getWindowedMode()); + var2.packetBuffer.writeShort(MouseRecorder.canvasWidth); + var2.packetBuffer.writeShort(Client.canvasHeight); + Client.packetWriter.addNode(var2); + } +} diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java deleted file mode 100644 index f659daf5c5..0000000000 --- a/runescape-client/src/main/java/class289.java +++ /dev/null @@ -1,24 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kx") -public class class289 { - @ObfuscatedName("ql") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - - static { - new HashMap(); - } // L: 9 -} diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java deleted file mode 100644 index 2ea244a58a..0000000000 --- a/runescape-client/src/main/java/class29.java +++ /dev/null @@ -1,181 +0,0 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; -import java.util.concurrent.Callable; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("at") -public class class29 implements Callable { - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "Lcz;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - final Buffer field224; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Laz;" - ) - final class31 field220; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Laq;" - ) - final class35 this$0; - - @ObfuscatedSignature( - descriptor = "(Laq;Lnt;Laz;)V" - ) - class29(class35 var1, Buffer var2, class31 var3) { - this.this$0 = var1; // L: 47 - this.field224 = var2; // L: 48 - this.field220 = var3; // L: 49 - } // L: 50 - - public Object call() { - return this.field220.vmethod381(this.field224); // L: 53 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "10193583" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 147 - var1.offset = var0.length - 2; // L: 148 - class397.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 149 - class397.SpriteBuffer_xOffsets = new int[class397.SpriteBuffer_spriteCount]; // L: 150 - class26.SpriteBuffer_yOffsets = new int[class397.SpriteBuffer_spriteCount]; // L: 151 - Canvas.SpriteBuffer_spriteWidths = new int[class397.SpriteBuffer_spriteCount]; // L: 152 - Clock.SpriteBuffer_spriteHeights = new int[class397.SpriteBuffer_spriteCount]; // L: 153 - class126.SpriteBuffer_pixels = new byte[class397.SpriteBuffer_spriteCount][]; // L: 154 - var1.offset = var0.length - 7 - class397.SpriteBuffer_spriteCount * 8; // L: 155 - class397.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 156 - class244.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 157 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 158 - - int var3; - for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 159 - class397.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 160 - class26.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 161 - Canvas.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 162 - Clock.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class397.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 163 - class397.SpriteBuffer_spritePalette = new int[var2]; // L: 164 - - for (var3 = 1; var3 < var2; ++var3) { // L: 165 - class397.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 166 - if (class397.SpriteBuffer_spritePalette[var3] == 0) { // L: 167 - class397.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; // L: 169 - - for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 170 - int var4 = Canvas.SpriteBuffer_spriteWidths[var3]; // L: 171 - int var5 = Clock.SpriteBuffer_spriteHeights[var3]; // L: 172 - int var6 = var4 * var5; // L: 173 - byte[] var7 = new byte[var6]; // L: 174 - class126.SpriteBuffer_pixels[var3] = var7; // L: 175 - int var8 = var1.readUnsignedByte(); // L: 176 - int var9; - if (var8 == 0) { // L: 177 - for (var9 = 0; var9 < var6; ++var9) { // L: 178 - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { // L: 180 - for (var9 = 0; var9 < var4; ++var9) { // L: 181 - for (int var10 = 0; var10 < var5; ++var10) { // L: 182 - var7[var9 + var10 * var4] = var1.readByte(); // L: 183 - } - } - } - } - - } // L: 188 - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2077147833" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; // L: 551 - if (class14.garbageCollector == null || !class14.garbageCollector.isValid()) { // L: 552 - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 554 - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 555 - if (var2.isValid()) { // L: 557 - class14.garbageCollector = var2; // L: 558 - GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 559 - GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 560 - } - } - } catch (Throwable var11) { // L: 565 - } - } - - if (class14.garbageCollector != null) { // L: 567 - long var9 = ClientPacket.currentTimeMillis(); // L: 568 - long var3 = class14.garbageCollector.getCollectionTime(); // L: 569 - if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 570 - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 571 - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 572 - if (var7 != 0L) { // L: 573 - var0 = (int)(100L * var5 / var7); - } - } - - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 575 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 576 - } - - return var0; // L: 578 - } - - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2119346046" - ) - static final void method378(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : AttackOption.guestClanChannel; // L: 11495 - if (var2 != null && var1 >= 0 && var1 < var2.method49()) { // L: 11496 - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11497 - if (var3.rank == -1) { // L: 11498 - String var4 = var3.name; // L: 11499 - PacketWriter var5 = Client.packetWriter; // L: 11500 - PacketBufferNode var6 = InterfaceParent.getPacketBufferNode(ClientPacket.field2583, var5.isaacCipher); // L: 11501 - var6.packetBuffer.writeByte(3 + class44.stringCp1252NullTerminatedByteSize(var4)); // L: 11502 - var6.packetBuffer.writeByte(var0); // L: 11503 - var6.packetBuffer.writeShort(var1); // L: 11504 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11505 - var5.addNode(var6); // L: 11506 - } - } - } // L: 11507 -} diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java new file mode 100644 index 0000000000..3826014fa7 --- /dev/null +++ b/runescape-client/src/main/java/class290.java @@ -0,0 +1,169 @@ +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("kl") +public class class290 { + @ObfuscatedName("eh") + @ObfuscatedGetter( + intValue = 137338765 + ) + @Export("currentPort") + static int currentPort; + + static { + new HashMap(); + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljy;III)Z", + garbageValue = "-382888164" + ) + static boolean method5208(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { + return false; + } else { + Occluder.SpriteBuffer_decode(var3); + return true; + } + } + + @ObfuscatedName("ik") + @ObfuscatedSignature( + descriptor = "(Lej;IIII)V", + garbageValue = "-492352904" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { + if (var0.transforms != null) { + var0 = var0.transform(); + } + + if (var0 != null) { + if (var0.isInteractable) { + if (!var0.isFollower || Client.followerIndex == var1) { + String var4 = var0.name; + int var7; + int var8; + if (var0.combatLevel != 0) { + var7 = var0.combatLevel; + var8 = MouseHandler.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = ScriptFrame.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = ScriptFrame.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = ScriptFrame.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = ScriptFrame.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = ScriptFrame.colorStartTag(65280); + } else if (var9 > 6) { + var6 = ScriptFrame.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = ScriptFrame.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = ScriptFrame.colorStartTag(12648192); + } else { + var6 = ScriptFrame.colorStartTag(16776960); + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((ViewportMouse.selectedSpellFlags & 2) == 2) { + class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16776960) + var4, 8, var1, var2, var3); + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var11 = var0.actions; + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { + var8 = 0; + if (var7 == 0) { + var8 = var10 + 9; + } + + if (var7 == 1) { + var8 = var10 + 10; + } + + if (var7 == 2) { + var8 = var10 + 11; + } + + if (var7 == 3) { + var8 = var10 + 12; + } + + if (var7 == 4) { + var8 = var10 + 13; + } + + class7.insertMenuItemNoShift(var11[var7], ScriptFrame.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { + short var12 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > MouseHandler.localPlayer.combatLevel) { + var12 = 2000; + } + + var8 = 0; + if (var7 == 0) { + var8 = var12 + 9; + } + + if (var7 == 1) { + var8 = var12 + 10; + } + + if (var7 == 2) { + var8 = var12 + 11; + } + + if (var7 == 3) { + var8 = var12 + 12; + } + + if (var7 == 4) { + var8 = var12 + 13; + } + + class7.insertMenuItemNoShift(var11[var7], ScriptFrame.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { + class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + } + + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java new file mode 100644 index 0000000000..42042b3261 --- /dev/null +++ b/runescape-client/src/main/java/class3.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("j") +public interface class3 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnv;)Lnv;" + ) + Buffer vmethod15(Buffer var1); +} diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java deleted file mode 100644 index aee2366f58..0000000000 --- a/runescape-client/src/main/java/class30.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ah") -public interface class30 { -} diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java deleted file mode 100644 index 4e24f434bf..0000000000 --- a/runescape-client/src/main/java/class302.java +++ /dev/null @@ -1,43 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ko") -public class class302 { - @ObfuscatedName("f") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)Lof;", - garbageValue = "-5" - ) - static IndexedSprite method5571() { - IndexedSprite var0 = new IndexedSprite(); // L: 110 - var0.width = class397.SpriteBuffer_spriteWidth; // L: 111 - var0.height = class244.SpriteBuffer_spriteHeight; // L: 112 - var0.xOffset = class397.SpriteBuffer_xOffsets[0]; // L: 113 - var0.yOffset = class26.SpriteBuffer_yOffsets[0]; // L: 114 - var0.subWidth = Canvas.SpriteBuffer_spriteWidths[0]; // L: 115 - var0.subHeight = Clock.SpriteBuffer_spriteHeights[0]; // L: 116 - var0.palette = class397.SpriteBuffer_spritePalette; // L: 117 - var0.pixels = class126.SpriteBuffer_pixels[0]; // L: 118 - ArchiveDisk.method5993(); // L: 119 - return var0; // L: 120 - } - - @ObfuscatedName("gm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "11" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; // L: 4394 - } -} diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index bcebe2b846..a43fead51b 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -1,89 +1,39 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("ky") public class class303 { - @ObfuscatedName("f") - public static char[] field3747; - @ObfuscatedName("e") - static char[] field3745; - @ObfuscatedName("v") - static char[] field3748; - @ObfuscatedName("y") - static int[] field3746; + @ObfuscatedName("s") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; static { - field3747 = new char[64]; // L: 7 + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; + } - int var0; - for (var0 = 0; var0 < 26; ++var0) { // L: 8 - field3747[var0] = (char)(var0 + 65); + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "233740955" + ) + static int method5561() { + return ++Messages.Messages_count - 1; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-2008155506" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } - - for (var0 = 26; var0 < 52; ++var0) { // L: 9 - field3747[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 10 - field3747[var0] = (char)(var0 + 48 - 52); - } - - field3747[62] = '+'; // L: 11 - field3747[63] = '/'; // L: 12 - field3745 = new char[64]; // L: 18 - - for (var0 = 0; var0 < 26; ++var0) { // L: 19 - field3745[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 20 - field3745[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 21 - field3745[var0] = (char)(var0 + 48 - 52); - } - - field3745[62] = '*'; // L: 22 - field3745[63] = '-'; // L: 23 - field3748 = new char[64]; // L: 29 - - for (var0 = 0; var0 < 26; ++var0) { // L: 30 - field3748[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 31 - field3748[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 32 - field3748[var0] = (char)(var0 + 48 - 52); - } - - field3748[62] = '-'; // L: 33 - field3748[63] = '_'; // L: 34 - field3746 = new int[128]; // L: 40 - - for (var0 = 0; var0 < field3746.length; ++var0) { // L: 41 - field3746[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { // L: 42 - field3746[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { // L: 43 - field3746[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { // L: 44 - field3746[var0] = var0 - 48 + 52; - } - - int[] var2 = field3746; // L: 45 - field3746[43] = 62; // L: 46 - var2[42] = 62; // L: 47 - int[] var1 = field3746; // L: 48 - field3746[47] = 63; // L: 49 - var1[45] = 63; // L: 50 - } // L: 51 + } } diff --git a/runescape-client/src/main/java/class304.java b/runescape-client/src/main/java/class304.java index 194ec3bc03..c1d7ceaa67 100644 --- a/runescape-client/src/main/java/class304.java +++ b/runescape-client/src/main/java/class304.java @@ -1,31 +1,97 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") -public final class class304 { - @ObfuscatedName("f") +@ObfuscatedName("kx") +public class class304 { + @ObfuscatedName("s") + public static char[] field3755; + @ObfuscatedName("t") + static char[] field3756; + @ObfuscatedName("v") + static char[] field3757; + @ObfuscatedName("j") + static int[] field3760; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-238084679" + descriptor = "Lof;" ) - public static byte[] method5597(Object var0, boolean var1) { - if (var0 == null) { // L: 8 - return null; - } else if (var0 instanceof byte[]) { // L: 9 - byte[] var6 = (byte[])((byte[])var0); // L: 10 - if (var1) { // L: 11 - int var4 = var6.length; // L: 14 - byte[] var5 = new byte[var4]; // L: 15 - System.arraycopy(var6, 0, var5, 0, var4); // L: 16 - return var5; // L: 19 - } else { - return var6; // L: 21 - } - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 23 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 24 - return var2.get(); // L: 25 - } else { - throw new IllegalArgumentException(); // L: 27 + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + + static { + field3755 = new char[64]; + + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3755[var0] = (char)(var0 + 65); } + + for (var0 = 26; var0 < 52; ++var0) { + field3755[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3755[var0] = (char)(var0 + 48 - 52); + } + + field3755[62] = '+'; + field3755[63] = '/'; + field3756 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3756[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3756[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3756[var0] = (char)(var0 + 48 - 52); + } + + field3756[62] = '*'; + field3756[63] = '-'; + field3757 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3757[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3757[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3757[var0] = (char)(var0 + 48 - 52); + } + + field3757[62] = '-'; + field3757[63] = '_'; + field3760 = new int[128]; + + for (var0 = 0; var0 < field3760.length; ++var0) { + field3760[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3760[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3760[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3760[var0] = var0 - 48 + 52; + } + + int[] var2 = field3760; + field3760[43] = 62; + var2[42] = 62; + int[] var1 = field3760; + field3760[47] = 63; + var1[45] = 63; } } diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java deleted file mode 100644 index b398506548..0000000000 --- a/runescape-client/src/main/java/class305.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("kp") -public class class305 { - @ObfuscatedName("j") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; -} diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java deleted file mode 100644 index 8f78a77dd4..0000000000 --- a/runescape-client/src/main/java/class306.java +++ /dev/null @@ -1,28 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kb") -public final class class306 { - @ObfuscatedName("f") - @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("e") - static long[] field3756; - @ObfuscatedName("ej") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive15") - static Archive archive15; - - 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 - field3756 = new long[12]; // L: 5 - - for (int var0 = 0; var0 < field3756.length; ++var0) { // L: 8 - field3756[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } // L: 9 -} diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java index 09920efa79..6c7f9090fc 100644 --- a/runescape-client/src/main/java/class307.java +++ b/runescape-client/src/main/java/class307.java @@ -1,71 +1,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") -public class class307 { - @ObfuscatedName("f") - @Export("writeRandomDat") - public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if (var2 == var0) { // L: 12 - if (var3 == var1) { // L: 13 - return; - } +@ObfuscatedName("ka") +public final class class307 { + @ObfuscatedName("sc") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("s") + @Export("base37Table") + public static final char[] base37Table; + @ObfuscatedName("t") + static long[] field3764; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Llo;" + ) + static Bounds field3766; - if (var3 > var1 && var3 < var4 + var1) { // L: 14 - --var4; // L: 15 - var1 += var4; // L: 16 - var3 += var4; // L: 17 - var4 = var1 - var4; // L: 18 + 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'}; + field3764 = new long[12]; - for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28 - var2[var3--] = var0[var1--]; // L: 21 - var2[var3--] = var0[var1--]; // L: 22 - var2[var3--] = var0[var1--]; // L: 23 - var2[var3--] = var0[var1--]; // L: 24 - var2[var3--] = var0[var1--]; // L: 25 - var2[var3--] = var0[var1--]; // L: 26 - var2[var3--] = var0[var1--]; // L: 27 - } - - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 - } - - return; // L: 32 - } + for (int var0 = 0; var0 < field3764.length; ++var0) { + field3764[var0] = (long)Math.pow(37.0D, (double)var0); } - var4 += var1; // L: 35 - - for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45 - var2[var3++] = var0[var1++]; // L: 38 - var2[var3++] = var0[var1++]; // L: 39 - var2[var3++] = var0[var1++]; // L: 40 - var2[var3++] = var0[var1++]; // L: 41 - var2[var3++] = var0[var1++]; // L: 42 - var2[var3++] = var0[var1++]; // L: 43 - var2[var3++] = var0[var1++]; // L: 44 - } - - for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 - } - - } // L: 49 - - @ObfuscatedName("d") - @Export("clearIntArray") - public static void clearIntArray(int[] var0, int var1, int var2) { - for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 - var0[var1++] = 0; // L: 366 - var0[var1++] = 0; // L: 367 - var0[var1++] = 0; // L: 368 - var0[var1++] = 0; // L: 369 - var0[var1++] = 0; // L: 370 - var0[var1++] = 0; // L: 371 - var0[var1++] = 0; // L: 372 - } - - for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 - } - - } // L: 377 + } } diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class308.java new file mode 100644 index 0000000000..47a8905eea --- /dev/null +++ b/runescape-client/src/main/java/class308.java @@ -0,0 +1,71 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("kz") +public class class308 { + @ObfuscatedName("s") + @Export("writeRandomDat") + public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { + if (var2 == var0) { + if (var3 == var1) { + return; + } + + if (var3 > var1 && var3 < var4 + var1) { + --var4; + var1 += var4; + var3 += var4; + var4 = var1 - var4; + + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + } + + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { + } + + return; + } + } + + var4 += var1; + + for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + } + + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { + } + + } + + @ObfuscatedName("x") + @Export("clearIntArray") + public static void clearIntArray(int[] var0, int var1, int var2) { + for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + } + + for (var2 += 7; var1 < var2; var0[var1++] = 0) { + } + + } +} diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java deleted file mode 100644 index d81ac93e36..0000000000 --- a/runescape-client/src/main/java/class309.java +++ /dev/null @@ -1,57 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kf") -public class class309 { - @ObfuscatedName("fk") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - @Export("fontBold12") - static Font fontBold12; - - @ObfuscatedName("kz") - @ObfuscatedSignature( - descriptor = "(Liv;I)V", - garbageValue = "1818635453" - ) - static final void method5671(Widget var0) { - int var1 = var0.contentType; // L: 11205 - if (var1 == 324) { // L: 11206 - if (Client.field890 == -1) { // L: 11207 - Client.field890 = var0.spriteId2; // L: 11208 - Client.field902 = var0.spriteId; // L: 11209 - } - - if (Client.playerAppearance.isFemale) { // L: 11211 - var0.spriteId2 = Client.field890; - } else { - var0.spriteId2 = Client.field902; // L: 11212 - } - - } else if (var1 == 325) { // L: 11215 - if (Client.field890 == -1) { // L: 11216 - Client.field890 = var0.spriteId2; // L: 11217 - Client.field902 = var0.spriteId; // L: 11218 - } - - if (Client.playerAppearance.isFemale) { // L: 11220 - var0.spriteId2 = Client.field902; - } else { - var0.spriteId2 = Client.field890; // L: 11221 - } - - } else if (var1 == 327) { // L: 11224 - var0.modelAngleX = 150; // L: 11225 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11226 - var0.modelType = 5; // L: 11227 - var0.modelId = 0; // L: 11228 - } else if (var1 == 328) { // L: 11231 - var0.modelAngleX = 150; // L: 11232 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11233 - var0.modelType = 5; // L: 11234 - var0.modelId = 1; // L: 11235 - } - } // L: 11213 11222 11229 11236 11238 -} diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java deleted file mode 100644 index 96945230a3..0000000000 --- a/runescape-client/src/main/java/class31.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("az") -public interface class31 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;)Lnt;" - ) - Buffer vmethod381(Buffer var1); -} diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java new file mode 100644 index 0000000000..a78aef4361 --- /dev/null +++ b/runescape-client/src/main/java/class310.java @@ -0,0 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kg") +public class class310 { + @ObfuscatedName("dn") + @Export("mouseCam") + static boolean mouseCam; + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1349204309" + ) + static boolean method5655(int var0) { + for (int var1 = 0; var1 < Client.field450; ++var1) { + if (Client.field430[var1] == var0) { + return true; + } + } + + return false; + } +} diff --git a/runescape-client/src/main/java/class314.java b/runescape-client/src/main/java/class314.java index e0e7f554c6..037e6b045d 100644 --- a/runescape-client/src/main/java/class314.java +++ b/runescape-client/src/main/java/class314.java @@ -1,25 +1,25 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("ll") public class class314 { - @ObfuscatedName("fy") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "([BB)Lkt;", + garbageValue = "53" ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1476009263" - ) - static final void method5693(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your ignore list").toString(); // L: 183 - UserComparator10.addGameMessage(30, "", var1); // L: 185 - } // L: 187 + static Font method5680(byte[] var0) { + if (var0 == null) { + return null; + } else { + Font var1 = new Font(var0, class398.SpriteBuffer_xOffsets, class398.SpriteBuffer_yOffsets, ClanChannelMember.SpriteBuffer_spriteWidths, class374.SpriteBuffer_spriteHeights, class118.SpriteBuffer_spritePalette, class398.SpriteBuffer_pixels); + class398.SpriteBuffer_xOffsets = null; + class398.SpriteBuffer_yOffsets = null; + ClanChannelMember.SpriteBuffer_spriteWidths = null; + class374.SpriteBuffer_spriteHeights = null; + class118.SpriteBuffer_spritePalette = null; + class398.SpriteBuffer_pixels = null; + return var1; + } + } } diff --git a/runescape-client/src/main/java/class315.java b/runescape-client/src/main/java/class315.java new file mode 100644 index 0000000000..589b1b64b6 --- /dev/null +++ b/runescape-client/src/main/java/class315.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lj") +public class class315 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "16" + ) + static final void method5681() { + MouseHandler.method369("Your ignore list is full. Max of 100 for free users, and 400 for members"); + } +} diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java deleted file mode 100644 index c47114e429..0000000000 --- a/runescape-client/src/main/java/class32.java +++ /dev/null @@ -1,231 +0,0 @@ -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("ap") -public final class class32 { - @ObfuscatedName("hg") - @ObfuscatedGetter( - intValue = 450314799 - ) - @Export("cameraYaw") - static int cameraYaw; - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "121" - ) - public static boolean method384(int var0) { - return var0 == WorldMapDecorationType.field3168.id; // L: 46 - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "-88" - ) - static int method386(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2455 - if (WorldMapManager.guestClanSettings != null) { // L: 2456 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2457 - DirectByteArrayCopier.field3128 = WorldMapManager.guestClanSettings; // L: 2458 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2460 - } - - return 1; // L: 2461 - } else { - int var3; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2463 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2464 - if (Client.currentClanSettings[var3] != null) { // L: 2465 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2466 - DirectByteArrayCopier.field3128 = Client.currentClanSettings[var3]; // L: 2467 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2469 - } - - return 1; // L: 2470 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2472 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = DirectByteArrayCopier.field3128.name; // L: 2473 - return 1; // L: 2474 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2476 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.allowGuests ? 1 : 0; // L: 2477 - return 1; // L: 2478 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2480 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field87; // L: 2481 - return 1; // L: 2482 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2484 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field88; // L: 2485 - return 1; // L: 2486 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2488 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field93; // L: 2489 - return 1; // L: 2490 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2492 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field90; // L: 2493 - return 1; // L: 2494 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2496 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.memberCount; // L: 2497 - return 1; // L: 2498 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2500 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2501 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = DirectByteArrayCopier.field3128.memberNames[var3]; // L: 2502 - return 1; // L: 2503 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2505 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2506 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.memberRanks[var3]; // L: 2507 - return 1; // L: 2508 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2510 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.bannedMemberCount; // L: 2511 - return 1; // L: 2512 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2514 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2515 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = DirectByteArrayCopier.field3128.bannedMemberNames[var3]; // L: 2516 - return 1; // L: 2517 - } else { - int var5; - int var6; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2519 - ChatChannel.Interpreter_intStackSize -= 3; // L: 2520 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2521 - var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2522 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2523 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.method170(var3, var6, var5); // L: 2524 - return 1; // L: 2525 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2527 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.currentOwner; // L: 2528 - return 1; // L: 2529 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2531 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field99; // L: 2532 - return 1; // L: 2533 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2535 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.method196(Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 2536 - return 1; // L: 2537 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2539 - Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.getSortedMembers()[Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1]]; // L: 2540 - return 1; // L: 2541 - } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2543 - ChatChannel.Interpreter_intStackSize -= 2; // L: 2544 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2545 - var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2546 - WorldMapRegion.method3519(var6, var3); // L: 2547 - return 1; // L: 2548 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2550 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2551 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field96[var3]; // L: 2552 - return 1; // L: 2553 - } else { - if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2555 - ChatChannel.Interpreter_intStackSize -= 3; // L: 2556 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2557 - boolean var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 2558 - var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2559 - GrandExchangeOfferAgeComparator.method5203(var5, var3, var4); // L: 2560 - } - - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2562 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2563 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field97[var3] ? 1 : 0; // L: 2564 - return 1; // L: 2565 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2567 - if (AttackOption.guestClanChannel != null) { // L: 2568 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2569 - WorldMapIcon_0.field2031 = AttackOption.guestClanChannel; // L: 2570 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2572 - } - - return 1; // L: 2573 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2575 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2576 - if (Client.currentClanChannels[var3] != null) { // L: 2577 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2578 - WorldMapIcon_0.field2031 = Client.currentClanChannels[var3]; // L: 2579 - class21.field171 = var3; // L: 2580 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2582 - } - - return 1; // L: 2583 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2585 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = WorldMapIcon_0.field2031.name; // L: 2586 - return 1; // L: 2587 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2589 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.field28; // L: 2590 - return 1; // L: 2591 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2593 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.field27; // L: 2594 - return 1; // L: 2595 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2597 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.method49(); // L: 2598 - return 1; // L: 2599 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2601 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2602 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ((ClanChannelMember)WorldMapIcon_0.field2031.members.get(var3)).name; // L: 2603 - return 1; // L: 2604 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2606 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2607 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapIcon_0.field2031.members.get(var3)).rank; // L: 2608 - return 1; // L: 2609 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2611 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2612 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapIcon_0.field2031.members.get(var3)).world; // L: 2613 - return 1; // L: 2614 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2616 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2617 - class29.method378(class21.field171, var3); // L: 2618 - return 1; // L: 2619 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2621 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.method38(Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 2622 - return 1; // L: 2623 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2625 - Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.getSortedMembers()[Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1]]; // L: 2626 - return 1; // L: 2627 - } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2629 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class10.field74 != null ? 1 : 0; // L: 2630 - return 1; // L: 2631 - } else { - return 2; // L: 2633 - } - } - } - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "-45" - ) - public static int method387(String var0) { - return var0.length() + 2; // L: 130 - } - - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(IIIILoa;Liq;B)V", - garbageValue = "-104" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { // L: 11423 - int var6 = Client.camAngleY & 2047; // L: 11424 - int var7 = var3 * var3 + var2 * var2; // L: 11425 - if (var7 <= 6400) { // L: 11426 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11427 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11428 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11429 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11430 - if (var7 > 2500) { - var4.method7041(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: 11431 - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11432 - } - - } - } - } // L: 11433 -} diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java deleted file mode 100644 index 8f30acc0ff..0000000000 --- a/runescape-client/src/main/java/class33.java +++ /dev/null @@ -1,80 +0,0 @@ -import java.io.UnsupportedEncodingException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ag") -public class class33 implements class30 { - @ObfuscatedName("f") - final MessageDigest field230; - - @ObfuscatedSignature( - descriptor = "(Lae;)V" - ) - class33(class36 var1) { - this.field230 = this.method393(); // L: 14 - } // L: 15 - - @ObfuscatedName("f") - boolean method389(int var1, String var2, long var3) { - byte[] var5 = this.method388(var2, var3); // L: 18 - return method392(var5) >= var1; // L: 19 - } - - @ObfuscatedName("y") - byte[] method388(String var1, long var2) { - StringBuilder var4 = new StringBuilder(); // L: 56 - var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field230.reset(); // L: 58 - - try { - this.field230.update(var4.toString().getBytes("UTF-8")); // L: 60 - } catch (UnsupportedEncodingException var6) { // L: 62 - var6.printStackTrace(); // L: 63 - } - - return this.field230.digest(); // L: 65 - } - - @ObfuscatedName("j") - MessageDigest method393() { - try { - return MessageDigest.getInstance("SHA-256"); // L: 70 - } catch (NoSuchAlgorithmException var2) { // L: 72 - var2.printStackTrace(); // L: 73 - return null; // L: 74 - } - } - - @ObfuscatedName("e") - static int method392(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 = method391(var4); // L: 29 - var1 += var5; // L: 30 - if (var5 != 8) { // L: 31 - break; - } - } - - return var1; // L: 37 - } - - @ObfuscatedName("v") - static int method391(byte var0) { - int var1 = 0; // L: 41 - if (var0 == 0) { // L: 42 - var1 = 8; // L: 43 - } else { - for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { // L: 46 47 49 - ++var1; // L: 48 - } - } - - return var1; // L: 52 - } -} diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java new file mode 100644 index 0000000000..15ec9ca559 --- /dev/null +++ b/runescape-client/src/main/java/class337.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lh") +public class class337 { + @ObfuscatedName("h") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; +} diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java new file mode 100644 index 0000000000..0532d66fc1 --- /dev/null +++ b/runescape-client/src/main/java/class338.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("mo") +public enum class338 implements Enumerated { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + field3929(0, 1), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + field3928(1, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + field3933(2, 3), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + field3930(3, 10); + + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -26430635 + ) + final int field3931; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 800833819 + ) + final int field3932; + + class338(int var3, int var4) { + this.field3931 = var3; + this.field3932 = var4; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1806959663" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3932; + } +} diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java index 98d95603c8..3c2384808b 100644 --- a/runescape-client/src/main/java/class339.java +++ b/runescape-client/src/main/java/class339.java @@ -1,61 +1,61 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") -public enum class339 implements Enumerated -{ - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lmw;" - ) - field3916(0, 1), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lmw;" - ) - field3913(3, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lmw;" - ) - field3914(2, 3), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lmw;" - ) - field3915(1, 10); - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Loa;" - ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; +@ObfuscatedName("ma") +public class class339 implements class344 { @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1941464297 - ) - final int field3912; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1941103959 - ) - final int field3917; - - class339(int var3, int var4) { - this.field3912 = var3; // L: 16 - this.field3917 = var4; // L: 17 - } // L: 18 - - @ObfuscatedName("f") + static byte[][][] field3936; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" + descriptor = "Ljy;" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3917; // L: 21 + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lng;" + ) + public final class364 field3935; + + @ObfuscatedSignature( + descriptor = "(Lno;)V" + ) + class339(class365 var1) { + this.field3935 = var1; + } + + @ObfuscatedSignature( + descriptor = "(Lmh;)V" + ) + public class339(class340 var1) { + this(new class365(var1)); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "25" + ) + public int method6059(int var1) { + return this.field3935.vmethod6433(var1); + } + + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-60" + ) + static void method6057() { + if (Client.oculusOrbState == 1) { + Client.field489 = true; + } + } } diff --git a/runescape-client/src/main/java/class34.java b/runescape-client/src/main/java/class34.java deleted file mode 100644 index f32d74523b..0000000000 --- a/runescape-client/src/main/java/class34.java +++ /dev/null @@ -1,808 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ab") -public enum class34 implements Enumerated -{ - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lab;" - ) - field232(0, 0); - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1096929681 - ) - public final int field233; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1588992419 - ) - final int field236; - - class34(int var3, int var4) { - this.field233 = var3; // L: 12 - this.field236 = var4; // L: 13 - } // L: 14 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field236; // L: 17 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2123996277" - ) - public static int method402(int var0, int var1) { - int var2; - if (var1 > var0) { // L: 24 - var2 = var0; // L: 25 - var0 = var1; // L: 26 - var1 = var2; // L: 27 - } - - while (var1 != 0) { // L: 29 - var2 = var0 % var1; // L: 30 - var0 = var1; // L: 31 - var1 = var2; // L: 32 - } - - return var0; // L: 34 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "63" - ) - public static void method406() { - synchronized(MouseHandler.MouseHandler_instance) { // L: 43 - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 44 - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 45 - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 46 - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 47 - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 48 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 49 - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 50 - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 51 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 52 - } - } // L: 54 - - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("load") - static void load() { - int var21; - if (Client.titleLoadingStage == 0) { // L: 1747 - DevicePcmPlayerProvider.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1748 - - for (var21 = 0; var21 < 4; ++var21) { // L: 1749 - Client.collisionMaps[var21] = new CollisionMap(104, 104); - } - - class69.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1750 - Login.Login_loadingText = "Starting game engine..."; // L: 1751 - Login.Login_loadingPercent = 5; // L: 1752 - Client.titleLoadingStage = 20; // L: 1753 - } else if (Client.titleLoadingStage == 20) { // L: 1756 - Login.Login_loadingText = "Prepared visibility map"; // L: 1757 - Login.Login_loadingPercent = 10; // L: 1758 - Client.titleLoadingStage = 30; // L: 1759 - } else if (Client.titleLoadingStage == 30) { // L: 1762 - ClanChannel.archive0 = UrlRequest.newArchive(0, false, true, true); // L: 1763 - KitDefinition.archive1 = UrlRequest.newArchive(1, false, true, true); // L: 1764 - SecureRandomFuture.archive2 = UrlRequest.newArchive(2, true, false, true); // L: 1765 - class18.archive3 = UrlRequest.newArchive(3, false, true, true); // L: 1766 - class26.archive4 = UrlRequest.newArchive(4, false, true, true); // L: 1767 - class4.archive5 = UrlRequest.newArchive(5, true, true, true); // L: 1768 - DynamicObject.archive6 = UrlRequest.newArchive(6, true, true, true); // L: 1769 - PcmPlayer.archive7 = UrlRequest.newArchive(7, false, true, true); // L: 1770 - ModeWhere.archive8 = UrlRequest.newArchive(8, false, true, true); // L: 1771 - class16.archive9 = UrlRequest.newArchive(9, false, true, true); // L: 1772 - JagexCache.archive10 = UrlRequest.newArchive(10, false, true, true); // L: 1773 - class160.archive11 = UrlRequest.newArchive(11, false, true, true); // L: 1774 - Varcs.archive12 = UrlRequest.newArchive(12, false, true, true); // L: 1775 - GrandExchangeOfferOwnWorldComparator.archive13 = UrlRequest.newArchive(13, true, false, true); // L: 1776 - PacketWriter.archive14 = UrlRequest.newArchive(14, false, true, true); // L: 1777 - class306.archive15 = UrlRequest.newArchive(15, false, true, true); // L: 1778 - class10.archive17 = UrlRequest.newArchive(17, true, true, true); // L: 1779 - class6.archive18 = UrlRequest.newArchive(18, false, true, true); // L: 1780 - WorldMapEvent.archive19 = UrlRequest.newArchive(19, false, true, true); // L: 1781 - WorldMapLabel.archive20 = UrlRequest.newArchive(20, false, true, true); // L: 1782 - Login.Login_loadingText = "Connecting to update server"; // L: 1783 - Login.Login_loadingPercent = 20; // L: 1784 - Client.titleLoadingStage = 40; // L: 1785 - } else if (Client.titleLoadingStage == 40) { // L: 1788 - byte var43 = 0; // L: 1789 - var21 = var43 + ClanChannel.archive0.percentage() * 4 / 100; // L: 1790 - var21 += KitDefinition.archive1.percentage() * 4 / 100; // L: 1791 - var21 += SecureRandomFuture.archive2.percentage() * 2 / 100; // L: 1792 - var21 += class18.archive3.percentage() * 2 / 100; // L: 1793 - var21 += class26.archive4.percentage() * 6 / 100; // L: 1794 - var21 += class4.archive5.percentage() * 4 / 100; // L: 1795 - var21 += DynamicObject.archive6.percentage() * 2 / 100; // L: 1796 - var21 += PcmPlayer.archive7.percentage() * 56 / 100; // L: 1797 - var21 += ModeWhere.archive8.percentage() * 2 / 100; // L: 1798 - var21 += class16.archive9.percentage() * 2 / 100; // L: 1799 - var21 += JagexCache.archive10.percentage() * 2 / 100; // L: 1800 - var21 += class160.archive11.percentage() * 2 / 100; // L: 1801 - var21 += Varcs.archive12.percentage() * 2 / 100; // L: 1802 - var21 += GrandExchangeOfferOwnWorldComparator.archive13.percentage() * 2 / 100; // L: 1803 - var21 += PacketWriter.archive14.percentage() * 2 / 100; // L: 1804 - var21 += class306.archive15.percentage() * 2 / 100; // L: 1805 - var21 += WorldMapEvent.archive19.percentage() / 100; // L: 1806 - var21 += class6.archive18.percentage() / 100; // L: 1807 - var21 += WorldMapLabel.archive20.percentage() / 100; // L: 1808 - var21 += class10.archive17.method5044() && class10.archive17.isFullyLoaded() ? 1 : 0; // L: 1809 - if (var21 != 100) { // L: 1810 - if (var21 != 0) { // L: 1811 - Login.Login_loadingText = "Checking for updates - " + var21 + "%"; - } - - Login.Login_loadingPercent = 30; // L: 1812 - } else { - class244.method4814(ClanChannel.archive0, "Animations"); // L: 1815 - class244.method4814(KitDefinition.archive1, "Skeletons"); // L: 1816 - class244.method4814(class26.archive4, "Sound FX"); // L: 1817 - class244.method4814(class4.archive5, "Maps"); // L: 1818 - class244.method4814(DynamicObject.archive6, "Music Tracks"); // L: 1819 - class244.method4814(PcmPlayer.archive7, "Models"); // L: 1820 - class244.method4814(ModeWhere.archive8, "Sprites"); // L: 1821 - class244.method4814(class160.archive11, "Music Jingles"); // L: 1822 - class244.method4814(PacketWriter.archive14, "Music Samples"); // L: 1823 - class244.method4814(class306.archive15, "Music Patches"); // L: 1824 - class244.method4814(WorldMapEvent.archive19, "World Map"); // L: 1825 - class244.method4814(class6.archive18, "World Map Geography"); // L: 1826 - class244.method4814(WorldMapLabel.archive20, "World Map Ground"); // L: 1827 - ClanChannel.spriteIds = new GraphicsDefaults(); // L: 1828 - ClanChannel.spriteIds.decode(class10.archive17); // L: 1829 - Login.Login_loadingText = "Loaded update list"; // L: 1830 - Login.Login_loadingPercent = 30; // L: 1831 - Client.titleLoadingStage = 45; // L: 1832 - } - } else if (Client.titleLoadingStage == 45) { // L: 1835 - boolean var42 = !Client.isLowDetail; // L: 1836 - class341.field3921 = 22050; // L: 1839 - PcmPlayer.PcmPlayer_stereo = var42; // L: 1840 - UserComparator1.field4220 = 2; // L: 1841 - MidiPcmStream var39 = new MidiPcmStream(); // L: 1843 - var39.method4563(9, 128); // L: 1844 - SoundCache.pcmPlayer0 = class93.method2187(GameEngine.taskHandler, 0, 22050); // L: 1845 - SoundCache.pcmPlayer0.setStream(var39); // L: 1846 - ItemLayer.method3860(class306.archive15, PacketWriter.archive14, class26.archive4, var39); // L: 1847 - UrlRequester.pcmPlayer1 = class93.method2187(GameEngine.taskHandler, 1, 2048); // L: 1848 - UserComparator7.pcmStreamMixer = new PcmStreamMixer(); // L: 1849 - UrlRequester.pcmPlayer1.setStream(UserComparator7.pcmStreamMixer); // L: 1850 - WorldMapAreaData.decimator = new Decimator(22050, class341.field3921); // L: 1851 - Login.Login_loadingText = "Prepared sound engine"; // L: 1852 - Login.Login_loadingPercent = 35; // L: 1853 - Client.titleLoadingStage = 50; // L: 1854 - class314.WorldMapElement_fonts = new Fonts(ModeWhere.archive8, GrandExchangeOfferOwnWorldComparator.archive13); // L: 1855 - } else if (Client.titleLoadingStage == 50) { // L: 1858 - var21 = FontName.method6334().length; // L: 1859 - Fonts var38 = class314.WorldMapElement_fonts; // L: 1860 - FontName[] var32 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_plain12}; // L: 1863 - Client.fontsMap = var38.createMap(var32); // L: 1865 - if (Client.fontsMap.size() < var21) { // L: 1866 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var21 + "%"; // L: 1867 - Login.Login_loadingPercent = 40; // L: 1868 - } else { - UserComparator10.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1871 - AbstractSocket.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1872 - class309.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1873 - ClanSettings.platformInfo = Client.platformInfoProvider.get(); // L: 1874 - Login.Login_loadingText = "Loaded fonts"; // L: 1875 - Login.Login_loadingPercent = 40; // L: 1876 - Client.titleLoadingStage = 60; // L: 1877 - } - } else { - Archive var2; - int var3; - Archive var35; - if (Client.titleLoadingStage == 60) { // L: 1880 - var35 = JagexCache.archive10; // L: 1882 - var2 = ModeWhere.archive8; // L: 1883 - var3 = 0; // L: 1885 - if (var35.tryLoadFileByNames("title.jpg", "")) { // L: 1886 - ++var3; - } - - if (var2.tryLoadFileByNames("logo", "")) { // L: 1887 - ++var3; - } - - if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1888 - ++var3; - } - - if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1889 - ++var3; - } - - if (var2.tryLoadFileByNames("titlebox", "")) { // L: 1890 - ++var3; - } - - if (var2.tryLoadFileByNames("titlebutton", "")) { // L: 1891 - ++var3; - } - - if (var2.tryLoadFileByNames("runes", "")) { // L: 1892 - ++var3; - } - - if (var2.tryLoadFileByNames("title_mute", "")) { // L: 1893 - ++var3; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1894 - ++var3; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1895 - ++var3; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1896 - ++var3; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1897 - ++var3; - } - - var2.tryLoadFileByNames("sl_back", ""); // L: 1898 - var2.tryLoadFileByNames("sl_flags", ""); // L: 1899 - var2.tryLoadFileByNames("sl_arrows", ""); // L: 1900 - var2.tryLoadFileByNames("sl_stars", ""); // L: 1901 - var2.tryLoadFileByNames("sl_button", ""); // L: 1902 - byte var41 = 12; // L: 1908 - if (var3 < var41) { // L: 1911 - Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var41 + "%"; // L: 1912 - Login.Login_loadingPercent = 50; // L: 1913 - } else { - Login.Login_loadingText = "Loaded title screen"; // L: 1916 - Login.Login_loadingPercent = 50; // L: 1917 - Projectile.updateGameState(5); // L: 1918 - Client.titleLoadingStage = 70; // L: 1919 - } - } else if (Client.titleLoadingStage == 70) { // L: 1922 - if (!SecureRandomFuture.archive2.isFullyLoaded()) { // L: 1923 - Login.Login_loadingText = "Loading config - " + SecureRandomFuture.archive2.loadPercent() + "%"; // L: 1924 - Login.Login_loadingPercent = 60; // L: 1925 - } else { - FaceNormal.method4252(SecureRandomFuture.archive2); // L: 1928 - Archive var29 = SecureRandomFuture.archive2; // L: 1929 - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var29; // L: 1931 - var35 = SecureRandomFuture.archive2; // L: 1933 - var2 = PcmPlayer.archive7; // L: 1934 - class125.KitDefinition_archive = var35; // L: 1936 - KitDefinition.KitDefinition_modelsArchive = var2; // L: 1937 - TileItem.KitDefinition_fileCount = class125.KitDefinition_archive.getGroupFileCount(3); // L: 1938 - Actor.method2262(SecureRandomFuture.archive2, PcmPlayer.archive7, Client.isLowDetail); // L: 1940 - Archive var25 = SecureRandomFuture.archive2; // L: 1941 - Archive var4 = PcmPlayer.archive7; // L: 1942 - NPCComposition.NpcDefinition_archive = var25; // L: 1944 - NPCComposition.NpcDefinition_modelArchive = var4; // L: 1945 - Archive var34 = SecureRandomFuture.archive2; // L: 1947 - StructComposition.StructDefinition_archive = var34; // L: 1949 - Archive var26 = SecureRandomFuture.archive2; // L: 1951 - Archive var36 = PcmPlayer.archive7; // L: 1952 - boolean var37 = Client.isMembersWorld; // L: 1953 - Font var40 = UserComparator10.fontPlain11; // L: 1954 - ItemComposition.ItemDefinition_archive = var26; // L: 1956 - SoundCache.ItemDefinition_modelArchive = var36; // L: 1957 - ItemComposition.ItemDefinition_inMembersWorld = var37; // L: 1958 - ItemComposition.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 1959 - ItemComposition.ItemDefinition_fontPlain11 = var40; // L: 1960 - Archive var27 = SecureRandomFuture.archive2; // L: 1962 - Archive var11 = ClanChannel.archive0; // L: 1963 - Archive var12 = KitDefinition.archive1; // L: 1964 - SequenceDefinition.SequenceDefinition_archive = var27; // L: 1966 - SequenceDefinition.SequenceDefinition_animationsArchive = var11; // L: 1967 - SequenceDefinition.SequenceDefinition_skeletonsArchive = var12; // L: 1968 - ObjectComposition.method3069(SecureRandomFuture.archive2, PcmPlayer.archive7); // L: 1970 - Archive var13 = SecureRandomFuture.archive2; // L: 1971 - VarbitComposition.VarbitDefinition_archive = var13; // L: 1973 - class125.method2587(SecureRandomFuture.archive2); // L: 1975 - NPCComposition.method2868(class18.archive3, PcmPlayer.archive7, ModeWhere.archive8, GrandExchangeOfferOwnWorldComparator.archive13); // L: 1976 - Archive var14 = SecureRandomFuture.archive2; // L: 1977 - InvDefinition.InvDefinition_archive = var14; // L: 1979 - class10.method109(SecureRandomFuture.archive2); // L: 1981 - Archive var15 = SecureRandomFuture.archive2; // L: 1982 - VarcInt.VarcInt_archive = var15; // L: 1984 - Archive var16 = SecureRandomFuture.archive2; // L: 1986 - ParamComposition.ParamDefinition_archive = var16; // L: 1988 - class27.field215 = new class370(class182.field2114, 54, AbstractArchive.clientLanguage, SecureRandomFuture.archive2); // L: 1990 - class26.HitSplatDefinition_cachedSprites = new class370(class182.field2114, 47, AbstractArchive.clientLanguage, SecureRandomFuture.archive2); // L: 1991 - class20.varcs = new Varcs(); // L: 1992 - LoginScreenAnimation.method2312(SecureRandomFuture.archive2, ModeWhere.archive8, GrandExchangeOfferOwnWorldComparator.archive13); // L: 1993 - ClanSettings.method203(SecureRandomFuture.archive2, ModeWhere.archive8); // L: 1994 - Archive var17 = SecureRandomFuture.archive2; // L: 1995 - Archive var18 = ModeWhere.archive8; // L: 1996 - class244.WorldMapElement_archive = var18; // L: 1998 - if (var17.isFullyLoaded()) { // L: 1999 - WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35); // L: 2002 - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 2003 - - for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) { // L: 2004 - byte[] var20 = var17.takeFile(35, var19); // L: 2005 - WorldMapElement.WorldMapElement_cached[var19] = new WorldMapElement(var19); // L: 2006 - if (var20 != null) { // L: 2007 - WorldMapElement.WorldMapElement_cached[var19].decode(new Buffer(var20)); // L: 2008 - WorldMapElement.WorldMapElement_cached[var19].method2724(); // L: 2009 - } - } - } - - Login.Login_loadingText = "Loaded config"; // L: 2013 - Login.Login_loadingPercent = 60; // L: 2014 - Client.titleLoadingStage = 80; // L: 2015 - } - } else if (Client.titleLoadingStage == 80) { // L: 2018 - var21 = 0; // L: 2019 - if (Friend.compass == null) { // L: 2020 - Friend.compass = Tile.SpriteBuffer_getSprite(ModeWhere.archive8, ClanChannel.spriteIds.compass, 0); - } else { - ++var21; // L: 2021 - } - - if (class22.redHintArrowSprite == null) { // L: 2022 - class22.redHintArrowSprite = Tile.SpriteBuffer_getSprite(ModeWhere.archive8, ClanChannel.spriteIds.field3892, 0); - } else { - ++var21; // L: 2023 - } - - IndexedSprite[] var1; - IndexedSprite[] var5; - int var6; - IndexedSprite var7; - if (FloorDecoration.mapSceneSprites == null) { // L: 2024 - var2 = ModeWhere.archive8; // L: 2026 - var3 = ClanChannel.spriteIds.mapScenes; // L: 2027 - if (!Message.method1263(var2, var3, 0)) { // L: 2029 - var1 = null; // L: 2030 - } else { - var5 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 2035 - - for (var6 = 0; var6 < class397.SpriteBuffer_spriteCount; ++var6) { // L: 2036 - var7 = var5[var6] = new IndexedSprite(); // L: 2037 - var7.width = class397.SpriteBuffer_spriteWidth; // L: 2038 - var7.height = class244.SpriteBuffer_spriteHeight; // L: 2039 - var7.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2040 - var7.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2041 - var7.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2042 - var7.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2043 - var7.palette = class397.SpriteBuffer_spritePalette; // L: 2044 - var7.pixels = class126.SpriteBuffer_pixels[var6]; // L: 2045 - } - - ArchiveDisk.method5993(); // L: 2047 - var1 = var5; // L: 2050 - } - - FloorDecoration.mapSceneSprites = var1; // L: 2052 - } else { - ++var21; // L: 2054 - } - - int var8; - byte[] var9; - int var10; - SpritePixels[] var30; - SpritePixels[] var31; - SpritePixels var33; - if (ScriptFrame.headIconPkSprites == null) { // L: 2055 - var2 = ModeWhere.archive8; // L: 2057 - var3 = ClanChannel.spriteIds.headIconsPk; // L: 2058 - if (!Message.method1263(var2, var3, 0)) { // L: 2060 - var30 = null; // L: 2061 - } else { - var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2066 - var6 = 0; - - while (true) { - if (var6 >= class397.SpriteBuffer_spriteCount) { - ArchiveDisk.method5993(); // L: 2080 - var30 = var31; // L: 2083 - break; - } - - var33 = var31[var6] = new SpritePixels(); // L: 2068 - var33.width = class397.SpriteBuffer_spriteWidth; // L: 2069 - var33.height = class244.SpriteBuffer_spriteHeight; // L: 2070 - var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2071 - var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2072 - var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2073 - var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2074 - var8 = var33.subHeight * var33.subWidth; // L: 2075 - var9 = class126.SpriteBuffer_pixels[var6]; // L: 2076 - var33.pixels = new int[var8]; // L: 2077 - - for (var10 = 0; var10 < var8; ++var10) { // L: 2078 - var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; // L: 2067 - } - } - - ScriptFrame.headIconPkSprites = var30; // L: 2085 - } else { - ++var21; // L: 2087 - } - - if (class20.headIconPrayerSprites == null) { // L: 2088 - var2 = ModeWhere.archive8; // L: 2090 - var3 = ClanChannel.spriteIds.field3903; // L: 2091 - if (!Message.method1263(var2, var3, 0)) { // L: 2093 - var30 = null; // L: 2094 - } else { - var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2099 - var6 = 0; - - while (true) { - if (var6 >= class397.SpriteBuffer_spriteCount) { - ArchiveDisk.method5993(); // L: 2113 - var30 = var31; // L: 2116 - break; - } - - var33 = var31[var6] = new SpritePixels(); // L: 2101 - var33.width = class397.SpriteBuffer_spriteWidth; // L: 2102 - var33.height = class244.SpriteBuffer_spriteHeight; // L: 2103 - var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2104 - var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2105 - var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2106 - var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2107 - var8 = var33.subWidth * var33.subHeight; // L: 2108 - var9 = class126.SpriteBuffer_pixels[var6]; // L: 2109 - var33.pixels = new int[var8]; // L: 2110 - - for (var10 = 0; var10 < var8; ++var10) { // L: 2111 - var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; // L: 2100 - } - } - - class20.headIconPrayerSprites = var30; // L: 2118 - } else { - ++var21; // L: 2120 - } - - if (Skills.headIconHintSprites == null) { // L: 2121 - var2 = ModeWhere.archive8; // L: 2123 - var3 = ClanChannel.spriteIds.field3902; // L: 2124 - if (!Message.method1263(var2, var3, 0)) { // L: 2126 - var30 = null; // L: 2127 - } else { - var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2132 - var6 = 0; - - while (true) { - if (var6 >= class397.SpriteBuffer_spriteCount) { - ArchiveDisk.method5993(); // L: 2146 - var30 = var31; // L: 2149 - break; - } - - var33 = var31[var6] = new SpritePixels(); // L: 2134 - var33.width = class397.SpriteBuffer_spriteWidth; // L: 2135 - var33.height = class244.SpriteBuffer_spriteHeight; // L: 2136 - var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2137 - var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2138 - var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2139 - var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2140 - var8 = var33.subHeight * var33.subWidth; // L: 2141 - var9 = class126.SpriteBuffer_pixels[var6]; // L: 2142 - var33.pixels = new int[var8]; // L: 2143 - - for (var10 = 0; var10 < var8; ++var10) { // L: 2144 - var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; // L: 2133 - } - } - - Skills.headIconHintSprites = var30; // L: 2151 - } else { - ++var21; // L: 2153 - } - - if (BuddyRankComparator.mapMarkerSprites == null) { // L: 2154 - var2 = ModeWhere.archive8; // L: 2156 - var3 = ClanChannel.spriteIds.field3897; // L: 2157 - if (!Message.method1263(var2, var3, 0)) { // L: 2159 - var30 = null; // L: 2160 - } else { - var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2165 - var6 = 0; - - while (true) { - if (var6 >= class397.SpriteBuffer_spriteCount) { - ArchiveDisk.method5993(); // L: 2179 - var30 = var31; // L: 2182 - break; - } - - var33 = var31[var6] = new SpritePixels(); // L: 2167 - var33.width = class397.SpriteBuffer_spriteWidth; // L: 2168 - var33.height = class244.SpriteBuffer_spriteHeight; // L: 2169 - var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2170 - var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2171 - var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2172 - var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2173 - var8 = var33.subWidth * var33.subHeight; // L: 2174 - var9 = class126.SpriteBuffer_pixels[var6]; // L: 2175 - var33.pixels = new int[var8]; // L: 2176 - - for (var10 = 0; var10 < var8; ++var10) { // L: 2177 - var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; // L: 2166 - } - } - - BuddyRankComparator.mapMarkerSprites = var30; // L: 2184 - } else { - ++var21; // L: 2186 - } - - if (NPCComposition.crossSprites == null) { // L: 2187 - var2 = ModeWhere.archive8; // L: 2189 - var3 = ClanChannel.spriteIds.field3899; // L: 2190 - if (!Message.method1263(var2, var3, 0)) { // L: 2192 - var30 = null; // L: 2193 - } else { - var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2198 - var6 = 0; - - while (true) { - if (var6 >= class397.SpriteBuffer_spriteCount) { - ArchiveDisk.method5993(); // L: 2212 - var30 = var31; // L: 2215 - break; - } - - var33 = var31[var6] = new SpritePixels(); // L: 2200 - var33.width = class397.SpriteBuffer_spriteWidth; // L: 2201 - var33.height = class244.SpriteBuffer_spriteHeight; // L: 2202 - var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2203 - var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2204 - var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2205 - var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2206 - var8 = var33.subWidth * var33.subHeight; // L: 2207 - var9 = class126.SpriteBuffer_pixels[var6]; // L: 2208 - var33.pixels = new int[var8]; // L: 2209 - - for (var10 = 0; var10 < var8; ++var10) { // L: 2210 - var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; // L: 2199 - } - } - - NPCComposition.crossSprites = var30; // L: 2217 - } else { - ++var21; // L: 2219 - } - - if (class171.mapDotSprites == null) { // L: 2220 - var2 = ModeWhere.archive8; // L: 2222 - var3 = ClanChannel.spriteIds.field3900; // L: 2223 - if (!Message.method1263(var2, var3, 0)) { // L: 2225 - var30 = null; // L: 2226 - } else { - var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2231 - var6 = 0; - - while (true) { - if (var6 >= class397.SpriteBuffer_spriteCount) { - ArchiveDisk.method5993(); // L: 2245 - var30 = var31; // L: 2248 - break; - } - - var33 = var31[var6] = new SpritePixels(); // L: 2233 - var33.width = class397.SpriteBuffer_spriteWidth; // L: 2234 - var33.height = class244.SpriteBuffer_spriteHeight; // L: 2235 - var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2236 - var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2237 - var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2238 - var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2239 - var8 = var33.subHeight * var33.subWidth; // L: 2240 - var9 = class126.SpriteBuffer_pixels[var6]; // L: 2241 - var33.pixels = new int[var8]; // L: 2242 - - for (var10 = 0; var10 < var8; ++var10) { // L: 2243 - var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; // L: 2232 - } - } - - class171.mapDotSprites = var30; // L: 2250 - } else { - ++var21; // L: 2252 - } - - if (Client.scrollBarSprites == null) { // L: 2253 - var2 = ModeWhere.archive8; // L: 2255 - var3 = ClanChannel.spriteIds.field3901; // L: 2256 - if (!Message.method1263(var2, var3, 0)) { // L: 2258 - var1 = null; // L: 2259 - } else { - var5 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 2264 - - for (var6 = 0; var6 < class397.SpriteBuffer_spriteCount; ++var6) { // L: 2265 - var7 = var5[var6] = new IndexedSprite(); // L: 2266 - var7.width = class397.SpriteBuffer_spriteWidth; // L: 2267 - var7.height = class244.SpriteBuffer_spriteHeight; // L: 2268 - var7.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2269 - var7.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2270 - var7.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2271 - var7.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2272 - var7.palette = class397.SpriteBuffer_spritePalette; // L: 2273 - var7.pixels = class126.SpriteBuffer_pixels[var6]; // L: 2274 - } - - ArchiveDisk.method5993(); // L: 2276 - var1 = var5; // L: 2279 - } - - Client.scrollBarSprites = var1; // L: 2281 - } else { - ++var21; // L: 2283 - } - - if (class35.modIconSprites == null) { // L: 2284 - var2 = ModeWhere.archive8; // L: 2286 - var3 = ClanChannel.spriteIds.field3896; // L: 2287 - if (!Message.method1263(var2, var3, 0)) { // L: 2289 - var1 = null; // L: 2290 - } else { - var5 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 2295 - - for (var6 = 0; var6 < class397.SpriteBuffer_spriteCount; ++var6) { // L: 2296 - var7 = var5[var6] = new IndexedSprite(); // L: 2297 - var7.width = class397.SpriteBuffer_spriteWidth; // L: 2298 - var7.height = class244.SpriteBuffer_spriteHeight; // L: 2299 - var7.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2300 - var7.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2301 - var7.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2302 - var7.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2303 - var7.palette = class397.SpriteBuffer_spritePalette; // L: 2304 - var7.pixels = class126.SpriteBuffer_pixels[var6]; // L: 2305 - } - - ArchiveDisk.method5993(); // L: 2307 - var1 = var5; // L: 2310 - } - - class35.modIconSprites = var1; // L: 2312 - } else { - ++var21; // L: 2314 - } - - if (var21 < 11) { // L: 2315 - Login.Login_loadingText = "Loading sprites - " + var21 * 100 / 12 + "%"; // L: 2316 - Login.Login_loadingPercent = 70; // L: 2317 - } else { - AbstractFont.AbstractFont_modIconSprites = class35.modIconSprites; // L: 2320 - class22.redHintArrowSprite.normalize(); // L: 2321 - int var22 = (int)(Math.random() * 21.0D) - 10; // L: 2322 - int var23 = (int)(Math.random() * 21.0D) - 10; // L: 2323 - var3 = (int)(Math.random() * 21.0D) - 10; // L: 2324 - int var24 = (int)(Math.random() * 41.0D) - 20; // L: 2325 - FloorDecoration.mapSceneSprites[0].shiftColors(var22 + var24, var23 + var24, var3 + var24); // L: 2326 - Login.Login_loadingText = "Loaded sprites"; // L: 2327 - Login.Login_loadingPercent = 70; // L: 2328 - Client.titleLoadingStage = 90; // L: 2329 - } - } else if (Client.titleLoadingStage == 90) { // L: 2332 - if (!class16.archive9.isFullyLoaded()) { // L: 2333 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2334 - Login.Login_loadingPercent = 90; // L: 2335 - } else { - Renderable.textureProvider = new TextureProvider(class16.archive9, ModeWhere.archive8, 20, class4.clientPreferences.field1312, Client.isLowDetail ? 64 : 128); // L: 2338 - Rasterizer3D.Rasterizer3D_setTextureLoader(Renderable.textureProvider); // L: 2339 - Rasterizer3D.Rasterizer3D_setBrightness(class4.clientPreferences.field1312); // L: 2340 - Client.titleLoadingStage = 100; // L: 2341 - } - } else if (Client.titleLoadingStage == 100) { // L: 2344 - var21 = Renderable.textureProvider.getLoadedPercentage(); // L: 2345 - if (var21 < 100) { // L: 2346 - Login.Login_loadingText = "Loading textures - " + var21 + "%"; // L: 2347 - Login.Login_loadingPercent = 90; // L: 2348 - } else { - Login.Login_loadingText = "Loaded textures"; // L: 2351 - Login.Login_loadingPercent = 90; // L: 2352 - Client.titleLoadingStage = 110; // L: 2353 - } - } else if (Client.titleLoadingStage == 110) { // L: 2356 - UrlRequester.mouseRecorder = new MouseRecorder(); // L: 2357 - GameEngine.taskHandler.newThreadTask(UrlRequester.mouseRecorder, 10); // L: 2358 - Login.Login_loadingText = "Loaded input handler"; // L: 2359 - Login.Login_loadingPercent = 92; // L: 2360 - Client.titleLoadingStage = 120; // L: 2361 - } else if (Client.titleLoadingStage == 120) { // L: 2364 - if (!JagexCache.archive10.tryLoadFileByNames("huffman", "")) { // L: 2365 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2366 - Login.Login_loadingPercent = 94; // L: 2367 - } else { - Huffman var0 = new Huffman(JagexCache.archive10.takeFileByNames("huffman", "")); // L: 2370 - WorldMapCacheName.method3789(var0); // L: 2371 - Login.Login_loadingText = "Loaded wordpack"; // L: 2372 - Login.Login_loadingPercent = 94; // L: 2373 - Client.titleLoadingStage = 130; // L: 2374 - } - } else if (Client.titleLoadingStage == 130) { // L: 2377 - if (!class18.archive3.isFullyLoaded()) { // L: 2378 - Login.Login_loadingText = "Loading interfaces - " + class18.archive3.loadPercent() * 4 / 5 + "%"; // L: 2379 - Login.Login_loadingPercent = 96; // L: 2380 - } else if (!Varcs.archive12.isFullyLoaded()) { // L: 2383 - Login.Login_loadingText = "Loading interfaces - " + (80 + Varcs.archive12.loadPercent() / 6) + "%"; // L: 2384 - Login.Login_loadingPercent = 96; // L: 2385 - } else if (!GrandExchangeOfferOwnWorldComparator.archive13.isFullyLoaded()) { // L: 2388 - Login.Login_loadingText = "Loading interfaces - " + (96 + GrandExchangeOfferOwnWorldComparator.archive13.loadPercent() / 50) + "%"; // L: 2389 - Login.Login_loadingPercent = 96; // L: 2390 - } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 2393 - Login.Login_loadingPercent = 98; // L: 2394 - Client.titleLoadingStage = 140; // L: 2395 - } - } else if (Client.titleLoadingStage == 140) { // L: 2398 - Login.Login_loadingPercent = 100; // L: 2399 - if (!WorldMapEvent.archive19.tryLoadGroupByName(WorldMapCacheName.field2131.name)) { // L: 2400 - Login.Login_loadingText = "Loading world map - " + WorldMapEvent.archive19.groupLoadPercentByName(WorldMapCacheName.field2131.name) / 10 + "%"; // L: 2401 - } else { - if (class80.worldMap == null) { // L: 2404 - class80.worldMap = new WorldMap(); // L: 2405 - class80.worldMap.init(WorldMapEvent.archive19, class6.archive18, WorldMapLabel.archive20, class309.fontBold12, Client.fontsMap, FloorDecoration.mapSceneSprites); // L: 2406 - } - - Login.Login_loadingText = "Loaded world map"; // L: 2408 - Client.titleLoadingStage = 150; // L: 2409 - } - } else if (Client.titleLoadingStage == 150) { // L: 2412 - Projectile.updateGameState(10); // L: 2413 - } - } - } // L: 1754 1760 1786 1813 1833 1856 1869 1878 1914 1920 1926 2016 2318 2330 2336 2342 2349 2354 2362 2368 2375 2381 2386 2391 2396 2402 2410 2414 2416 - - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "125685661" - ) - static void method407() { - Client.menuOptionsCount = 0; // L: 7730 - Client.isMenuOpen = false; // L: 7731 - } // L: 7732 -} diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java index 310a274a21..9963e73c51 100644 --- a/runescape-client/src/main/java/class340.java +++ b/runescape-client/src/main/java/class340.java @@ -1,34 +1,71 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") -public class class340 implements class345 { - @ObfuscatedName("f") +@ObfuscatedName("mh") +public abstract class class340 extends class216 implements class391 { @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "(Ljr;Lkq;I)V" ) - public final class363 field3919; + protected class340(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); + } + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(II)Lmd;", + garbageValue = "-232657382" ) - class340(class364 var1) { - this.field3919 = var1; // L: 14 - } // L: 15 + protected abstract class342 vmethod6511(int var1); + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lmt;)V" + descriptor = "(I)I", + garbageValue = "-1220313000" ) - public class340(class341 var1) { - this(new class364(var1)); // L: 10 - } // L: 11 + public int method6061() { + return super.field2547; + } - @ObfuscatedName("f") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1896564158" + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "0" ) - public int method6047(int var1) { - return this.field3919.vmethod6399(var1); // L: 18 + public Object vmethod6964(int var1) { + class342 var2 = this.vmethod6511(var1); + return var2 != null && var2.method6080() ? var2.method6087() : null; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnv;I)Lok;", + garbageValue = "125948709" + ) + public class392 method6074(Buffer var1) { + int var2 = var1.readUnsignedShort(); + class342 var3 = this.vmethod6511(var2); + class392 var4 = new class392(var2); + Class var5 = var3.field3940.field4160; + if (var5 == Integer.class) { + var4.field4241 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4241 = var1.readLong(); + } else if (var5 == String.class) { + var4.field4241 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class387.class.isAssignableFrom(var5)) { + throw new IllegalStateException(); + } + + try { + class387 var6 = (class387)var5.newInstance(); + var6.method6935(var1); + var4.field4241 = var6; + } catch (InstantiationException var7) { + } catch (IllegalAccessException var8) { + } + } + + return var4; } } diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index 72d20671a7..b5b3e79d01 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -1,78 +1,17 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mt") -public abstract class class341 extends class215 implements class390 { - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -504771019 - ) - public static int field3921; - - @ObfuscatedSignature( - descriptor = "(Ljl;Lkn;I)V" - ) - protected class341(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); // L: 15 - } // L: 16 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lmq;", - garbageValue = "-898201969" - ) - protected abstract class343 vmethod6482(int var1); - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-29" - ) - public int method6050() { - return super.field2559; // L: 19 +@ObfuscatedName("mm") +public class class341 extends class342 { + public class341(int var1) { + super(var1); } - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-898289717" + descriptor = "(Lnv;II)V", + garbageValue = "-606165305" ) - public Object vmethod6893(int var1) { - class343 var2 = this.vmethod6482(var1); // L: 23 - return var2 != null && var2.method6072() ? var2.method6073() : null; // L: 24 25 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lnt;B)Loo;", - garbageValue = "124" - ) - public class391 method6052(Buffer var1) { - int var2 = var1.readUnsignedShort(); // L: 29 - class343 var3 = this.vmethod6482(var2); // L: 30 - class391 var4 = new class391(var2); // L: 31 - Class var5 = var3.field3924.field4132; // L: 32 - if (var5 == Integer.class) { // L: 33 - var4.field4227 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4227 = var1.readLong(); // L: 34 - } else if (var5 == String.class) { // L: 35 - var4.field4227 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class386.class.isAssignableFrom(var5)) { // L: 36 - throw new IllegalStateException(); // L: 45 - } - - try { - class386 var6 = (class386)var5.newInstance(); // L: 38 - var6.method6869(var1); // L: 39 - var4.field4227 = var6; // L: 40 - } catch (InstantiationException var7) { // L: 42 - } catch (IllegalAccessException var8) { // L: 43 - } - } - - return var4; // L: 46 + void vmethod6079(Buffer var1, int var2) { } } diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java index 5316a4168a..2648c8c44a 100644 --- a/runescape-client/src/main/java/class342.java +++ b/runescape-client/src/main/java/class342.java @@ -1,152 +1,98 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") -public class class342 extends class343 { - public class342(int var1) { - super(var1); // L: 7 - } // L: 8 - - @ObfuscatedName("f") +@ObfuscatedName("md") +public abstract class class342 implements class215 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-1006321266" + descriptor = "Lni;" ) - void vmethod6077(Buffer var1, int var2) { - } // L: 11 + class376 field3940; - @ObfuscatedName("f") + class342(int var1) { + } + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Lkn;II)Lhg;", - garbageValue = "15047047" + descriptor = "(Lnv;II)V", + garbageValue = "-606165305" ) - public static PacketBufferNode method6068(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = InterfaceParent.getPacketBufferNode(ClientPacket.field2669, 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 + abstract void vmethod6079(Buffer var1, int var2); + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnv;B)V", + garbageValue = "-109" + ) + public void method6081(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } + + class338[] var3 = new class338[]{class338.field3930, class338.field3933, class338.field3928, class338.field3929}; + class338 var4 = (class338)Huffman.findEnumerated(var3, var2); + if (var4 != null) { + switch(var4.field3931) { + case 0: + int var5 = var1.readUnsignedByte(); + this.field3940 = WorldMapSection0.method3597(var5); + if (this.field3940 != null) { + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); + case 1: + Huffman.findEnumerated(WorldMapSprite.method3649(), var1.readUnsignedByte()); + break; + case 2: + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); + case 3: + var1.readStringCp1252NullCircumfixed(); + } + } else { + this.vmethod6079(var1, var2); } } + } - 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 - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1592955951" + ) + boolean method6080() { + return this.field3940 != null; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/Object;", + garbageValue = "-1957232535" + ) + Object method6087() { + if (this.field3940 == class376.field4163) { + return 0; + } else if (this.field3940 == class376.field4159) { + return -1L; + } else { + return this.field3940 == class376.field4164 ? "" : null; } + } - var4.packetBuffer.writeByte(var7); // L: 165 - var4.packetBuffer.writeByte(var8); // L: 166 - ModeWhere.method5292(var4.packetBuffer, var1); // L: 167 - if (var0 == class255.field3139.rsOrdinal()) { // L: 168 - var4.packetBuffer.writeByte(var3); // L: 169 - } - - var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171 - return var4; // L: 172 + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "1796576439" + ) + public static void method6089(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2634, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(var2); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.method6786(var0); + var4.packetBuffer.writeInt(var3 ? Client.field488 * -1636832173 * -2076624933 : 0); + Client.packetWriter.addNode(var4); } } diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java index 997603f676..87d85cd051 100644 --- a/runescape-client/src/main/java/class343.java +++ b/runescape-client/src/main/java/class343.java @@ -1,140 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") -public abstract class class343 implements class214 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lne;" - ) - class375 field3924; - - class343(int var1) { - } // L: 13 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;II)V", - garbageValue = "-1006321266" - ) - abstract void vmethod6077(Buffer var1, int var2); - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-2064643819" - ) - public void method6070(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); // L: 17 - if (var2 == 0) { // L: 18 - return; // L: 60 - } - - class339[] var3 = new class339[]{class339.field3916, class339.field3914, class339.field3913, class339.field3915}; // L: 21 - class339 var4 = (class339)Clock.findEnumerated(var3, var2); // L: 23 - if (var4 != null) { // L: 24 - switch(var4.field3912) { // L: 25 - case 0: - int var5 = var1.readUnsignedByte(); // L: 27 - int var7 = class373.field4126[var5]; // L: 30 - class375 var6; - if (var7 == 1) { // L: 31 - var6 = class375.field4134; // L: 32 - } else if (var7 == 2) { // L: 35 - var6 = class375.field4128; // L: 36 - } else if (var7 == 3) { // L: 39 - var6 = class375.field4127; // L: 40 - } else { - var6 = null; // L: 43 - } - - this.field3924 = var6; // L: 45 - if (this.field3924 != null) { - break; - } - - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); // L: 46 - case 1: - var1.readStringCp1252NullCircumfixed(); // L: 54 - break; - case 2: - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 49 - case 3: - Clock.findEnumerated(LoginPacket.method4510(), var1.readUnsignedByte()); // L: 51 - } - } else { - this.vmethod6077(var1, var2); // L: 58 - } - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "826495123" - ) - boolean method6072() { - return this.field3924 != null; // L: 65 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/Object;", - garbageValue = "1136165556" - ) - Object method6073() { - if (this.field3924 == class375.field4134) { // L: 69 - return 0; // L: 70 - } else if (this.field3924 == class375.field4127) { // L: 72 - return -1L; // L: 73 - } else { - return this.field3924 == class375.field4128 ? "" : null; // L: 75 76 78 - } - } - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(Liv;I)Z", - garbageValue = "900256799" - ) - static final boolean method6080(Widget var0) { - int var1 = var0.contentType; // L: 11285 - if (var1 == 205) { // L: 11286 - Client.logoutTimer = 250; // L: 11287 - return true; // L: 11288 - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { // L: 11290 - var2 = (var1 - 300) / 2; // L: 11291 - var3 = var1 & 1; // L: 11292 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11293 - } - - if (var1 >= 314 && var1 <= 323) { // L: 11295 - var2 = (var1 - 314) / 2; // L: 11296 - var3 = var1 & 1; // L: 11297 - Client.playerAppearance.method4820(var2, var3 == 1); // L: 11298 - } - - if (var1 == 324) { // L: 11300 - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { // L: 11301 - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { // L: 11302 - PacketBufferNode var4 = InterfaceParent.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); // L: 11304 - Client.playerAppearance.write(var4.packetBuffer); // L: 11305 - Client.packetWriter.addNode(var4); // L: 11306 - return true; // L: 11307 - } else { - return false; // L: 11309 - } - } - } +@ObfuscatedName("ms") +public interface class343 { } diff --git a/runescape-client/src/main/java/class344.java b/runescape-client/src/main/java/class344.java index 3a2c22d3a9..cfcf9a0a1c 100644 --- a/runescape-client/src/main/java/class344.java +++ b/runescape-client/src/main/java/class344.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mu") -public interface class344 { +@ObfuscatedName("mq") +public interface class344 extends class343 { } diff --git a/runescape-client/src/main/java/class345.java b/runescape-client/src/main/java/class345.java index 591770bd56..04b9efa1f4 100644 --- a/runescape-client/src/main/java/class345.java +++ b/runescape-client/src/main/java/class345.java @@ -1,5 +1,41 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") -public interface class345 extends class344 { +@ObfuscatedName("mv") +public class class345 { + @ObfuscatedName("l") + static final int[] field3941; + @ObfuscatedName("n") + static final int[] field3945; + + static { + field3941 = new int[16384]; + field3945 = new int[16384]; + double var0 = 3.834951969714103E-4D; + + for (int var2 = 0; var2 < 16384; ++var2) { + field3941[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); + field3945[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); + } + + } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(Lio;IIII)V", + garbageValue = "-1671689416" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + if (Client.minimapState < 3) { + ObjectSound.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); + } + + } + } } diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java new file mode 100644 index 0000000000..884f17c32e --- /dev/null +++ b/runescape-client/src/main/java/class346.java @@ -0,0 +1,40 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mg") +public class class346 { + @ObfuscatedName("x") + static final int[] field3951; + @ObfuscatedName("r") + static final int[] field3953; + + static { + field3951 = new int[2048]; + field3953 = new int[2048]; + double var0 = 0.0030679615757712823D; + + for (int var2 = 0; var2 < 2048; ++var2) { + field3951[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); + field3953[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); + } + + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnf;I)I", + garbageValue = "-275350223" + ) + static final int method6099(LoginType var0) { + if (var0 == null) { + return 12; + } else { + switch(var0.field4113) { + case 0: + return 20; + default: + return 12; + } + } + } +} diff --git a/runescape-client/src/main/java/class35.java b/runescape-client/src/main/java/class35.java deleted file mode 100644 index 402a39c293..0000000000 --- a/runescape-client/src/main/java/class35.java +++ /dev/null @@ -1,272 +0,0 @@ -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("aq") -public class class35 { - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - static IndexedSprite field244; - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("f") - ExecutorService field245; - @ObfuscatedName("e") - Future field239; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - final Buffer field247; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Laz;" - ) - final class31 field241; - - @ObfuscatedSignature( - descriptor = "(Lnt;Laz;)V" - ) - public class35(Buffer var1, class31 var2) { - this.field245 = Executors.newSingleThreadExecutor(); // L: 10 - this.field247 = var1; // L: 16 - this.field241 = var2; // L: 17 - this.method413(); // L: 18 - } // L: 19 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1008458441" - ) - public boolean method420() { - return this.field239.isDone(); // L: 22 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "22" - ) - public void method410() { - this.field245.shutdown(); // L: 26 - this.field245 = null; // L: 27 - } // L: 28 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Lnt;", - garbageValue = "627853337" - ) - public Buffer method416() { - try { - return (Buffer)this.field239.get(); // L: 32 - } catch (Exception var2) { // L: 34 - return null; // L: 35 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2058888310" - ) - void method413() { - this.field239 = this.field245.submit(new class29(this, this.field247, this.field241)); // L: 40 - } // L: 41 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2087422044" - ) - public static void method422() { - 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("j") - @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "-1578358976" - ) - @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 (ReflectionCheck.method1227(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("o") - @ObfuscatedSignature( - descriptor = "(Lns;II)Z", - garbageValue = "-685210313" - ) - @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.field1362[var1] != null) { // L: 390 - var11.read(Players.field1362[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.field1361[var1]; // L: 397 - var11.plane = (byte)var8; // L: 398 - var11.resetPath((var9 << 13) + var3 - class15.baseX, (var10 << 13) + var4 - WorldMapSprite.baseY); // L: 399 - var11.field1201 = 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 = var6 + var7 & 255; // L: 447 - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 448 - return false; // L: 449 - } - } - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(Liv;I)Z", - garbageValue = "2109502620" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 11562 - } - - @ObfuscatedName("lc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "163144058" - ) - static void method421() { - Client.packetWriter.addNode(InterfaceParent.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher)); // L: 11673 - Client.oculusOrbState = 0; // L: 11674 - } // L: 11675 -} diff --git a/runescape-client/src/main/java/class350.java b/runescape-client/src/main/java/class350.java deleted file mode 100644 index 47983ee33e..0000000000 --- a/runescape-client/src/main/java/class350.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("my") -public class class350 extends Node { - @ObfuscatedName("f") - public long field3932; - - public class350(long var1) { - this.field3932 = var1; // L: 7 - } // L: 8 -} diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java new file mode 100644 index 0000000000..fea1a7b3ea --- /dev/null +++ b/runescape-client/src/main/java/class351.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("my") +public class class351 extends Node { + @ObfuscatedName("s") + public long field3962; + + public class351(long var1) { + this.field3962 = var1; + } +} diff --git a/runescape-client/src/main/java/class36.java b/runescape-client/src/main/java/class36.java deleted file mode 100644 index fdda054b5f..0000000000 --- a/runescape-client/src/main/java/class36.java +++ /dev/null @@ -1,35 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ae") -public class class36 { - @ObfuscatedName("f") - final int field250; - @ObfuscatedName("e") - final int field249; - @ObfuscatedName("v") - final String field248; - - @ObfuscatedSignature( - descriptor = "(Lnt;)V" - ) - class36(Buffer var1) { - this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 - } // L: 20 - - class36(int var1, int var2, String var3) { - this.field250 = var1; // L: 13 - this.field249 = var2; // L: 14 - this.field248 = var3; // L: 15 - } // L: 16 - - @ObfuscatedName("f") - String method425() { - return Integer.toHexString(this.field250) + Integer.toHexString(this.field249) + this.field248; // L: 23 - } - - @ObfuscatedName("e") - int method430() { - return this.field249; // L: 27 - } -} diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java deleted file mode 100644 index b29a894005..0000000000 --- a/runescape-client/src/main/java/class363.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("md") -public interface class363 extends Iterable { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1883866066" - ) - int vmethod6399(int var1); - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1983435032" - ) - void vmethod6398(int var1, Object var2); -} diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class364.java index 36bbc33e7c..65769989e8 100644 --- a/runescape-client/src/main/java/class364.java +++ b/runescape-client/src/main/java/class364.java @@ -1,71 +1,19 @@ -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("nv") -public class class364 implements class363 { - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("f") - Map field4079; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lon;" - ) - final class390 field4080; - - @ObfuscatedSignature( - descriptor = "(Lon;)V" - ) - public class364(class390 var1) { - this.field4080 = var1; // L: 15 - } // L: 16 - - @ObfuscatedName("f") +@ObfuscatedName("ng") +public interface class364 extends Iterable { + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1883866066" + garbageValue = "-1781797183" ) - public int vmethod6399(int var1) { - if (this.field4079 != null) { // L: 19 - class391 var2 = (class391)this.field4079.get(var1); // L: 20 - if (var2 != null) { - return (Integer)var2.field4227; // L: 21 - } - } + int vmethod6433(int var1); - return (Integer)this.field4080.vmethod6893(var1); // L: 23 - } - - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1983435032" + garbageValue = "-1423101008" ) - public void vmethod6398(int var1, Object var2) { - if (this.field4079 == null) { // L: 27 - this.field4079 = new HashMap(); // L: 28 - this.field4079.put(var1, new class391(var1, var2)); // L: 29 - } else { - class391 var3 = (class391)this.field4079.get(var1); // L: 32 - if (var3 == null) { - this.field4079.put(var1, new class391(var1, var2)); // L: 33 - } else { - var3.field4227 = var2; // L: 34 - } - } - - } // L: 36 - - public Iterator iterator() { - return this.field4079 == null ? Collections.emptyList().iterator() : this.field4079.values().iterator(); // L: 39 40 - } + void vmethod6430(int var1, Object var2); } diff --git a/runescape-client/src/main/java/class365.java b/runescape-client/src/main/java/class365.java new file mode 100644 index 0000000000..e553e1032e --- /dev/null +++ b/runescape-client/src/main/java/class365.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("no") +public class class365 implements class364 { + @ObfuscatedName("s") + Map field4112; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lob;" + ) + final class391 field4110; + + @ObfuscatedSignature( + descriptor = "(Lob;)V" + ) + public class365(class391 var1) { + this.field4110 = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1781797183" + ) + public int vmethod6433(int var1) { + if (this.field4112 != null) { + class392 var2 = (class392)this.field4112.get(var1); + if (var2 != null) { + return (Integer)var2.field4241; + } + } + + return (Integer)this.field4110.vmethod6964(var1); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "-1423101008" + ) + public void vmethod6430(int var1, Object var2) { + if (this.field4112 == null) { + this.field4112 = new HashMap(); + this.field4112.put(var1, new class392(var1, var2)); + } else { + class392 var3 = (class392)this.field4112.get(var1); + if (var3 == null) { + this.field4112.put(var1, new class392(var1, var2)); + } else { + var3.field4241 = var2; + } + } + + } + + public Iterator iterator() { + return this.field4112 == null ? Collections.emptyList().iterator() : this.field4112.values().iterator(); + } +} diff --git a/runescape-client/src/main/java/class366.java b/runescape-client/src/main/java/class366.java deleted file mode 100644 index f7d642e315..0000000000 --- a/runescape-client/src/main/java/class366.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nc") -public class class366 { - @ObfuscatedName("v") - static final char[] field4093; - @ObfuscatedName("y") - static final char[] field4092; - - static { - field4093 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4092 = new char[]{'[', ']', '#'}; // L: 9 - } -} diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java new file mode 100644 index 0000000000..0eec1c277f --- /dev/null +++ b/runescape-client/src/main/java/class367.java @@ -0,0 +1,51 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nt") +public class class367 { + @ObfuscatedName("tx") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + public static class287 field4127; + @ObfuscatedName("v") + static final char[] field4124; + @ObfuscatedName("j") + static final char[] field4126; + + static { + field4124 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4126 = new char[]{'[', ']', '#'}; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIIZIZB)V", + garbageValue = "2" + ) + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = class15.World_worlds[var6]; + class15.World_worlds[var6] = class15.World_worlds[var1]; + class15.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + if (SecureRandomFuture.method1713(class15.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { + World var10 = class15.World_worlds[var9]; + class15.World_worlds[var9] = class15.World_worlds[var7]; + class15.World_worlds[var7++] = var10; + } + } + + class15.World_worlds[var1] = class15.World_worlds[var7]; + class15.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } + + } +} diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java deleted file mode 100644 index 98d5d178a5..0000000000 --- a/runescape-client/src/main/java/class369.java +++ /dev/null @@ -1,46 +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("nm") -class class369 implements Iterator { - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "[Lna;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1278704295 - ) - int field4114; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lnz;" - ) - final class370 this$0; - - @ObfuscatedSignature( - descriptor = "(Lnz;)V" - ) - class369(class370 var1) { - this.this$0 = var1; // L: 50 - } - - public boolean hasNext() { - return this.field4114 < this.this$0.method6050(); // L: 54 - } - - public Object next() { - int var1 = ++this.field4114 - 1; // L: 58 - class342 var2 = (class342)this.this$0.field4120.get((long)var1); // L: 59 - return var2 != null ? var2 : this.this$0.method6475(var1); // L: 60 61 - } - - public void remove() { - throw new UnsupportedOperationException(); // L: 65 - } -} diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java index 994560511c..fccae02fe4 100644 --- a/runescape-client/src/main/java/class370.java +++ b/runescape-client/src/main/java/class370.java @@ -3,78 +3,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nz") -public class class370 extends class341 implements class217 { - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - final AbstractArchive field4116; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - final DemotingHashTable field4120; - @ObfuscatedName("y") +@ObfuscatedName("nb") +class class370 implements Iterator { + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 283772949 + intValue = 54109273 ) - final int field4118; + int field4147; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lns;" + ) + final class371 this$0; @ObfuscatedSignature( - descriptor = "(Ljl;ILkn;Ljp;)V" + descriptor = "(Lns;)V" ) - public class370(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 - this.field4120 = new DemotingHashTable(64); // L: 15 - this.field4116 = var4; // L: 20 - this.field4118 = var2; // L: 21 - } // L: 22 + class370(class371 var1) { + this.this$0 = var1; + } - @ObfuscatedName("f") + public Object next() { + int var1 = ++this.field4147 - 1; + class341 var2 = (class341)this.this$0.field4151.get((long)var1); + return var2 != null ? var2 : this.this$0.method6512(var1); + } + + public boolean hasNext() { + return this.field4147 < this.this$0.method6061(); + } + + public void remove() { + throw new UnsupportedOperationException(); + } + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lmq;", - garbageValue = "-898201969" + descriptor = "(Ljy;Ljy;I)Z", + garbageValue = "631428287" ) - protected class343 vmethod6482(int var1) { - synchronized(this.field4120) { // L: 26 - class342 var2 = (class342)this.field4120.get((long)var1); // L: 27 - if (var2 == null) { // L: 28 - var2 = this.method6475(var1); // L: 29 - this.field4120.method4456(var2, (long)var1); // L: 30 + public static boolean method6509(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; + if (!var0.isFullyLoaded()) { + return false; + } else { + WorldMapElement.WorldMapElement_count = var0.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; + + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { + byte[] var3 = var0.takeFile(35, var2); + WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); + if (var3 != null) { + WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); + WorldMapElement.WorldMapElement_cached[var2].method2735(); + } } - return var2; // L: 33 + return true; } } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(II)Lma;", - garbageValue = "867476406" - ) - class342 method6475(int var1) { - byte[] var2 = this.field4116.takeFile(this.field4118, var1); // L: 37 - class342 var3 = new class342(var1); // L: 38 - if (var2 != null) { - var3.method6070(new Buffer(var2)); // L: 39 - } - - return var3; // L: 40 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" - ) - public void method6474() { - synchronized(this.field4120) { // L: 44 - this.field4120.clear(); // L: 45 - } - } // L: 47 - - public Iterator iterator() { - return new class369(this); // L: 50 - } } diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java index 3dc6c89c5d..21f0419fff 100644 --- a/runescape-client/src/main/java/class371.java +++ b/runescape-client/src/main/java/class371.java @@ -1,19 +1,80 @@ +import java.util.Iterator; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nq") -public interface class371 { - @ObfuscatedName("f") +@ObfuscatedName("ns") +public class class371 extends class340 implements class218 { + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnt;I)V", - garbageValue = "1796019185" + descriptor = "Ljy;" ) - void vmethod6536(Object var1, Buffer var2); + final AbstractArchive field4150; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhk;" + ) + final DemotingHashTable field4151; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1940676039 + ) + final int field4149; - @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lnt;B)Ljava/lang/Object;", - garbageValue = "-46" + descriptor = "(Ljr;ILkq;Ljy;)V" ) - Object vmethod6533(Buffer var1); + public class371(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); + this.field4151 = new DemotingHashTable(64); + this.field4150 = var4; + this.field4149 = var2; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Lmd;", + garbageValue = "-232657382" + ) + protected class342 vmethod6511(int var1) { + synchronized(this.field4151) { + class341 var2 = (class341)this.field4151.get((long)var1); + if (var2 == null) { + var2 = this.method6512(var1); + this.field4151.method4351(var2, (long)var1); + } + + return var2; + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)Lmm;", + garbageValue = "1131227731" + ) + class341 method6512(int var1) { + byte[] var2 = this.field4150.takeFile(this.field4149, var1); + class341 var3 = new class341(var1); + if (var2 != null) { + var3.method6081(new Buffer(var2)); + } + + return var3; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1602600450" + ) + public void method6513() { + synchronized(this.field4151) { + this.field4151.clear(); + } + } + + public Iterator iterator() { + return new class370(this); + } } diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java index 563ecbad26..063ab44c3e 100644 --- a/runescape-client/src/main/java/class372.java +++ b/runescape-client/src/main/java/class372.java @@ -1,53 +1,19 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nj") -final class class372 implements class371 { - @ObfuscatedName("m") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -414913701 - ) - @Export("gameCyclesToDo") - static int gameCyclesToDo; - - @ObfuscatedName("f") +@ObfuscatedName("nd") +public interface class372 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnt;I)V", - garbageValue = "1796019185" + descriptor = "(Ljava/lang/Object;Lnv;I)V", + garbageValue = "120437007" ) - public void vmethod6536(Object var1, Buffer var2) { - this.method6492((Integer)var1, var2); // L: 20 - } // L: 21 + void vmethod6563(Object var1, Buffer var2); - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnt;B)Ljava/lang/Object;", - garbageValue = "-46" + descriptor = "(Lnv;I)Ljava/lang/Object;", + garbageValue = "-189621438" ) - public Object vmethod6533(Buffer var1) { - return var1.readInt(); // L: 16 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lnt;B)V", - garbageValue = "5" - ) - void method6492(Integer var1, Buffer var2) { - var2.writeInt(var1); // L: 12 - } // L: 13 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-10" - ) - public static boolean method6497(int var0) { - return (var0 >> 30 & 1) != 0; // L: 25 - } + Object vmethod6565(Buffer var1); } diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java index 6f4c8e5367..60b8bde534 100644 --- a/runescape-client/src/main/java/class373.java +++ b/runescape-client/src/main/java/class373.java @@ -1,11 +1,32 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nl") +final class class373 implements class372 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lnv;I)V", + garbageValue = "120437007" + ) + public void vmethod6563(Object var1, Buffer var2) { + this.method6533((Integer)var1, var2); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lnv;I)Ljava/lang/Object;", + garbageValue = "-189621438" + ) + public Object vmethod6565(Buffer var1) { + return var1.readInt(); + } -@ObfuscatedName("nn") -public class class373 { @ObfuscatedName("f") - public static final int[] field4126; - - static { - field4126 = 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 + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Integer;Lnv;I)V", + garbageValue = "-703381671" + ) + void method6533(Integer var1, Buffer var2) { + var2.writeInt(var1); } } diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class374.java index 3c3b665131..61fbf673f7 100644 --- a/runescape-client/src/main/java/class374.java +++ b/runescape-client/src/main/java/class374.java @@ -1,32 +1,15 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nk") -final class class374 implements class371 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnt;I)V", - garbageValue = "1796019185" - ) - public void vmethod6536(Object var1, Buffer var2) { - this.method6502((Long)var1, var2); // L: 33 - } // L: 34 +@ObfuscatedName("nz") +public class class374 { + @ObfuscatedName("s") + static final int[] field4154; + @ObfuscatedName("w") + @Export("SpriteBuffer_spriteHeights") + static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lnt;B)Ljava/lang/Object;", - garbageValue = "-46" - ) - public Object vmethod6533(Buffer var1) { - return var1.readLong(); // L: 29 + static { + field4154 = 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}; } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lnt;B)V", - garbageValue = "1" - ) - void method6502(Long var1, Buffer var2) { - var2.writeLong(var1); // L: 25 - } // L: 26 } diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java index 3278687690..1bf8c7dbc8 100644 --- a/runescape-client/src/main/java/class375.java +++ b/runescape-client/src/main/java/class375.java @@ -1,313 +1,32 @@ -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("ne") -public class class375 implements Enumerated -{ - @ObfuscatedName("f") +@ObfuscatedName("nm") +final class class375 implements class372 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "(Ljava/lang/Object;Lnv;I)V", + garbageValue = "120437007" ) - public static final class375 field4134; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lne;" - ) - public static final class375 field4127; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lne;" - ) - public static final class375 field4128; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1544272871 - ) - final int field4129; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 928638061 - ) - public final int field4137; - @ObfuscatedName("o") - public final Class field4132; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lnq;" - ) - final class371 field4133; - - static { - field4134 = new class375(1, 0, Integer.class, new class372()); // L: 10 - field4127 = new class375(0, 1, Long.class, new class374()); // L: 23 - field4128 = new class375(2, 2, String.class, new class376()); // L: 36 + public void vmethod6563(Object var1, Buffer var2) { + this.method6546((Long)var1, var2); } + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lnq;)V" + descriptor = "(Lnv;I)Ljava/lang/Object;", + garbageValue = "-189621438" ) - class375(int var1, int var2, Class var3, class371 var4) { - this.field4129 = var1; // L: 55 - this.field4137 = var2; // L: 56 - this.field4132 = var3; // L: 57 - this.field4133 = var4; // L: 58 - } // L: 59 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4137; // L: 91 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lnt;I)Ljava/lang/Object;", - garbageValue = "728831584" - ) - public Object method6510(Buffer var1) { - return this.field4133.vmethod6533(var1); // L: 95 + public Object vmethod6565(Buffer var1) { + return var1.readLong(); } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lcf;", - garbageValue = "268757704" + descriptor = "(Ljava/lang/Long;Lnv;I)V", + garbageValue = "-1485708968" ) - @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 = Varcs.archive12.takeFile(var0, 0); // L: 28 - if (var2 == null) { // L: 29 - return null; // L: 30 - } else { - var1 = NetSocket.newScript(var2); // L: 32 - Script.Script_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 - } - } + void method6546(Long var1, Buffer var2) { + var2.writeLong(var1); } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Lne;", - garbageValue = "1422033008" - ) - public static class375 method6511(Class var0) { - class375[] var1 = new class375[]{field4128, field4134, field4127}; // L: 65 - class375[] var2 = var1; // L: 67 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 68 - class375 var4 = var2[var3]; // L: 69 - if (var4.field4132 == var0) { // L: 71 - return var4; - } - } - - return null; // L: 75 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnt;I)V", - garbageValue = "-1820805265" - ) - public static void method6512(Object var0, Buffer var1) { - Class var3 = var0.getClass(); // L: 80 - class375 var4 = method6511(var3); // L: 82 - if (var4 == null) { - throw new IllegalArgumentException(); // L: 83 - } else { - class371 var2 = var4.field4133; // L: 84 - var2.vmethod6536(var0, var1); // L: 87 - } - } // L: 88 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1726872314" - ) - static final void method6530(String var0) { - PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); // L: 136 - var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 137 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 138 - Client.packetWriter.addNode(var1); // L: 139 - } // L: 140 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "784066620" - ) - static int method6531(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 3153 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3154 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class250.ItemDefinition_get(var3).name; // L: 3155 - return 1; // L: 3156 - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 3158 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3159 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3160 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3161 - var5 = class250.ItemDefinition_get(var3); // L: 3162 - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3163 - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3164 - } - - return 1; // L: 3165 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3167 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3168 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3169 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3170 - var5 = class250.ItemDefinition_get(var3); // L: 3171 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3172 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3173 - } - - return 1; // L: 3174 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3176 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3177 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).price; // L: 3178 - return 1; // L: 3179 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3181 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3182 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3183 - return 1; // L: 3184 - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 3186 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3187 - var7 = class250.ItemDefinition_get(var3); // L: 3188 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3189 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3190 - } - - return 1; // L: 3191 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3193 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3194 - var7 = class250.ItemDefinition_get(var3); // L: 3195 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3196 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3197 - } - - return 1; // L: 3198 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3200 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3201 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3202 - return 1; // L: 3203 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3205 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3206 - var7 = class250.ItemDefinition_get(var3); // L: 3207 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3208 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3209 - } - - return 1; // L: 3210 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3212 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3213 - var7 = class250.ItemDefinition_get(var3); // L: 3214 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3215 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3216 - } - - return 1; // L: 3217 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3219 - String var6 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3220 - var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3221 - DevicePcmPlayerProvider.findItemDefinitions(var6, var4 == 1); // L: 3222 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.foundItemIdCount; // L: 3223 - return 1; // L: 3224 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3226 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3231 - PcmPlayer.foundItemIndex = 0; // L: 3232 - return 1; // L: 3233 - } else if (var0 == 4213) { // L: 3235 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3236 - var4 = class250.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3237 - if (var4 == -1) { // L: 3238 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4; // L: 3239 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4 + 1; // L: 3242 - } - - return 1; // L: 3244 - } else { - return 2; // L: 3246 - } - } else { - if (ClanChannel.foundItemIds != null && PcmPlayer.foundItemIndex < ApproximateRouteStrategy.foundItemIdCount) { // L: 3227 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ClanChannel.foundItemIds[++PcmPlayer.foundItemIndex - 1] & '\uffff'; // L: 3228 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; - } - - return 1; // L: 3229 - } - } - } - } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "-25477474" - ) - @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: 7293 - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7294 7295 7300 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7296 - var9 = var10; // L: 7297 - break; - } - } - - if (var9 == null) { // L: 7302 - var9 = new PendingSpawn(); // L: 7303 - var9.plane = var0; // L: 7304 - var9.type = var3; // L: 7305 - var9.x = var1; // L: 7306 - var9.y = var2; // L: 7307 - FriendSystem.method1875(var9); // L: 7308 - Client.pendingSpawns.addFirst(var9); // L: 7309 - } - - var9.id = var4; // L: 7311 - var9.field1213 = var5; // L: 7312 - var9.orientation = var6; // L: 7313 - var9.delay = var7; // L: 7314 - var9.hitpoints = var8; // L: 7315 - } // L: 7316 } diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java index 0552184f84..486cb6b4e2 100644 --- a/runescape-client/src/main/java/class376.java +++ b/runescape-client/src/main/java/class376.java @@ -1,32 +1,177 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") -final class class376 implements class371 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnt;I)V", - garbageValue = "1796019185" +@ObfuscatedName("ni") +public class class376 implements Enumerated { + @ObfuscatedName("rk") + @ObfuscatedGetter( + intValue = -35971817 ) - public void vmethod6536(Object var1, Buffer var2) { - this.method6534((String)var1, var2); // L: 46 - } // L: 47 + static int field4165; + @ObfuscatedName("qz") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + public static final class376 field4163; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + public static final class376 field4159; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + public static final class376 field4164; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -76089707 + ) + final int field4161; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 39384277 + ) + public final int field4158; + @ObfuscatedName("n") + public final Class field4160; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lnd;" + ) + public final class372 field4162; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lnt;B)Ljava/lang/Object;", - garbageValue = "-46" - ) - public Object vmethod6533(Buffer var1) { - return var1.readStringCp1252NullTerminated(); // L: 42 + static { + field4163 = new class376(0, 0, Integer.class, new class373()); + field4159 = new class376(2, 1, Long.class, new class375()); + field4164 = new class376(1, 2, String.class, new class377()); } - @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lnt;B)V", - garbageValue = "123" + descriptor = "(IILjava/lang/Class;Lnd;)V" ) - void method6534(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); // L: 38 - } // L: 39 + class376(int var1, int var2, Class var3, class372 var4) { + this.field4161 = var1; + this.field4158 = var2; + this.field4160 = var3; + this.field4162 = var4; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1806959663" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4158; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnv;I)Ljava/lang/Object;", + garbageValue = "39428313" + ) + public Object method6561(Buffer var1) { + return this.field4162.vmethod6565(var1); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "1" + ) + static final void method6562(String var0) { + PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2603, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(Lio;Lfh;IIZI)V", + garbageValue = "1545496664" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; + byte var6 = -1; + String var7 = null; + if (var5 != null && var5[var3] != null) { + if (var3 == 0) { + var6 = 33; + } else if (var3 == 1) { + var6 = 34; + } else if (var3 == 2) { + var6 = 35; + } else if (var3 == 3) { + var6 = 36; + } else { + var6 = 37; + } + + var7 = var5[var3]; + } else if (var3 == 4) { + var6 = 37; + var7 = "Drop"; + } + + if (var6 != -1 && var7 != null) { + PcmPlayer.insertMenuItem(var7, ScriptFrame.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + } + + } + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "(Lio;B)Z", + garbageValue = "0" + ) + static final boolean method6560(Widget var0) { + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); + } + + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method4724(var2, var3 == 1); + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); + } + + if (var1 == 325) { + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { + PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; + } else { + return false; + } + } + } } diff --git a/runescape-client/src/main/java/class377.java b/runescape-client/src/main/java/class377.java index 163e0630c8..69f44b704d 100644 --- a/runescape-client/src/main/java/class377.java +++ b/runescape-client/src/main/java/class377.java @@ -2,15 +2,49 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nl") -public final class class377 { - @ObfuscatedName("e") - @Export("clearLoginScreen") - static boolean clearLoginScreen; - @ObfuscatedName("r") +@ObfuscatedName("ny") +final class class377 implements class372 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "(Ljava/lang/Object;Lnv;I)V", + garbageValue = "120437007" ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; + public void vmethod6563(Object var1, Buffer var2) { + this.method6564((String)var1, var2); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lnv;I)Ljava/lang/Object;", + garbageValue = "-189621438" + ) + public Object vmethod6565(Buffer var1) { + return var1.readStringCp1252NullTerminated(); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lnv;I)V", + garbageValue = "1451244518" + ) + void method6564(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Loa;" + ) + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.message = var2.message + ' ' + var1; + } else { + var2 = new RunException(var0, var1); + } + + return var2; + } } diff --git a/runescape-client/src/main/java/class378.java b/runescape-client/src/main/java/class378.java deleted file mode 100644 index c9b7b1359f..0000000000 --- a/runescape-client/src/main/java/class378.java +++ /dev/null @@ -1,33 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nh") -public class class378 { - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("HitSplatDefinition_spritesArchive") - static AbstractArchive HitSplatDefinition_spritesArchive; - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-53601525" - ) - static final int method6550(int var0, int var1) { - if (var0 == -1) { // L: 844 - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; // L: 845 - if (var1 < 2) { // L: 846 - var1 = 2; - } else if (var1 > 126) { // L: 847 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 848 - } - } -} diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java deleted file mode 100644 index 7f6670aa9c..0000000000 --- a/runescape-client/src/main/java/class379.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nw") -public class class379 { - @ObfuscatedName("h") - static int[] field4145; -} diff --git a/runescape-client/src/main/java/class380.java b/runescape-client/src/main/java/class380.java deleted file mode 100644 index 61b09df6a1..0000000000 --- a/runescape-client/src/main/java/class380.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nx") -public final class class380 { - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -3054785751312639975L - ) - static long field4151; -} diff --git a/runescape-client/src/main/java/class381.java b/runescape-client/src/main/java/class381.java new file mode 100644 index 0000000000..05a6a26e4e --- /dev/null +++ b/runescape-client/src/main/java/class381.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nw") +public final class class381 { + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = 1788906997501874871L + ) + static long field4173; +} diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java deleted file mode 100644 index 389641b5eb..0000000000 --- a/runescape-client/src/main/java/class386.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ni") -public interface class386 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V" - ) - void method6869(Buffer var1); -} diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java index aa912723e9..92a601ab10 100644 --- a/runescape-client/src/main/java/class387.java +++ b/runescape-client/src/main/java/class387.java @@ -1,65 +1,11 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("nr") -public enum class387 implements Enumerated -{ - @ObfuscatedName("f") +public interface class387 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnr;" + descriptor = "(Lnv;I)V" ) - field4211(4, 0), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field4213(5, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field4212(0, 5), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field4214(2, 6), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field4215(1, 7), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lnr;" - ) - field4216(3, 8); - - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -281212927 - ) - final int field4217; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 2118941453 - ) - final int field4218; - - class387(int var3, int var4) { - this.field4217 = var3; // L: 18 - this.field4218 = var4; // L: 19 - } // L: 20 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1154679040" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4218; // L: 23 - } + void method6935(Buffer var1); } diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java new file mode 100644 index 0000000000..e9b44a0062 --- /dev/null +++ b/runescape-client/src/main/java/class388.java @@ -0,0 +1,85 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nc") +public enum class388 implements Enumerated { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + field4230(4, 0), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + field4231(5, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + field4232(0, 5), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + field4233(2, 6), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + field4234(1, 7), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + field4235(3, 8); + + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -2082679817 + ) + final int field4236; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 113615845 + ) + final int field4237; + + class388(int var3, int var4) { + this.field4236 = var3; + this.field4237 = var4; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1806959663" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4237; + } + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(IIZB)V", + garbageValue = "7" + ) + static final void method6942(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2520()) { + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + PacketWriter var4 = Client.packetWriter; + PacketBufferNode var5 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2664, var4.isaacCipher); + var5.packetBuffer.writeByte(4 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var3.username.getName())); + var5.packetBuffer.writeByte(var0); + var5.packetBuffer.writeShort(var1); + var5.packetBuffer.writeBoolean(var2); + var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); + var4.addNode(var5); + } + } + } +} diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java deleted file mode 100644 index 3154224e37..0000000000 --- a/runescape-client/src/main/java/class390.java +++ /dev/null @@ -1,12 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("on") -public interface class390 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-898289717" - ) - Object vmethod6893(int var1); -} diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java index 27df20f919..f8f911a5e0 100644 --- a/runescape-client/src/main/java/class391.java +++ b/runescape-client/src/main/java/class391.java @@ -1,255 +1,12 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") -public class class391 { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1496725553 - ) - public final int field4226; - @ObfuscatedName("e") - public Object field4227; - - public class391(int var1) { - this.field4226 = var1; // L: 8 - } // L: 9 - - public class391(int var1, Object var2) { - this.field4226 = var1; // L: 12 - this.field4227 = var2; // L: 13 - } // L: 14 - - public int hashCode() { - return super.hashCode(); // L: 17 - } - - public boolean equals(Object var1) { - if (!(var1 instanceof class391)) { // L: 21 - return false; - } else { - class391 var2 = (class391)var1; // L: 22 - if (var2.field4227 == null && this.field4227 != null) { // L: 23 - return false; - } else if (this.field4227 == null && var2.field4227 != null) { // L: 24 - return false; - } else { - return this.field4226 == var2.field4226 && var2.field4227.equals(this.field4227); // L: 25 - } - } - } - - @ObfuscatedName("ik") +@ObfuscatedName("ob") +public interface class391 { + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-857761179" + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "0" ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9003 - class22.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9004 - } - - long var4 = -1L; // L: 9007 - long var6 = -1L; // L: 9008 - int var8 = 0; - - while (true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 9013 - if (var8 >= var10) { // L: 9015 - if (-1L != var4) { // L: 9162 - var8 = (int)(var4 >>> 0 & 127L); // L: 9165 - var10 = TextureProvider.method4272(var4); // L: 9168 - Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9169 - Actor.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); // L: 9170 - } - - return; // L: 9172 - } - - long var27 = UrlRequest.method2516(var8); // L: 9016 - if (var27 != var6) { // L: 9017 - label328: { - var6 = var27; // L: 9018 - long var15 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9022 - int var14 = (int)(var15 >>> 0 & 127L); // L: 9024 - var14 = var14; // L: 9028 - int var29 = TextureProvider.method4272(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9031 - int var16 = var29; // L: 9033 - long var19 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9037 - int var18 = (int)(var19 >>> 14 & 3L); // L: 9039 - int var30 = Message.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9046 - int var20 = var30; // L: 9048 - if (var18 == 2 && DevicePcmPlayerProvider.scene.getObjectFlags(SoundSystem.Client_plane, var14, var29, var27) >= 0) { // L: 9049 9050 - ObjectComposition var21 = Tiles.getObjectDefinition(var30); // L: 9051 - if (var21.transforms != null) { // L: 9052 - var21 = var21.transform(); - } - - if (var21 == null) { // L: 9053 - break label328; - } - - if (Client.isItemSelected == 1) { // L: 9054 - class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(65535) + var21.name, 1, var30, var14, var29); // L: 9055 - } else if (Client.isSpellSelected) { // L: 9058 - if ((LoginPacket.selectedSpellFlags & 4) == 4) { // L: 9059 - class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(65535) + var21.name, 2, var30, var14, var29); // L: 9060 - } - } else { - String[] var22 = var21.actions; // L: 9065 - if (var22 != null) { // L: 9066 - for (int var23 = 4; var23 >= 0; --var23) { // L: 9067 - if (var22[var23] != null) { // L: 9068 - short var24 = 0; // L: 9069 - if (var23 == 0) { // L: 9070 - var24 = 3; - } - - if (var23 == 1) { // L: 9071 - var24 = 4; - } - - if (var23 == 2) { // L: 9072 - var24 = 5; - } - - if (var23 == 3) { // L: 9073 - var24 = 6; - } - - if (var23 == 4) { // L: 9074 - var24 = 1001; - } - - class22.insertMenuItemNoShift(var22[var23], SecureRandomFuture.colorStartTag(65535) + var21.name, var24, var20, var14, var16); // L: 9075 - } - } - } - - class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(65535) + var21.name, 1002, var21.id, var14, var16); // L: 9080 - } - } - - Player var25; - int var31; - NPC var32; - int var39; - int[] var40; - if (var18 == 1) { // L: 9085 - NPC var35 = Client.npcs[var20]; // L: 9086 - if (var35 == null) { // L: 9087 - break label328; - } - - if (var35.definition.size == 1 && (var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9088 - for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 9089 - var32 = Client.npcs[Client.npcIndices[var31]]; // L: 9090 - if (var32 != null && var32 != var35 && var32.definition.size == 1 && var32.x == var35.x && var35.y == var32.y) { // L: 9091 - FontName.addNpcToMenu(var32.definition, Client.npcIndices[var31], var14, var16); - } - } - - var31 = Players.Players_count; // L: 9093 - var40 = Players.Players_indices; // L: 9094 - - for (var39 = 0; var39 < var31; ++var39) { // L: 9095 - var25 = Client.players[var40[var39]]; // L: 9096 - if (var25 != null && var35.x == var25.x && var25.y == var35.y) { // L: 9097 - Actor.addPlayerToMenu(var25, var40[var39], var14, var16); - } - } - } - - FontName.addNpcToMenu(var35.definition, var20, var14, var16); // L: 9100 - } - - if (var18 == 0) { // L: 9102 - Player var36 = Client.players[var20]; // L: 9103 - if (var36 == null) { // L: 9104 - break label328; - } - - if ((var36.x & 127) == 64 && (var36.y & 127) == 64) { // L: 9105 - for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 9106 - var32 = Client.npcs[Client.npcIndices[var31]]; // L: 9107 - if (var32 != null && var32.definition.size == 1 && var36.x == var32.x && var32.y == var36.y) { // L: 9108 - FontName.addNpcToMenu(var32.definition, Client.npcIndices[var31], var14, var16); - } - } - - var31 = Players.Players_count; // L: 9110 - var40 = Players.Players_indices; // L: 9111 - - for (var39 = 0; var39 < var31; ++var39) { // L: 9112 - var25 = Client.players[var40[var39]]; // L: 9113 - if (var25 != null && var36 != var25 && var36.x == var25.x && var25.y == var36.y) { // L: 9114 - Actor.addPlayerToMenu(var25, var40[var39], var14, var16); - } - } - } - - if (var20 != Client.combatTargetPlayerIndex) { - Actor.addPlayerToMenu(var36, var20, var14, var16); // L: 9117 - } else { - var4 = var27; // L: 9118 - } - } - - if (var18 == 3) { // L: 9120 - NodeDeque var38 = Client.groundItems[SoundSystem.Client_plane][var14][var16]; // L: 9121 - if (var38 != null) { // L: 9122 - for (TileItem var37 = (TileItem)var38.first(); var37 != null; var37 = (TileItem)var38.next()) { // L: 9123 9124 9157 - ItemComposition var41 = class250.ItemDefinition_get(var37.id); // L: 9125 - if (Client.isItemSelected == 1) { // L: 9126 - class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var41.name, 16, var37.id, var14, var16); // L: 9127 - } else if (Client.isSpellSelected) { // L: 9130 - if ((LoginPacket.selectedSpellFlags & 1) == 1) { // L: 9131 - class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var41.name, 17, var37.id, var14, var16); // L: 9132 - } - } else { - String[] var33 = var41.groundActions; // L: 9137 - - for (int var34 = 4; var34 >= 0; --var34) { // L: 9138 - if (var33 != null && var33[var34] != null) { // L: 9139 - byte var26 = 0; // L: 9140 - if (var34 == 0) { // L: 9141 - var26 = 18; - } - - if (var34 == 1) { // L: 9142 - var26 = 19; - } - - if (var34 == 2) { // L: 9143 - var26 = 20; - } - - if (var34 == 3) { // L: 9144 - var26 = 21; - } - - if (var34 == 4) { // L: 9145 - var26 = 22; - } - - class22.insertMenuItemNoShift(var33[var34], SecureRandomFuture.colorStartTag(16748608) + var41.name, var26, var37.id, var14, var16); // L: 9146 - } else if (var34 == 2) { // L: 9149 - class22.insertMenuItemNoShift("Take", SecureRandomFuture.colorStartTag(16748608) + var41.name, 20, var37.id, var14, var16); // L: 9150 - } - } - - class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16748608) + var41.name, 1004, var37.id, var14, var16); // L: 9154 - } - } - } - } - } - } - - ++var8; // L: 9009 - } - } + Object vmethod6964(int var1); } diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java new file mode 100644 index 0000000000..d5da29f429 --- /dev/null +++ b/runescape-client/src/main/java/class392.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ok") +public class class392 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -11365389 + ) + public final int field4240; + @ObfuscatedName("t") + public Object field4241; + + public class392(int var1) { + this.field4240 = var1; + } + + public class392(int var1, Object var2) { + this.field4240 = var1; + this.field4241 = var2; + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class392)) { + return false; + } else { + class392 var2 = (class392)var1; + if (var2.field4241 == null && this.field4241 != null) { + return false; + } else if (this.field4241 == null && var2.field4241 != null) { + return false; + } else { + return this.field4240 == var2.field4240 && var2.field4241.equals(this.field4241); + } + } + } + + public int hashCode() { + return super.hashCode(); + } +} diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java deleted file mode 100644 index d538c79750..0000000000 --- a/runescape-client/src/main/java/class397.java +++ /dev/null @@ -1,28 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ol") -public class class397 { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 594316293 - ) - @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -770896369 - ) - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("y") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("r") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("am") - @Export("hasFocus") - protected static boolean hasFocus; -} diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java new file mode 100644 index 0000000000..1d9c241f0a --- /dev/null +++ b/runescape-client/src/main/java/class398.java @@ -0,0 +1,93 @@ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("os") +public class class398 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -654146289 + ) + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -594544409 + ) + @Export("SpriteBuffer_spriteWidth") + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 842008647 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("j") + @Export("SpriteBuffer_xOffsets") + static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("l") + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("o") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;B)Ljava/lang/String;", + garbageValue = "-24" + ) + static String method7217(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.message + " | "; + var0 = var2.throwable; + } else { + var1 = ""; + } + + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; + } + + var7 = var7.substring(0, var8); + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; + } + } + } +} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 979ee91d22..e27649e0bf 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -3,61 +3,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") -public class class4 extends class14 { - @ObfuscatedName("sg") - @ObfuscatedSignature( - descriptor = "Lcn;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("eo") +@ObfuscatedName("l") +public final class class4 { + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = -750894877 + intValue = -1925089441 ) - static int field38; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1782449863 - ) - int field37; - @ObfuscatedName("e") - String field40; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; + @Export("js5Port") + static int js5Port; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lv;)V" + descriptor = "(II)V", + garbageValue = "-473297413" ) - class4(class2 var1) { - this.this$0 = var1; // L: 323 + public static void method20(int var0) { + if (var0 != -1) { + if (class100.Widget_loadedInterfaces[var0]) { + Widget.Widget_archive.clearFilesGroup(var0); + if (Widget.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; + + for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { + if (Widget.Widget_interfaceComponents[var0][var2] != null) { + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; + } + } + } + + if (var1) { + Widget.Widget_interfaceComponents[var0] = null; + } + + class100.Widget_loadedInterfaces[var0] = false; + } + } + } } - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" + descriptor = "(I)[Ley;", + garbageValue = "-1234934872" ) - void vmethod363(Buffer var1) { - this.field37 = var1.readInt(); // L: 326 - this.field40 = var1.readStringCp1252NullTerminated(); // L: 327 - } // L: 328 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method138(this.field37, this.field40); // L: 331 - } // L: 332 + static VerticalAlignment[] method21() { + return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1652, VerticalAlignment.field1654}; + } } diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java deleted file mode 100644 index 4ef3ef00a8..0000000000 --- a/runescape-client/src/main/java/class403.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ow") -public class class403 { - @ObfuscatedName("d") - static final int[] field4296; - @ObfuscatedName("z") - static final int[] field4298; - - static { - field4296 = new int[2048]; // L: 13 - field4298 = new int[2048]; // L: 14 - double var0 = 0.0030679615757712823D; // L: 17 - - for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4296[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 - field4298[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20 - } - - } // L: 22 -} diff --git a/runescape-client/src/main/java/class254.java b/runescape-client/src/main/java/class406.java similarity index 50% rename from runescape-client/src/main/java/class254.java rename to runescape-client/src/main/java/class406.java index 666cabdf80..ecebbba296 100644 --- a/runescape-client/src/main/java/class254.java +++ b/runescape-client/src/main/java/class406.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") -public class class254 { +@ObfuscatedName("ol") +public class class406 { @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Ljy;" ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; + @Export("SpotAnimationDefinition_modelArchive") + static AbstractArchive SpotAnimationDefinition_modelArchive; } diff --git a/runescape-client/src/main/java/class407.java b/runescape-client/src/main/java/class407.java new file mode 100644 index 0000000000..19cd307619 --- /dev/null +++ b/runescape-client/src/main/java/class407.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ow") +public class class407 { + @ObfuscatedName("ba") + @ObfuscatedGetter( + intValue = -2068762901 + ) + static int field4313; +} diff --git a/runescape-client/src/main/java/class41.java b/runescape-client/src/main/java/class41.java new file mode 100644 index 0000000000..93c16900ee --- /dev/null +++ b/runescape-client/src/main/java/class41.java @@ -0,0 +1,134 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("at") +public class class41 { + @ObfuscatedName("qj") + @ObfuscatedSignature( + descriptor = "Ldj;" + ) + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("reflectionChecks") + public static IterableNodeDeque reflectionChecks; + @ObfuscatedName("es") + static int[] field356; + + static { + reflectionChecks = new IterableNodeDeque(); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", + garbageValue = "1083486417" + ) + static void method846(String var0, boolean var1, String var2, boolean var3) { + if (var1) { + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var5) { + } + } + + if (class16.field87.startsWith("win") && !var3) { + ObjectComposition.method3015(var0, 0, "openjs"); + return; + } + + if (class16.field87.startsWith("mac")) { + ObjectComposition.method3015(var0, 1, var2); + return; + } + + ObjectComposition.method3015(var0, 2, "openjs"); + } else { + ObjectComposition.method3015(var0, 3, "openjs"); + } + + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(CLkq;I)I", + garbageValue = "-856867473" + ) + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + var0 = Character.toLowerCase(var0); + var2 = (var0 << 4) + 1; + } + + if (var0 == 241 && var1 == Language.Language_ES) { + var2 = 1762; + } + + return var2; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-12" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1490093410" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field647) { + DynamicObject.method1727(); + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Decimator.clientPreferences.musicVolume != 0 && !Client.field647) { + UserComparator5.method2162(2, class108.archive6, var0, 0, Decimator.clientPreferences.musicVolume, false); + } + + Client.currentTrackGroupId = var0; + } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "1413225584" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (Huffman.loadInterface(var0)) { + UrlRequest.field1224 = null; + StructComposition.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (UrlRequest.field1224 != null) { + StructComposition.drawInterface(UrlRequest.field1224, -1412584499, var1, var2, var3, var4, PcmPlayer.field191, MouseRecorder.field976, var7); + UrlRequest.field1224 = null; + } + + } else { + if (var7 != -1) { + Client.field616[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field616[var8] = true; + } + } + + } + } +} diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java deleted file mode 100644 index 6a77e51833..0000000000 --- a/runescape-client/src/main/java/class42.java +++ /dev/null @@ -1,25 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("as") -public class class42 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "434210577" - ) - public static void method525(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); // L: 13 - } // L: 14 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", - garbageValue = "-1290742377" - ) - public static Object method521(Applet var0, String var1) throws Throwable { - return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 17 - } -} diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java deleted file mode 100644 index 4027dcc4f3..0000000000 --- a/runescape-client/src/main/java/class43.java +++ /dev/null @@ -1,86 +0,0 @@ -import javax.imageio.ImageIO; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("au") -public class class43 { - @ObfuscatedName("r") - static byte[][][] field307; - - static { - ImageIO.setUseCache(false); // L: 12 - } // L: 13 - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1455356622" - ) - static int method527(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4210 - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4215 - if (var0 == 6750) { // L: 4219 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4220 - return 1; // L: 4221 - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4223 - if (var0 == 6754) { // L: 4227 - int var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4228 - NPCComposition var4 = class248.getNpcDefinition(var3); // L: 4229 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4230 - return 1; // L: 4231 - } else { - return 2; // L: 4233 - } - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4224 - return 1; // L: 4225 - } - } else { - --ChatChannel.Interpreter_intStackSize; // L: 4216 - return 1; // L: 4217 - } - } else { - ChatChannel.Interpreter_intStackSize -= 2; // L: 4211 - --UserComparator9.Interpreter_stringStackSize; // L: 4212 - return 1; // L: 4213 - } - } - - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "(Liv;IIB)V", - garbageValue = "39" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 9986 - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 9987 - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 9988 - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 9989 - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 9990 - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9991 - } - - if (var0.yAlignment == 0) { // L: 9992 - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 9993 - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 9994 - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 9995 - } else if (var0.yAlignment == 4) { // L: 9996 - var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 9997 - } - - } // L: 9998 -} diff --git a/runescape-client/src/main/java/class44.java b/runescape-client/src/main/java/class44.java deleted file mode 100644 index ab98277e1e..0000000000 --- a/runescape-client/src/main/java/class44.java +++ /dev/null @@ -1,81 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ay") -public class class44 { - @ObfuscatedName("ra") - @ObfuscatedGetter( - intValue = 1478949061 - ) - static int field315; - @ObfuscatedName("f") - @Export("applet") - static Applet applet; - @ObfuscatedName("e") - static String field309; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - - static { - applet = null; // L: 10 - field309 = ""; // L: 11 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "69" - ) - static void method532() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 42 - } // L: 43 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "67" - ) - public static void method540(int var0) { - if (var0 != -1) { // L: 240 - if (Widget.Widget_loadedInterfaces[var0]) { // L: 241 - AttackOption.Widget_archive.clearFilesGroup(var0); // L: 242 - if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] != null) { // L: 243 - boolean var1 = true; // L: 244 - - for (int var2 = 0; var2 < GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0].length; ++var2) { // L: 245 - if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] != null) { // L: 246 - if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].type != 2) { // L: 247 - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; // L: 248 - } - } - } - - if (var1) { - GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] = null; // L: 251 - } - - Widget.Widget_loadedInterfaces[var0] = false; // L: 252 - } - } - } - } // L: 253 - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1279481562" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 119 - } -} diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index efc29399da..9b31103ce3 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -1,130 +1,80 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") -public class class5 extends class16 { - @ObfuscatedName("lw") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - static Widget field42; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 835981453 - ) - int field43; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ls;" - ) - final class19 this$0; +@ObfuscatedName("n") +public class class5 implements class2 { + @ObfuscatedName("s") + final MessageDigest field8; @ObfuscatedSignature( - descriptor = "(Ls;)V" + descriptor = "(Lo;)V" ) - class5(class19 var1) { - this.this$0 = var1; - this.field43 = -1; + class5(class8 var1) { + this.field8 = this.method26(); } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "851460888" - ) - void vmethod331(Buffer var1) { - this.field43 = var1.readUnsignedShort(); // L: 86 - var1.readUnsignedByte(); - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); // L: 90 - } - + @ObfuscatedName("s") + boolean method23(int var1, String var2, long var3) { + byte[] var5 = this.method25(var2, var3); + return method30(var5) >= var1; } - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ly;I)V", - garbageValue = "-1362614343" - ) - void vmethod332(ClanChannel var1) { - var1.removeMember(this.field43); - } // L: 96 + @ObfuscatedName("j") + byte[] method25(String var1, long var2) { + StringBuilder var4 = new StringBuilder(); + var4.append(var1).append(Long.toHexString(var2)); + this.field8.reset(); - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "2066845091" - ) - public static boolean method73(int var0) { - return (var0 >> 20 & 1) != 0; // L: 21 + try { + this.field8.update(var4.toString().getBytes("UTF-8")); + } catch (UnsupportedEncodingException var6) { + var6.printStackTrace(); + } + + return this.field8.digest(); } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-217249908" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; // L: 74 - if (var0 < 0 || var0 >= 65536) { // L: 75 - var0 >>>= 16; // L: 76 - var1 += 16; // L: 77 + @ObfuscatedName("l") + MessageDigest method26() { + try { + return MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException var2) { + var2.printStackTrace(); + return null; } - - if (var0 >= 256) { // L: 79 - var0 >>>= 8; // L: 80 - var1 += 8; // L: 81 - } - - if (var0 >= 16) { // L: 83 - var0 >>>= 4; // L: 84 - var1 += 4; // L: 85 - } - - if (var0 >= 4) { // L: 87 - var0 >>>= 2; // L: 88 - var1 += 2; // L: 89 - } - - if (var0 >= 1) { // L: 91 - var0 >>>= 1; // L: 92 - ++var1; // L: 93 - } - - return var0 + var1; // L: 95 } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "-72" - ) - static int method72(int var0, Script var1, boolean var2) { - if (var0 == 6800) { // L: 4237 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4238 - return 1; // L: 4239 - } else if (var0 != 6801 && var0 != 6802) { // L: 4241 - if (var0 == 6850) { // L: 4245 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4246 - return 1; // L: 4247 - } else if (var0 != 6851 && var0 != 6852) { // L: 4249 - if (var0 == 6853) { // L: 4253 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4254 - return 1; // L: 4255 - } else { - return 2; // L: 4257 - } - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4250 - return 1; // L: 4251 + @ObfuscatedName("t") + static int method30(byte[] var0) { + int var1 = 0; + byte[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + byte var4 = var2[var3]; + int var5 = method24(var4); + var1 += var5; + if (var5 != 8) { + break; } - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4242 - return 1; // L: 4243 } + + return var1; + } + + @ObfuscatedName("v") + static int method24(byte var0) { + int var1 = 0; + if (var0 == 0) { + var1 = 8; + } else { + for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { + ++var1; + } + } + + return var1; } } diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java new file mode 100644 index 0000000000..c9e7fd7e3e --- /dev/null +++ b/runescape-client/src/main/java/class52.java @@ -0,0 +1,88 @@ +import java.math.BigInteger; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("bt") +public class class52 { + @ObfuscatedName("l") + static final BigInteger field775; + @ObfuscatedName("n") + static final BigInteger field772; + + static { + field775 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field772 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "66" + ) + public static void method1651() { + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1705354846" + ) + static final int method1652(int var0, int var1) { + if (var0 == -1) { + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1318639534" + ) + static final void method1653() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var0.plane == GrandExchangeEvent.Client_plane && !var0.isFinished) { + if (Client.cycle >= var0.cycleStart) { + var0.advance(Client.field555); + if (var0.isFinished) { + var0.remove(); + } else { + WorldMapIcon_1.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); + } + } + } else { + var0.remove(); + } + } + + } + + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", + garbageValue = "6523" + ) + static String method1648(String var0) { + PlayerType[] var1 = Messages.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(HealthBar.method1945(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; + } + } + + return var0; + } +} diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java new file mode 100644 index 0000000000..0ffec704f3 --- /dev/null +++ b/runescape-client/src/main/java/class54.java @@ -0,0 +1,30 @@ +import java.awt.Image; +import java.math.BigInteger; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("br") +public class class54 { + @ObfuscatedName("s") + static final BigInteger field792; + @ObfuscatedName("t") + static final BigInteger field791; + @ObfuscatedName("au") + static Image field794; + + static { + field792 = new BigInteger("10001", 16); + field791 = new BigInteger("ab6110302672864008d0185e6afc9b62db423bb9e2814f3eed533d23426d27ca6fdb3a8144af5f336e3260ca6aa42c96a9a97e061b7a041e85d823fb34738b4fd8aa5469a67e898774221bf6cf5ccc1b79c53154299bdafd8ced827edbc9278035bb1c538bbd08676651fe07c901650e509497289e174d6162d7b3b68acf4d0d", 16); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)[B", + garbageValue = "-1009670840" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + } +} diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 7e9b371aa7..15d0277ffe 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -2,210 +2,128 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("m") -public class class6 extends class14 { - @ObfuscatedName("ec") +@ObfuscatedName("w") +public enum class6 implements Enumerated { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lw;" ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -753176319 - ) - int field47; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 239857617 - ) - int field45; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; + field16(0, 0); - @ObfuscatedSignature( - descriptor = "(Lv;)V" + @ObfuscatedName("rs") + @ObfuscatedGetter( + intValue = -1392689603 ) - class6(class2 var1) { - this.this$0 = var1; // L: 271 + static int field14; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lbi;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("al") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lbn;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -795411891 + ) + public final int field10; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1070040319 + ) + final int field20; + + class6(int var3, int var4) { + this.field10 = var3; + this.field20 = var4; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" + descriptor = "(I)I", + garbageValue = "-1806959663" ) - void vmethod363(Buffer var1) { - this.field47 = var1.readInt(); // L: 274 - this.field45 = var1.readInt(); // L: 275 - } // L: 276 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field20; + } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" + descriptor = "(IB)I", + garbageValue = "-40" ) - void vmethod354(ClanSettings var1) { - var1.method188(this.field47, this.field45); // L: 279 - } // L: 280 + public static int method43(int var0) { + return var0 >> 17 & 7; + } - @ObfuscatedName("fw") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-719237513" + descriptor = "(ILbd;ZI)I", + garbageValue = "-503815128" ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field862) { // L: 3785 - Decimator.method1169(); // L: 3786 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class4.clientPreferences.musicVolume != 0 && !Client.field862) { // L: 3788 - WorldMapIcon_1.method3300(2, DynamicObject.archive6, var0, 0, class4.clientPreferences.musicVolume, false); // L: 3789 + static int method38(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 1610) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 1613) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else if (var0 != 1615 && var0 != 1616) { + return 2; + } else { + ++Interpreter.Interpreter_intStackSize; + return 1; } - - Client.currentTrackGroupId = var0; // L: 3791 - } // L: 3792 - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-28" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - WorldMapID.method3717(); // L: 11144 - Canvas.method495(); // L: 11145 - int var1 = class1.VarpDefinition_get(var0).type; // L: 11146 - if (var1 != 0) { // L: 11147 - int var2 = Varps.Varps_main[var0]; // L: 11148 - if (var1 == 1) { // L: 11149 - if (var2 == 1) { // L: 11150 - UserComparator10.method2568(0.9D); - } - - if (var2 == 2) { // L: 11151 - UserComparator10.method2568(0.8D); - } - - if (var2 == 3) { // L: 11152 - UserComparator10.method2568(0.7D); - } - - if (var2 == 4) { // L: 11153 - UserComparator10.method2568(0.6D); - } - } - - if (var1 == 3) { // L: 11155 - if (var2 == 0) { // L: 11156 - class0.method0(255); - } - - if (var2 == 1) { // L: 11157 - class0.method0(192); - } - - if (var2 == 2) { // L: 11158 - class0.method0(128); - } - - if (var2 == 3) { // L: 11159 - class0.method0(64); - } - - if (var2 == 4) { // L: 11160 - class0.method0(0); - } - } - - if (var1 == 4) { // L: 11162 - if (var2 == 0) { // L: 11163 - class226.updateSoundEffectVolume(127); - } - - if (var2 == 1) { // L: 11164 - class226.updateSoundEffectVolume(96); - } - - if (var2 == 2) { // L: 11165 - class226.updateSoundEffectVolume(64); - } - - if (var2 == 3) { // L: 11166 - class226.updateSoundEffectVolume(32); - } - - if (var2 == 4) { // L: 11167 - class226.updateSoundEffectVolume(0); - } - } - - if (var1 == 5) { // L: 11169 - Client.leftClickOpensMenu = var2; - } - - if (var1 == 6) { // L: 11170 - Client.chatEffects = var2; - } - - if (var1 == 9) { // L: 11171 - Client.field891 = var2; - } - - if (var1 == 10) { // L: 11172 - if (var2 == 0) { // L: 11173 - NPCComposition.method2882(127); - } - - if (var2 == 1) { // L: 11174 - NPCComposition.method2882(96); - } - - if (var2 == 2) { // L: 11175 - NPCComposition.method2882(64); - } - - if (var2 == 3) { // L: 11176 - NPCComposition.method2882(32); - } - - if (var2 == 4) { // L: 11177 - NPCComposition.method2882(0); - } - } - - if (var1 == 17) { // L: 11179 - Client.followerIndex = var2 & 65535; // L: 11180 - } - - AttackOption[] var3; - if (var1 == 18) { // L: 11182 - var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 11185 - Client.playerAttackOption = (AttackOption)Clock.findEnumerated(var3, var2); // L: 11187 - if (Client.playerAttackOption == null) { // L: 11188 - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var1 == 19) { // L: 11190 - if (var2 == -1) { // L: 11191 - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 11192 - } - } - - if (var1 == 22) { // L: 11194 - var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 11197 - Client.npcAttackOption = (AttackOption)Clock.findEnumerated(var3, var2); // L: 11199 - if (Client.npcAttackOption == null) { // L: 11200 - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } // L: 11202 + } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java new file mode 100644 index 0000000000..dc55c8e263 --- /dev/null +++ b/runescape-client/src/main/java/class65.java @@ -0,0 +1,28 @@ +import java.applet.Applet; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("bl") +public class class65 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", + garbageValue = "127" + ) + public static void method1796(Applet var0, String var1) { + class16.applet = var0; + if (var1 != null) { + class16.field87 = var1; + } + + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "443719012" + ) + public static boolean method1797(int var0) { + return var0 >= WorldMapDecorationType.field3150.id && var0 <= WorldMapDecorationType.field3153.id; + } +} diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java deleted file mode 100644 index 8e2959a8ec..0000000000 --- a/runescape-client/src/main/java/class69.java +++ /dev/null @@ -1,652 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bo") -public class class69 { - @ObfuscatedName("qa") - @ObfuscatedSignature( - descriptor = "Loa;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("d") - public static short[][] field568; - @ObfuscatedName("hj") - @ObfuscatedGetter( - intValue = 370652147 - ) - @Export("cameraPitch") - static int cameraPitch; - - static { - reflectionChecks = new IterableNodeDeque(); // L: 17 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "([BIII)Z", - garbageValue = "-22894005" - ) - static final boolean method1222(byte[] var0, int var1, int var2) { - boolean var3 = true; // L: 138 - Buffer var4 = new Buffer(var0); // L: 139 - int var5 = -1; // L: 140 - - label71: - while (true) { - int var6 = var4.method6628(); // L: 142 - if (var6 == 0) { // L: 143 - return var3; // L: 174 - } - - var5 += var6; // L: 144 - int var7 = 0; // L: 145 - boolean var8 = false; // L: 146 - - while (true) { - int var9; - while (!var8) { // L: 148 - var9 = var4.readUShortSmart(); // L: 154 - if (var9 == 0) { // L: 155 - continue label71; - } - - var7 += var9 - 1; // L: 156 - int var10 = var7 & 63; // L: 157 - int var11 = var7 >> 6 & 63; // L: 158 - int var12 = var4.readUnsignedByte() >> 2; // L: 159 - int var13 = var11 + var1; // L: 160 - int var14 = var10 + var2; // L: 161 - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 162 - ObjectComposition var15 = Tiles.getObjectDefinition(var5); // L: 163 - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 164 - if (!var15.needsModelFiles()) { // L: 165 - ++Client.field742; // L: 166 - var3 = false; // L: 167 - } - - var8 = true; // L: 169 - } - } - } - - var9 = var4.readUShortSmart(); // L: 149 - if (var9 == 0) { // L: 150 - break; - } - - var4.readUnsignedByte(); // L: 151 - } - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" - ) - public static void method1224() { - VarpDefinition.VarpDefinition_cached.clear(); // L: 46 - } // L: 47 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "83" - ) - static void method1208() { - 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("m") - @ObfuscatedSignature( - descriptor = "(Lgp;[Lfl;B)V", - garbageValue = "22" - ) - static final void method1225(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { // L: 461 - for (var3 = 0; var3 < 104; ++var3) { // L: 462 - for (var4 = 0; var4 < 104; ++var4) { // L: 463 - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 464 - var5 = var2; // L: 465 - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 466 - var5 = var2 - 1; - } - - if (var5 >= 0) { // L: 467 - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - } - - Tiles.field1108 += (int)(Math.random() * 5.0D) - 2; // L: 472 - if (Tiles.field1108 < -8) { // L: 473 - Tiles.field1108 = -8; - } - - if (Tiles.field1108 > 8) { // L: 474 - Tiles.field1108 = 8; - } - - Tiles.field1109 += (int)(Math.random() * 5.0D) - 2; // L: 475 - if (Tiles.field1109 < -16) { // L: 476 - Tiles.field1109 = -16; - } - - if (Tiles.field1109 > 16) { // L: 477 - Tiles.field1109 = 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: 478 - byte[][] var42 = class43.field307[var2]; // L: 479 - var9 = (int)Math.sqrt(5100.0D); // L: 485 - var10 = var9 * 768 >> 8; // L: 486 - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { // L: 487 - for (var12 = 1; var12 < 103; ++var12) { // L: 488 - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 489 - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 490 - var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 491 - var16 = (var13 << 8) / var15; // L: 492 - var17 = 65536 / var15; // L: 493 - var18 = (var14 << 8) / var15; // L: 494 - var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; // L: 495 - var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); // L: 496 - NPC.field1328[var12][var11] = var19 - var20; // L: 497 - } - } - - for (var11 = 0; var11 < 104; ++var11) { // L: 500 - class230.Tiles_hue[var11] = 0; // L: 501 - Tiles.Tiles_saturation[var11] = 0; // L: 502 - AbstractByteArrayCopier.Tiles_lightness[var11] = 0; // L: 503 - WorldMapSectionType.Tiles_hueMultiplier[var11] = 0; // L: 504 - Tiles.field1095[var11] = 0; // L: 505 - } - - for (var11 = -5; var11 < 109; ++var11) { // L: 507 - for (var12 = 0; var12 < 104; ++var12) { // L: 508 - var13 = var11 + 5; // L: 509 - int var10002; - if (var13 >= 0 && var13 < 104) { // L: 510 - var14 = AccessFile.field4098[var2][var13][var12] & 255; // L: 511 - if (var14 > 0) { // L: 512 - var16 = var14 - 1; // L: 514 - FloorUnderlayDefinition var44 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 516 - FloorUnderlayDefinition var46; - if (var44 != null) { // L: 517 - var46 = var44; // L: 518 - } else { - byte[] var45 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 521 - var44 = new FloorUnderlayDefinition(); // L: 522 - if (var45 != null) { // L: 523 - var44.decode(new Buffer(var45), var16); - } - - var44.postDecode(); // L: 524 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var44, (long)var16); // L: 525 - var46 = var44; // L: 526 - } - - var10000 = class230.Tiles_hue; // L: 529 - var10000[var12] += var46.hue; - var10000 = Tiles.Tiles_saturation; // L: 530 - var10000[var12] += var46.saturation; - var10000 = AbstractByteArrayCopier.Tiles_lightness; // L: 531 - var10000[var12] += var46.lightness; - var10000 = WorldMapSectionType.Tiles_hueMultiplier; // L: 532 - var10000[var12] += var46.hueMultiplier; - var10002 = Tiles.field1095[var12]++; // L: 533 - } - } - - var14 = var11 - 5; // L: 536 - if (var14 >= 0 && var14 < 104) { // L: 537 - var15 = AccessFile.field4098[var2][var14][var12] & 255; // L: 538 - if (var15 > 0) { // L: 539 - var17 = var15 - 1; // L: 541 - FloorUnderlayDefinition var52 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); // L: 543 - FloorUnderlayDefinition var48; - if (var52 != null) { // L: 544 - var48 = var52; // L: 545 - } else { - byte[] var47 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); // L: 548 - var52 = new FloorUnderlayDefinition(); // L: 549 - if (var47 != null) { // L: 550 - var52.decode(new Buffer(var47), var17); - } - - var52.postDecode(); // L: 551 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var52, (long)var17); // L: 552 - var48 = var52; // L: 553 - } - - var10000 = class230.Tiles_hue; // L: 556 - var10000[var12] -= var48.hue; - var10000 = Tiles.Tiles_saturation; // L: 557 - var10000[var12] -= var48.saturation; - var10000 = AbstractByteArrayCopier.Tiles_lightness; // L: 558 - var10000[var12] -= var48.lightness; - var10000 = WorldMapSectionType.Tiles_hueMultiplier; // L: 559 - var10000[var12] -= var48.hueMultiplier; - var10002 = Tiles.field1095[var12]--; // L: 560 - } - } - } - - if (var11 >= 1 && var11 < 103) { // L: 564 - var12 = 0; // L: 565 - var13 = 0; // L: 566 - var14 = 0; // L: 567 - var15 = 0; // L: 568 - var16 = 0; // L: 569 - - for (var17 = -5; var17 < 109; ++var17) { // L: 570 - var18 = var17 + 5; // L: 571 - if (var18 >= 0 && var18 < 104) { // L: 572 - var12 += class230.Tiles_hue[var18]; // L: 573 - var13 += Tiles.Tiles_saturation[var18]; // L: 574 - var14 += AbstractByteArrayCopier.Tiles_lightness[var18]; // L: 575 - var15 += WorldMapSectionType.Tiles_hueMultiplier[var18]; // L: 576 - var16 += Tiles.field1095[var18]; // L: 577 - } - - var19 = var17 - 5; // L: 579 - if (var19 >= 0 && var19 < 104) { // L: 580 - var12 -= class230.Tiles_hue[var19]; // L: 581 - var13 -= Tiles.Tiles_saturation[var19]; // L: 582 - var14 -= AbstractByteArrayCopier.Tiles_lightness[var19]; // L: 583 - var15 -= WorldMapSectionType.Tiles_hueMultiplier[var19]; // L: 584 - var16 -= Tiles.field1095[var19]; // L: 585 - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 587 588 589 590 - if (var2 < Tiles.Tiles_minPlane) { // L: 593 - Tiles.Tiles_minPlane = var2; - } - - var20 = AccessFile.field4098[var2][var11][var17] & 255; // L: 594 - int var21 = Tiles.field1111[var2][var11][var17] & 255; // L: 595 - if (var20 > 0 || var21 > 0) { // L: 596 - int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 597 - int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 598 - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 599 - int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 600 - int var26 = NPC.field1328[var11][var17]; // L: 601 - int var27 = NPC.field1328[var11 + 1][var17]; // L: 602 - int var28 = NPC.field1328[var11 + 1][var17 + 1]; // L: 603 - int var29 = NPC.field1328[var11][var17 + 1]; // L: 604 - int var30 = -1; // L: 605 - int var31 = -1; // L: 606 - int var32; - int var33; - if (var20 > 0) { // L: 607 - var32 = var12 * 256 / var15; // L: 608 - var33 = var13 / var16; // L: 609 - int var34 = var14 / var16; // L: 610 - var30 = class125.hslToRgb(var32, var33, var34); // L: 611 - var32 = var32 + Tiles.field1108 & 255; // L: 612 - var34 += Tiles.field1109; // L: 613 - if (var34 < 0) { // L: 614 - var34 = 0; - } else if (var34 > 255) { // L: 615 - var34 = 255; - } - - var31 = class125.hslToRgb(var32, var33, var34); // L: 616 - } - - if (var2 > 0) { // L: 618 - boolean var50 = true; // L: 619 - if (var20 == 0 && class22.field186[var2][var11][var17] != 0) { // L: 620 - var50 = false; - } - - if (var21 > 0 && !WorldMapSectionType.method3677(var21 - 1).hideUnderlay) { // L: 621 - var50 = false; - } - - if (var50 && var23 == var22 && var24 == var22 && var22 == var25) { // L: 622 623 - var10000 = Tiles.field1101[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; // L: 626 - if (var31 != -1) { // L: 627 - var32 = Rasterizer3D.Rasterizer3D_colorPalette[class378.method6550(var31, 96)]; - } - - if (var21 == 0) { // L: 628 - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class378.method6550(var30, var26), class378.method6550(var30, var27), class378.method6550(var30, var28), class378.method6550(var30, var29), 0, 0, 0, 0, var32, 0); // L: 629 - } else { - var33 = class22.field186[var2][var11][var17] + 1; // L: 632 - byte var51 = class16.field132[var2][var11][var17]; // L: 633 - FloorOverlayDefinition var35 = WorldMapSectionType.method3677(var21 - 1); // L: 634 - int var36 = var35.texture; // L: 635 - int var37; - int var38; - int var39; - int var40; - if (var36 >= 0) { // L: 638 - var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 639 - var37 = -1; // L: 640 - } else if (var35.primaryRgb == 16711935) { // L: 643 - var37 = -2; // L: 644 - var36 = -1; // L: 645 - var38 = -2; // L: 646 - } else { - var37 = class125.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 649 - var39 = var35.hue + Tiles.field1108 & 255; // L: 650 - var40 = var35.lightness + Tiles.field1109; // L: 651 - if (var40 < 0) { // L: 652 - var40 = 0; - } else if (var40 > 255) { // L: 653 - var40 = 255; - } - - var38 = class125.hslToRgb(var39, var35.saturation, var40); // L: 654 - } - - var39 = 0; // L: 657 - if (var38 != -2) { // L: 658 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapID.method3716(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { // L: 659 - var40 = var35.secondaryHue + Tiles.field1108 & 255; // L: 660 - int var41 = var35.secondaryLightness + Tiles.field1109; // L: 661 - if (var41 < 0) { // L: 662 - var41 = 0; - } else if (var41 > 255) { // L: 663 - var41 = 255; - } - - var38 = class125.hslToRgb(var40, var35.secondarySaturation, var41); // L: 664 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapID.method3716(var38, 96)]; // L: 665 - } - - var0.addTile(var2, var11, var17, var33, var51, var36, var22, var23, var24, var25, class378.method6550(var30, var26), class378.method6550(var30, var27), class378.method6550(var30, var28), class378.method6550(var30, var29), WorldMapID.method3716(var37, var26), WorldMapID.method3716(var37, var27), WorldMapID.method3716(var37, var28), WorldMapID.method3716(var37, var29), var32, var39); // L: 667 - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { // L: 674 - for (var12 = 1; var12 < 103; ++var12) { // L: 675 - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 682 - var17 = 0; // L: 683 - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 686 - var17 = var2 - 1; // L: 687 - } else { - var17 = var2; // L: 690 - } - - var0.setTileMinPlane(var2, var12, var11, var17); // L: 692 - } - } - - AccessFile.field4098[var2] = null; - Tiles.field1111[var2] = null; - class22.field186[var2] = null; - class16.field132[var2] = null; // L: 698 - class43.field307[var2] = null; - } - - var0.method4067(-50, -10, -50); - - for (var2 = 0; var2 < 104; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { // L: 703 - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; - var3 = 2; // L: 708 - var4 = 4; // L: 709 - - for (var5 = 0; var5 < 4; ++var5) { // L: 710 - if (var5 > 0) { // L: 711 - var2 <<= 3; // L: 712 - var3 <<= 3; // L: 713 - var4 <<= 3; // L: 714 - } - - for (int var6 = 0; var6 <= var5; ++var6) { // L: 716 - for (int var7 = 0; var7 <= 104; ++var7) { // L: 717 - for (int var8 = 0; var8 <= 104; ++var8) { // L: 718 - short var49; - if ((Tiles.field1101[var6][var8][var7] & var2) != 0) { // L: 719 - var9 = var7; // L: 720 - var10 = var7; // L: 721 - var11 = var6; // L: 722 - - for (var12 = var6; var9 > 0 && (Tiles.field1101[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 723 724 - } - - while (var10 < 104 && (Tiles.field1101[var6][var8][var10 + 1] & var2) != 0) { // L: 725 - ++var10; - } - - label456: - while (var11 > 0) { // L: 726 - for (var13 = var9; var13 <= var10; ++var13) { // L: 727 - if ((Tiles.field1101[var11 - 1][var8][var13] & var2) == 0) { - break label456; - } - } - - --var11; // L: 728 - } - - label445: - while (var12 < var5) { // L: 730 - for (var13 = var9; var13 <= var10; ++var13) { // L: 731 - if ((Tiles.field1101[var12 + 1][var8][var13] & var2) == 0) { - break label445; - } - } - - ++var12; // L: 732 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 734 - if (var13 >= 8) { // L: 735 - var49 = 240; // L: 736 - var15 = Tiles.Tiles_heights[var12][var8][var9] - var49; // L: 737 - var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 738 - Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 739 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 740 - for (var18 = var9; var18 <= var10; ++var18) { // L: 741 - var10000 = Tiles.field1101[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((Tiles.field1101[var6][var8][var7] & var3) != 0) { // L: 745 - var9 = var8; // L: 746 - var10 = var8; // L: 747 - var11 = var6; // L: 748 - - for (var12 = var6; var9 > 0 && (Tiles.field1101[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 749 750 - } - - while (var10 < 104 && (Tiles.field1101[var6][var10 + 1][var7] & var3) != 0) { // L: 751 - ++var10; - } - - label509: - while (var11 > 0) { // L: 752 - for (var13 = var9; var13 <= var10; ++var13) { // L: 753 - if ((Tiles.field1101[var11 - 1][var13][var7] & var3) == 0) { - break label509; - } - } - - --var11; // L: 754 - } - - label498: - while (var12 < var5) { // L: 756 - for (var13 = var9; var13 <= var10; ++var13) { // L: 757 - if ((Tiles.field1101[var12 + 1][var13][var7] & var3) == 0) { - break label498; - } - } - - ++var12; // L: 758 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 760 - if (var13 >= 8) { // L: 761 - var49 = 240; // L: 762 - var15 = Tiles.Tiles_heights[var12][var9][var7] - var49; // L: 763 - var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 764 - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 765 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 766 - for (var18 = var9; var18 <= var10; ++var18) { // L: 767 - var10000 = Tiles.field1101[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((Tiles.field1101[var6][var8][var7] & var4) != 0) { // L: 771 - var9 = var8; // L: 772 - var10 = var8; // L: 773 - var11 = var7; // L: 774 - - for (var12 = var7; var11 > 0 && (Tiles.field1101[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 775 776 - } - - while (var12 < 104 && (Tiles.field1101[var6][var8][var12 + 1] & var4) != 0) { // L: 777 - ++var12; - } - - label562: - while (var9 > 0) { // L: 778 - for (var13 = var11; var13 <= var12; ++var13) { // L: 779 - if ((Tiles.field1101[var6][var9 - 1][var13] & var4) == 0) { - break label562; - } - } - - --var9; // L: 780 - } - - label551: - while (var10 < 104) { // L: 782 - for (var13 = var11; var13 <= var12; ++var13) { // L: 783 - if ((Tiles.field1101[var6][var10 + 1][var13] & var4) == 0) { - break label551; - } - } - - ++var10; // L: 784 - } - - if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 786 - var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 787 - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 788 - - for (var14 = var9; var14 <= var10; ++var14) { // L: 789 - for (var15 = var11; var15 <= var12; ++var15) { // L: 790 - var10000 = Tiles.field1101[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - - } // L: 798 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "457904488" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 693 - Login.Login_response2 = "Enter your username/email & password."; // L: 694 - Login.Login_response3 = ""; // L: 695 - Login.loginIndex = 2; // L: 696 - if (var0) { // L: 697 - Login.Login_password = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 699 - if (class4.clientPreferences.rememberedUsername != null) { // L: 700 - Login.Login_username = class4.clientPreferences.rememberedUsername; // L: 701 - Client.Login_isUsernameRemembered = true; // L: 702 - } else { - Client.Login_isUsernameRemembered = false; // L: 704 - } - } - - GameObject.method4433(); // L: 706 - } // L: 707 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IB)Lgi;", - garbageValue = "42" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 - if (var1 != null) { // L: 182 - return var1; - } else { - var1 = class15.method240(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 183 - if (var1 != null) { // L: 184 - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } - - return var1; // L: 185 - } - } -} diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index a890d66ee4..6f531b8790 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,204 +1,186 @@ +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("r") -public class class7 extends class16 { - @ObfuscatedName("gz") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("f") - String field52; - @ObfuscatedName("e") - byte field55; - @ObfuscatedName("v") - byte field53; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ls;" +@ObfuscatedName("f") +public class class7 { + @ObfuscatedName("r") + public static short[] field25; + @ObfuscatedName("gr") + @ObfuscatedGetter( + intValue = 1371164037 ) - final class19 this$0; + static int field26; + @ObfuscatedName("s") + ExecutorService field21; + @ObfuscatedName("t") + Future field23; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lnv;" + ) + final Buffer field22; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lj;" + ) + final class3 field24; @ObfuscatedSignature( - descriptor = "(Ls;)V" + descriptor = "(Lnv;Lj;)V" ) - class7(class19 var1) { - this.this$0 = var1; // L: 154 + public class7(Buffer var1, class3 var2) { + this.field21 = Executors.newSingleThreadExecutor(); + this.field22 = var1; + this.field24 = var2; + this.method48(); } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "851460888" + descriptor = "(B)Z", + garbageValue = "-112" ) - void vmethod331(Buffer var1) { - this.field52 = var1.readStringCp1252NullTerminatedOrNull(); // L: 157 - if (this.field52 != null) { // L: 158 - var1.readUnsignedByte(); // L: 159 - this.field55 = var1.readByte(); // L: 160 - this.field53 = var1.readByte(); // L: 161 - } + public boolean method46() { + return this.field23.isDone(); + } - } // L: 163 - - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ly;I)V", - garbageValue = "-1362614343" + descriptor = "(I)V", + garbageValue = "2123329941" ) - void vmethod332(ClanChannel var1) { - var1.name = this.field52; // L: 166 - if (this.field52 != null) { // L: 167 - var1.field27 = this.field55; // L: 168 - var1.field28 = this.field53; // L: 169 - } + public void method49() { + this.field21.shutdown(); + this.field21 = null; + } - } // L: 171 - - @ObfuscatedName("f") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lns;I)V", - garbageValue = "653378140" + descriptor = "(B)Lnv;", + garbageValue = "-7" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = class262.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 - class15.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - WorldMapSprite.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - SoundSystem.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1362[var1] != null) { // L: 50 - var2.read(Players.field1362[var1]); + public Buffer method57() { + try { + return (Buffer)this.field23.get(); + } catch (Exception var2) { + return null; } + } - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1372[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-72" + ) + void method48() { + this.field23 = this.field21.submit(new class1(this, this.field22, this.field24)); + } - 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.field1372[var7] = 0; // L: 65 + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;Ljy;IZS)Lga;", + garbageValue = "192" + ) + public static Frames method59(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; + int[] var5 = var0.getGroupFileIds(var2); + + for (int var6 = 0; var6 < var5.length; ++var6) { + byte[] var7 = var0.getFile(var2, var5[var6]); + if (var7 == null) { + var4 = false; + } else { + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; + byte[] var9; + if (var3) { + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); + } + + if (var9 == null) { + var4 = false; + } } } - var0.exportIndex(); // L: 67 - } // L: 68 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "609615234" - ) - static int method88(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 432 - return MouseHandler.method718(var0, var1, var2); - } else if (var0 < 1100) { // L: 433 - return Client.method1745(var0, var1, var2); - } else if (var0 < 1200) { // L: 434 - return InvDefinition.method2699(var0, var1, var2); - } else if (var0 < 1300) { // L: 435 - return BufferedSink.method5990(var0, var1, var2); - } else if (var0 < 1400) { // L: 436 - return ObjectSound.method1889(var0, var1, var2); - } else if (var0 < 1500) { // L: 437 - return Renderable.method4250(var0, var1, var2); - } else if (var0 < 1600) { // L: 438 - return TaskHandler.method2626(var0, var1, var2); - } else if (var0 < 1700) { // L: 439 - return ClanChannelMember.method106(var0, var1, var2); - } else if (var0 < 1800) { // L: 440 - return Decimator.method1162(var0, var1, var2); - } else if (var0 < 1900) { // L: 441 - return WorldMapRegion.method3472(var0, var1, var2); - } else if (var0 < 2000) { // L: 442 - return WorldMapLabel.method3715(var0, var1, var2); - } else if (var0 < 2100) { // L: 443 - return Client.method1745(var0, var1, var2); - } else if (var0 < 2200) { // L: 444 - return InvDefinition.method2699(var0, var1, var2); - } else if (var0 < 2300) { // L: 445 - return BufferedSink.method5990(var0, var1, var2); - } else if (var0 < 2400) { // L: 446 - return ObjectSound.method1889(var0, var1, var2); - } else if (var0 < 2500) { - return Renderable.method4250(var0, var1, var2); // L: 447 - } else if (var0 < 2600) { // L: 448 - return NetCache.method5178(var0, var1, var2); - } else if (var0 < 2700) { // L: 449 - return Player.method2235(var0, var1, var2); - } else if (var0 < 2800) { // L: 450 - return MouseHandler.method747(var0, var1, var2); - } else if (var0 < 2900) { // L: 451 - return StructComposition.method2972(var0, var1, var2); - } else if (var0 < 3000) { // L: 452 - return WorldMapLabel.method3715(var0, var1, var2); - } else if (var0 < 3200) { // L: 453 - return class82.method2031(var0, var1, var2); - } else if (var0 < 3300) { // L: 454 - return StudioGame.method4983(var0, var1, var2); - } else if (var0 < 3400) { // L: 455 - return class267.method4991(var0, var1, var2); - } else if (var0 < 3500) { // L: 456 - return class18.method262(var0, var1, var2); - } else if (var0 < 3600) { // L: 457 - return MilliClock.method2685(var0, var1, var2); - } else if (var0 < 3700) { // L: 458 - return LoginScreenAnimation.method2314(var0, var1, var2); - } else if (var0 < 3800) { // L: 459 - return WorldMapData_0.method3267(var0, var1, var2); - } else if (var0 < 3900) { // L: 460 - return class32.method386(var0, var1, var2); - } else if (var0 < 4000) { // L: 461 - return class281.method5204(var0, var1, var2); - } else if (var0 < 4100) { // L: 462 - return NPCComposition.method2857(var0, var1, var2); - } else if (var0 < 4200) { - return SoundCache.method929(var0, var1, var2); // L: 463 - } else if (var0 < 4300) { // L: 464 - return class375.method6531(var0, var1, var2); - } else if (var0 < 5100) { // L: 465 - return class25.method336(var0, var1, var2); - } else if (var0 < 5400) { // L: 466 - return WorldMapSectionType.method3668(var0, var1, var2); - } else if (var0 < 5600) { // L: 467 - return LoginScreenAnimation.method2285(var0, var1, var2); - } else if (var0 < 5700) { // L: 468 - return UserComparator6.method2585(var0, var1, var2); - } else if (var0 < 6300) { // L: 469 - return class19.method276(var0, var1, var2); - } else if (var0 < 6600) { // L: 470 - return class8.method102(var0, var1, var2); - } else if (var0 < 6700) { // L: 471 - return ModeWhere.method5283(var0, var1, var2); - } else if (var0 < 6800) { // L: 472 - return class43.method527(var0, var1, var2); - } else if (var0 < 6900) { // L: 473 - return class5.method72(var0, var1, var2); - } else if (var0 < 7000) { // L: 474 - return UserComparator4.method2529(var0, var1, var2); - } else if (var0 < 7100) { // L: 475 - return class269.method4996(var0, var1, var2); - } else if (var0 < 7200) { // L: 476 - return WorldMapScaleHandler.method3857(var0, var1, var2); + if (!var4) { + return null; } else { - return var0 < 7300 ? PcmPlayer.method898(var0, var1, var2) : 2; // L: 477 478 + try { + return new Frames(var0, var1, var2, var3); + } catch (Exception var11) { + return null; + } } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Lbd;", + garbageValue = "-1744482328" + ) + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ApproximateRouteStrategy.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = ModelData0.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; + } + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "768578281" + ) + public static void method58() { + ObjectComposition.ObjectDefinition_cached.clear(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + ObjectComposition.ObjectDefinition_cachedEntities.clear(); + ObjectComposition.ObjectDefinition_cachedModels.clear(); + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1029296295" + ) + static int method52(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { + if (var0 == 3702) { + ++Interpreter.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + --Interpreter.Interpreter_intStackSize; + --class1.Interpreter_stringStackSize; + return 1; + } + } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "171958052" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + PcmPlayer.insertMenuItem(var0, var1, var2, var3, var4, var5, false); + } } diff --git a/runescape-client/src/main/java/class74.java b/runescape-client/src/main/java/class74.java new file mode 100644 index 0000000000..199b36329e --- /dev/null +++ b/runescape-client/src/main/java/class74.java @@ -0,0 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("bc") +public class class74 { + @ObfuscatedName("dt") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("archive7") + static Archive archive7; + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1839707812" + ) + static final boolean method1931(int var0) { + if (var0 < 0) { + return false; + } else { + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; + } + } +} diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java new file mode 100644 index 0000000000..e556d44449 --- /dev/null +++ b/runescape-client/src/main/java/class78.java @@ -0,0 +1,446 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("cb") +public class class78 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;I)V", + garbageValue = "-1717216781" + ) + public static void method1969(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lbq;III)V", + garbageValue = "-583175576" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; + Script var4; + int var20; + if (class216.isWorldMapEvent(var0.type)) { + BufferedNetSocket.worldMapEvent = (WorldMapEvent)var3[0]; + WorldMapElement var5 = HealthBarUpdate.WorldMapElement_get(BufferedNetSocket.worldMapEvent.mapElement); + var4 = WorldMapRegion.getWorldMapScript(var0.type, var5.objectId, var5.category); + } else { + var20 = (Integer)var3[0]; + var4 = class7.getScript(var20); + } + + if (var4 != null) { + Interpreter.Interpreter_intStackSize = 0; + class1.Interpreter_stringStackSize = 0; + var20 = -1; + int[] var6 = var4.opcodes; + int[] var7 = var4.intOperands; + byte var8 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field752 = false; + boolean var9 = false; + int var10 = 0; + boolean var30 = false; + + label988: { + label989: { + try { + int var13; + try { + var30 = true; + AbstractUserComparator.Interpreter_intLocals = new int[var4.localIntCount]; + int var11 = 0; + Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; + int var12 = 0; + + int var14; + String var21; + for (var13 = 1; var13 < var3.length; ++var13) { + if (var3[var13] instanceof Integer) { + var14 = (Integer)var3[var13]; + if (var14 == -2147483647) { + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { + var14 = var0.widget != null ? var0.widget.id * -1996852661 * 611927907 : -1; + } + + if (var14 == -2147483644) { + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { + var14 = var0.widget != null ? var0.widget.childIndex * -1948690547 * 1667744581 : -1; + } + + if (var14 == -2147483642) { + var14 = var0.dragTarget != null ? var0.dragTarget.id * -1996852661 * 611927907 : -1; + } + + if (var14 == -2147483641) { + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1948690547 * 1667744581 : -1; + } + + if (var14 == -2147483640) { + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { + var14 = var0.keyPressed; + } + + AbstractUserComparator.Interpreter_intLocals[var11++] = var14; + } else if (var3[var13] instanceof String) { + var21 = (String)var3[var13]; + if (var21.equals("event_opbase")) { + var21 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var21; + } + } + + Interpreter.field742 = var0.field961; + + while (true) { + ++var10; + if (var10 > var1) { + throw new RuntimeException(); + } + + ++var20; + int var33 = var6[var20]; + if (var33 >= 100) { + boolean var35; + if (var4.intOperands[var20] == 1) { + var35 = true; + } else { + var35 = false; + } + + var14 = class79.method1977(var33, var4, var35); + switch(var14) { + case 0: + var30 = false; + break label989; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var33 == ScriptOpcodes.ICONST) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7[var20]; + } else if (var33 == ScriptOpcodes.GET_VARP) { + var13 = var7[var20]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; + } else if (var33 == ScriptOpcodes.SET_VARP) { + var13 = var7[var20]; + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ApproximateRouteStrategy.changeGameOptions(var13); + } else if (var33 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; + } else if (var33 == ScriptOpcodes.JUMP) { + var20 += var7[var20]; + } else if (var33 == ScriptOpcodes.IF_ICMPNE) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.RETURN) { + if (Interpreter.Interpreter_frameDepth == 0) { + var30 = false; + break; + } + + ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var4 = var40.script; + var6 = var4.opcodes; + var7 = var4.intOperands; + var20 = var40.pc; + AbstractUserComparator.Interpreter_intLocals = var40.intLocals; + Interpreter.Interpreter_stringLocals = var40.stringLocals; + } else if (var33 == ScriptOpcodes.GET_VARBIT) { + var13 = var7[var20]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getVarbit(var13); + } else if (var33 == ScriptOpcodes.SET_VARBIT) { + var13 = var7[var20]; + class100.method2227(var13, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractUserComparator.Interpreter_intLocals[var7[var20]]; + } else if (var33 == ScriptOpcodes.ISTORE) { + AbstractUserComparator.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + } else if (var33 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var20]]; + } else if (var33 == ScriptOpcodes.SSTORE) { + Interpreter.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; + } else if (var33 == ScriptOpcodes.JOIN_STRING) { + var13 = var7[var20]; + class1.Interpreter_stringStackSize -= var13; + var21 = class181.method3651(Interpreter.Interpreter_stringStack, class1.Interpreter_stringStackSize, var13); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var21; + } else if (var33 == ScriptOpcodes.POP_INT) { + --Interpreter.Interpreter_intStackSize; + } else if (var33 == ScriptOpcodes.POP_STRING) { + --class1.Interpreter_stringStackSize; + } else { + int var17; + if (var33 != ScriptOpcodes.INVOKE) { + if (var33 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.varcs.getInt(var7[var20]); + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { + Decimator.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { + var13 = var7[var20] >> 16; + var14 = var7[var20] & 65535; + int var24 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var24 < 0 || var24 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var13] = var24; + byte var25 = -1; + if (var14 == 105) { + var25 = 0; + } + + for (var17 = 0; var17 < var24; ++var17) { + Interpreter.Interpreter_arrays[var13][var17] = var25; + } + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { + var13 = var7[var20]; + var14 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { + var13 = var7[var20]; + Interpreter.Interpreter_intStackSize -= 2; + var14 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + } else { + String var22; + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var22 = Decimator.varcs.getStringOld(var7[var20]); + if (var22 == null) { + var22 = "null"; + } + + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var22; + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { + Decimator.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { + var22 = Decimator.varcs.getString(var7[var20]); + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var22; + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { + Decimator.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); + } else if (var33 == ScriptOpcodes.SWITCH) { + IterableNodeHashTable var38 = var4.switches[var7[var20]]; + IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var37 != null) { + var20 += var37.integer; + } + } else { + Integer var39; + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { + var39 = SpotAnimationDefinition.field1668.getTitleGroupValue(var7[var20]); + if (var39 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var39; + } + } else { + if (var33 != ScriptOpcodes.GET_VARCLAN) { + throw new IllegalStateException(); + } + + var39 = ScriptFrame.field371.method6059(var7[var20]); + if (var39 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var39; + } + } + } + } + } else { + var13 = var7[var20]; + Script var36 = class7.getScript(var13); + int[] var15 = new int[var36.localIntCount]; + String[] var16 = new String[var36.localStringCount]; + + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { + var15[var17] = Interpreter.Interpreter_intStack[var17 + (Interpreter.Interpreter_intStackSize - var36.intArgumentCount)]; + } + + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class1.Interpreter_stringStackSize - var36.stringArgumentCount)]; + } + + Interpreter.Interpreter_intStackSize -= var36.intArgumentCount; + class1.Interpreter_stringStackSize -= var36.stringArgumentCount; + ScriptFrame var23 = new ScriptFrame(); + var23.script = var4; + var23.pc = var20; + var23.intLocals = AbstractUserComparator.Interpreter_intLocals; + var23.stringLocals = Interpreter.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; + var4 = var36; + var6 = var36.opcodes; + var7 = var36.intOperands; + var20 = -1; + AbstractUserComparator.Interpreter_intLocals = var15; + Interpreter.Interpreter_stringLocals = var16; + } + } + } + } catch (Exception var31) { + var9 = true; + StringBuilder var27 = new StringBuilder(30); + var27.append("").append(var4.key).append(" "); + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { + var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var27.append("").append(var8); + BufferedSink.RunException_sendStackTrace(var27.toString(), var31); + var30 = false; + break label988; + } + } finally { + if (var30) { + if (Interpreter.field752) { + Interpreter.field740 = true; + } + + while (Interpreter.field754.size() > 0) { + class79 var19 = (class79)Interpreter.field754.remove(0); + class183.widgetDefaultMenuAction(var19.method1989(), var19.method1976(), var19.method1980(), var19.method1983(), ""); + } + + if (Interpreter.field740) { + PcmPlayer.method506(); + Interpreter.field740 = false; + Interpreter.field752 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + + if (Interpreter.field752) { + Interpreter.field740 = true; + } + + while (Interpreter.field754.size() > 0) { + class79 var41 = (class79)Interpreter.field754.remove(0); + class183.widgetDefaultMenuAction(var41.method1989(), var41.method1976(), var41.method1980(), var41.method1983(), ""); + } + + if (Interpreter.field740) { + PcmPlayer.method506(); + Interpreter.field740 = false; + Interpreter.field752 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; + } + + if (Interpreter.field752) { + Interpreter.field740 = true; + } + + while (Interpreter.field754.size() > 0) { + class79 var34 = (class79)Interpreter.field754.remove(0); + class183.widgetDefaultMenuAction(var34.method1989(), var34.method1976(), var34.method1980(), var34.method1983(), ""); + } + + if (Interpreter.field740) { + PcmPlayer.method506(); + Interpreter.field740 = false; + Interpreter.field752 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; + } + + if (Interpreter.field752) { + Interpreter.field740 = true; + } + + while (Interpreter.field754.size() > 0) { + class79 var26 = (class79)Interpreter.field754.remove(0); + class183.widgetDefaultMenuAction(var26.method1989(), var26.method1976(), var26.method1980(), var26.method1983(), ""); + } + + if (Interpreter.field740) { + PcmPlayer.method506(); + Interpreter.field740 = false; + Interpreter.field752 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + + @ObfuscatedName("f") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); + } +} diff --git a/runescape-client/src/main/java/class79.java b/runescape-client/src/main/java/class79.java new file mode 100644 index 0000000000..0bf3fbfabd --- /dev/null +++ b/runescape-client/src/main/java/class79.java @@ -0,0 +1,213 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cl") +public class class79 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -169818247 + ) + int field1147; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 219249737 + ) + int field1149; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -182694261 + ) + int field1148; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1052969373 + ) + int field1146; + + class79(int var1, int var2, int var3, int var4) { + this.field1147 = var1; + this.field1149 = var2; + this.field1148 = var3; + this.field1146 = var4; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "46" + ) + int method1989() { + return this.field1147; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1303151140" + ) + int method1976() { + return this.field1149; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "111" + ) + int method1980() { + return this.field1148; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "641578821" + ) + int method1983() { + return this.field1146; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lnu;II)V", + garbageValue = "1868470928" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + Tiles.method1747(var0); + + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + int var4 = Players.Players_pendingUpdateIndices[var3]; + Player var5 = Client.players[var4]; + int var6 = var0.readUnsignedByte(); + if ((var6 & 32) != 0) { + var6 += var0.readUnsignedByte() << 8; + } + + WorldMapSection2.method3289(var0, var4, var5, var6); + } + + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "1" + ) + static int method1977(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return class255.method4875(var0, var1, var2); + } else if (var0 < 1100) { + return ModeWhere.method5243(var0, var1, var2); + } else if (var0 < 1200) { + return Varcs.method2037(var0, var1, var2); + } else if (var0 < 1300) { + return ItemContainer.method1785(var0, var1, var2); + } else if (var0 < 1400) { + return FontName.method6376(var0, var1, var2); + } else if (var0 < 1500) { + return InvDefinition.method2691(var0, var1, var2); + } else if (var0 < 1600) { + return AttackOption.method1994(var0, var1, var2); + } else if (var0 < 1700) { + return class6.method38(var0, var1, var2); + } else if (var0 < 1800) { + return class267.method4924(var0, var1, var2); + } else if (var0 < 1900) { + return WallDecoration.method4337(var0, var1, var2); + } else if (var0 < 2000) { + return GameObject.method4341(var0, var1, var2); + } else if (var0 < 2100) { + return ModeWhere.method5243(var0, var1, var2); + } else if (var0 < 2200) { + return Varcs.method2037(var0, var1, var2); + } else if (var0 < 2300) { + return ItemContainer.method1785(var0, var1, var2); + } else if (var0 < 2400) { + return FontName.method6376(var0, var1, var2); + } else if (var0 < 2500) { + return InvDefinition.method2691(var0, var1, var2); + } else if (var0 < 2600) { + return NPCComposition.method2841(var0, var1, var2); + } else if (var0 < 2700) { + return ArchiveDiskAction.method4944(var0, var1, var2); + } else if (var0 < 2800) { + return Buddy.method5914(var0, var1, var2); + } else if (var0 < 2900) { + return FontName.method6375(var0, var1, var2); + } else if (var0 < 3000) { + return GameObject.method4341(var0, var1, var2); + } else if (var0 < 3200) { + return Actor.method1887(var0, var1, var2); + } else if (var0 < 3300) { + return class122.method2507(var0, var1, var2); + } else if (var0 < 3400) { + return Canvas.method124(var0, var1, var2); + } else if (var0 < 3500) { + return PlayerComposition.method4755(var0, var1, var2); + } else if (var0 < 3600) { + return HealthBarDefinition.method2798(var0, var1, var2); + } else if (var0 < 3700) { + return GrandExchangeEvent.method5148(var0, var1, var2); + } else if (var0 < 3800) { + return class7.method52(var0, var1, var2); + } else if (var0 < 3900) { + return class98.method2207(var0, var1, var2); + } else if (var0 < 4000) { + return SequenceDefinition.method3165(var0, var1, var2); + } else if (var0 < 4100) { + return class234.method4463(var0, var1, var2); + } else if (var0 < 4200) { + return class119.method2472(var0, var1, var2); + } else if (var0 < 4300) { + return SceneTilePaint.method4323(var0, var1, var2); + } else if (var0 < 5100) { + return class125.method2550(var0, var1, var2); + } else if (var0 < 5400) { + return World.method1404(var0, var1, var2); + } else if (var0 < 5600) { + return Fonts.method6367(var0, var1, var2); + } else if (var0 < 5700) { + return MenuAction.method1656(var0, var1, var2); + } else if (var0 < 6300) { + return ItemComposition.method3095(var0, var1, var2); + } else if (var0 < 6600) { + return World.method1420(var0, var1, var2); + } else if (var0 < 6700) { + return WorldMapSection2.method3276(var0, var1, var2); + } else if (var0 < 6800) { + return class110.method2324(var0, var1, var2); + } else if (var0 < 6900) { + return GraphicsDefaults.method6024(var0, var1, var2); + } else if (var0 < 7000) { + return MouseRecorder.method1811(var0, var1, var2); + } else if (var0 < 7100) { + return FileSystem.method2621(var0, var1, var2); + } else if (var0 < 7200) { + return WorldMapRectangle.method3645(var0, var1, var2); + } else { + return var0 < 7300 ? WorldMapData_0.method3227(var0, var1, var2) : 2; + } + } + + @ObfuscatedName("n") + public static int method1990(long var0) { + return (int)(var0 >>> 7 & 127L); + } + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "796044449" + ) + static boolean method1979() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + } +} diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 62c205aa2c..db7c3b5ef0 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,351 +1,35 @@ -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("h") -public class class8 extends class14 { - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = 2367979421742745425L - ) - long field59; - @ObfuscatedName("e") - String field60; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lv;" - ) - final class2 this$0; - - @ObfuscatedSignature( - descriptor = "(Lv;)V" - ) - class8(class2 var1) { - this.this$0 = var1; - this.field59 = -1L; // L: 74 - this.field60 = null; // L: 75 - } // L: 77 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "73833784" - ) - void vmethod363(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 80 - --var1.offset; // L: 81 - this.field59 = var1.readLong(); - } - - this.field60 = var1.readStringCp1252NullTerminatedOrNull(); - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lb;I)V", - garbageValue = "1885623446" - ) - void vmethod354(ClanSettings var1) { - var1.method126(this.field59, this.field60, 0); - } +@ObfuscatedName("o") +public class class8 { + @ObfuscatedName("s") + final int field28; + @ObfuscatedName("t") + final int field27; @ObfuscatedName("v") + final String field29; + @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-128382641" + descriptor = "(Lnv;)V" ) - public static int method104(int var0) { - return var0 >> 17 & 7; // L: 17 + class8(Buffer var1) { + this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "1957308272" - ) - static int method105(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 84 - boolean var3 = false; // L: 85 - boolean var4 = false; // L: 86 - int var5 = 0; // L: 87 - int var6 = var0.length(); // L: 88 - - for (int var7 = 0; var7 < var6; ++var7) { // L: 89 - char var8 = var0.charAt(var7); // L: 90 - if (var7 == 0) { // L: 91 - if (var8 == '-') { // L: 92 - var3 = true; // L: 93 - continue; - } - - if (var8 == '+') { // L: 96 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 98 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 99 - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { // L: 100 - throw new NumberFormatException(); // L: 101 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 102 - throw new NumberFormatException(); - } - - if (var3) { // L: 103 - var10 = -var10; - } - - int var9 = var10 + var5 * var1; // L: 104 - if (var9 / var1 != var5) { // L: 105 - throw new NumberFormatException(); - } - - var5 = var9; // L: 106 - var4 = true; // L: 107 - } - - if (!var4) { // L: 109 - throw new NumberFormatException(); - } else { - return var5; // L: 110 - } - } else { - throw new IllegalArgumentException("" + var1); - } + class8(int var1, int var2, String var3) { + this.field28 = var1; + this.field27 = var2; + this.field29 = var3; } - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-39" - ) - static final boolean method103() { - return ViewportMouse.ViewportMouse_isInViewport; // L: 82 + @ObfuscatedName("s") + String method61() { + return Integer.toHexString(this.field28) + Integer.toHexString(this.field27) + this.field29; } - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILcf;ZI)I", - garbageValue = "1054679248" - ) - static int method102(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3643 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = FaceNormal.loadWorlds() ? 1 : 0; // L: 3644 - return 1; // L: 3645 - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3647 - var9 = DevicePcmPlayerProvider.worldListStart(); // L: 3648 - if (var9 != null) { // L: 3649 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.id; // L: 3650 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.properties; // L: 3651 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3652 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.location; // L: 3653 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.population; // L: 3654 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.host; // L: 3655 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3658 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3659 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3660 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3661 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3662 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3663 - } - - return 1; // L: 3665 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3667 - var9 = Client.getNextWorldListWorld(); // L: 3668 - if (var9 != null) { // L: 3669 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.id; // L: 3670 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.properties; // L: 3671 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3672 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.location; // L: 3673 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.population; // L: 3674 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.host; // L: 3675 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3678 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3679 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3680 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3681 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3682 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3683 - } - - return 1; // L: 3685 - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3687 - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3688 - var7 = null; // L: 3689 - - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3690 - if (var3 == World.World_worlds[var8].id) { // L: 3691 - var7 = World.World_worlds[var8]; // L: 3692 - break; - } - } - - if (var7 != null) { // L: 3696 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.id; // L: 3697 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.properties; // L: 3698 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.activity; // L: 3699 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.location; // L: 3700 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.population; // L: 3701 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.host; // L: 3702 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3705 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3706 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3707 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3708 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3709 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3710 - } - - return 1; // L: 3712 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3714 - ChatChannel.Interpreter_intStackSize -= 4; // L: 3715 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3716 - boolean var10 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 3717 - var8 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 3718 - boolean var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3] == 1; // L: 3719 - WorldMapSectionType.sortWorldList(var3, var10, var8, var6); // L: 3720 - return 1; // L: 3721 - } else if (var0 != 6511) { // L: 3723 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3744 - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 3745 - return 1; // L: 3746 - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3748 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3749 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3750 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3751 - var5 = UserComparator10.getParamDefinition(var4); // L: 3752 - if (var5.isString()) { // L: 3753 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class248.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3754 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class248.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3757 - } - - return 1; // L: 3759 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3761 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3762 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3763 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3764 - var5 = UserComparator10.getParamDefinition(var4); // L: 3765 - if (var5.isString()) { // L: 3766 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = Tiles.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3767 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Tiles.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3770 - } - - return 1; // L: 3772 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3774 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3775 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3776 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3777 - var5 = UserComparator10.getParamDefinition(var4); // L: 3778 - if (var5.isString()) { // L: 3779 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class250.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3780 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3783 - } - - return 1; // L: 3785 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3787 - ChatChannel.Interpreter_intStackSize -= 2; // L: 3788 - var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3789 - var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3790 - var5 = UserComparator10.getParamDefinition(var4); // L: 3791 - if (var5.isString()) { // L: 3792 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = UserComparator10.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3793 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = UserComparator10.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3796 - } - - return 1; // L: 3798 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3800 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3801 - return 1; // L: 3802 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3804 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3805 - return 1; // L: 3806 - } else if (var0 == 6520) { // L: 3808 - return 1; // L: 3809 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3811 - return 1; // L: 3812 - } else if (var0 == 6522) { // L: 3814 - --UserComparator9.Interpreter_stringStackSize; // L: 3815 - --ChatChannel.Interpreter_intStackSize; // L: 3816 - return 1; // L: 3817 - } else if (var0 == 6523) { // L: 3819 - --UserComparator9.Interpreter_stringStackSize; // L: 3820 - --ChatChannel.Interpreter_intStackSize; // L: 3821 - return 1; // L: 3822 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 3824 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3825 - return 1; // L: 3826 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 3828 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 3829 - return 1; // L: 3830 - } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 3832 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 3833 - return 1; // L: 3834 - } else if (var0 == 6527) { // L: 3836 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.field625; // L: 3837 - return 1; // L: 3838 - } else { - return 2; // L: 3840 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3724 - if (var3 >= 0 && var3 < World.World_count) { // L: 3725 - var7 = World.World_worlds[var3]; // L: 3726 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.id; // L: 3727 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.properties; // L: 3728 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.activity; // L: 3729 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.location; // L: 3730 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.population; // L: 3731 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.host; // L: 3732 - } else { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3735 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3736 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3737 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3738 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3739 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3740 - } - - return 1; // L: 3742 - } - } - } + @ObfuscatedName("t") + int method67() { + return this.field27; } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1771393574" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (class20.loadInterface(var0)) { // L: 10864 - JagexCache.runComponentCloseListeners(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], var1); // L: 10865 - } - } // L: 10866 } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java deleted file mode 100644 index a18bac9861..0000000000 --- a/runescape-client/src/main/java/class80.java +++ /dev/null @@ -1,73 +0,0 @@ -import java.math.BigInteger; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cq") -public class class80 { - @ObfuscatedName("tl") - @ObfuscatedSignature( - descriptor = "Lme;" - ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("j") - static final BigInteger field983; - @ObfuscatedName("o") - static final BigInteger field984; - - static { - field983 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field984 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); - } - - @ObfuscatedName("f") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 - if (0L == var0 % 37L) { // L: 17 - return null; - } else { - int var2 = 0; // L: 18 - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 19 20 22 - ++var2; // L: 21 - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 24 25 34 - long var6 = var0; // L: 26 - var0 /= 37L; // L: 27 - var8 = class306.base37Table[(int)(var6 - 37L * var0)]; // L: 28 - if (var8 == '_') { // L: 29 - int var9 = var5.length() - 1; // L: 30 - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31 - var8 = 160; // L: 32 - } - } - - var5.reverse(); // L: 36 - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37 - return var5.toString(); // L: 38 - } - } else { - return null; - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "133291597" - ) - @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 { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 84 85 - } - } -} diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java deleted file mode 100644 index 9875feff82..0000000000 --- a/runescape-client/src/main/java/class82.java +++ /dev/null @@ -1,397 +0,0 @@ -import java.math.BigInteger; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("cc") -public class class82 { - @ObfuscatedName("f") - static final BigInteger field1000; - @ObfuscatedName("e") - static final BigInteger field996; - @ObfuscatedName("bw") - @ObfuscatedGetter( - intValue = -1114873797 - ) - static int field999; - - static { - field1000 = new BigInteger("10001", 16); // L: 6 - field996 = new BigInteger("8dc6a1a83bbb640252f3f8edaa19da8f7ef11de714d12d808467f1e9d80d457a089db79c00e6a7fd1a413a29a10b5e31f3f81b773f9d3de5b509aa3b4c6aae73b449122c91af25cff56ecc0f2c688f36a0fea3a8856adec0b7e11b2ecacc1f766e1e89462aa2839db7c7d469e5816d2ef676ec87a7e70f3fdb76b0f86d9f34a7", 16); // L: 7 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILcf;ZB)I", - garbageValue = "0" - ) - static int method2031(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1411 - var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1412 - UserComparator10.addGameMessage(0, "", var7); // L: 1413 - return 1; // L: 1414 - } else if (var0 == ScriptOpcodes.ANIM) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1417 - World.performPlayerAnimation(class262.localPlayer, Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 1418 - return 1; // L: 1419 - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field951) { // L: 1422 - Interpreter.field963 = true; // L: 1423 - } - - return 1; // L: 1425 - } else { - int var16; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1428 - var16 = 0; // L: 1429 - if (Varps.isNumber(var7)) { // L: 1430 - var16 = FontName.method6335(var7); - } - - PacketBufferNode var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); // L: 1432 - var14.packetBuffer.writeInt(var16); // L: 1433 - Client.packetWriter.addNode(var14); // L: 1434 - return 1; // L: 1435 - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1438 - var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); // L: 1440 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1441 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1442 - Client.packetWriter.addNode(var12); // L: 1443 - return 1; // L: 1444 - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1447 - var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); // L: 1449 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1450 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1451 - Client.packetWriter.addNode(var12); // L: 1452 - return 1; // L: 1453 - } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1456 - var4 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1457 - FriendsList.method5711(var10, var4); // L: 1458 - return 1; // L: 1459 - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - ChatChannel.Interpreter_intStackSize -= 3; // L: 1462 - var10 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1463 - var16 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1464 - int var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 1465 - Widget var15 = WorldMapData_1.getWidget(var9); // L: 1466 - ItemLayer.clickWidget(var15, var10, var16); // L: 1467 - return 1; // L: 1468 - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1471 - var10 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1472 - var16 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1473 - Widget var13 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1474 - ItemLayer.clickWidget(var13, var10, var16); // L: 1475 - return 1; // L: 1476 - } else if (var0 == ScriptOpcodes.MOUSECAM) { - UserComparator3.mouseCam = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1479 - return 1; // L: 1480 - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.roofsHidden ? 1 : 0; // L: 1483 - return 1; // L: 1484 - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - class4.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1487 - Actor.savePreferences(); // L: 1488 - return 1; // L: 1489 - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1492 - boolean var8 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1493 - AttackOption.openURL(var7, var8, false); // L: 1494 - return 1; // L: 1495 - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1498 - var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher); // L: 1500 - var12.packetBuffer.writeShort(var10); // L: 1501 - Client.packetWriter.addNode(var12); // L: 1502 - return 1; // L: 1503 - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1506 - UserComparator9.Interpreter_stringStackSize -= 2; // L: 1507 - var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 1508 - String var5 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 1509 - if (var4.length() > 500) { // L: 1510 - return 1; - } else if (var5.length() > 500) { // L: 1511 - return 1; - } else { - PacketBufferNode var6 = InterfaceParent.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); // L: 1512 - var6.packetBuffer.writeShort(1 + class44.stringCp1252NullTerminatedByteSize(var4) + class44.stringCp1252NullTerminatedByteSize(var5)); // L: 1513 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1514 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1515 - var6.packetBuffer.method6640(var10); // L: 1516 - Client.packetWriter.addNode(var6); // L: 1517 - return 1; // L: 1518 - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1521 - return 1; // L: 1522 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1525 - return 1; // L: 1526 - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1529 - return 1; // L: 1530 - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1533 - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; // L: 1534 - } - - return 1; // L: 1535 - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1538 - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; // L: 1539 - } - - return 1; // L: 1540 - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1543 - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; // L: 1544 - } - - return 1; // L: 1545 - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1548 - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; // L: 1549 - } - - return 1; // L: 1550 - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1553 - return 1; // L: 1554 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1557 - return 1; // L: 1558 - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1561 - return 1; // L: 1562 - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - Fonts.setTapToDrop(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1); // L: 1565 - return 1; // L: 1566 - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = PendingSpawn.getTapToDrop() ? 1 : 0; // L: 1569 - return 1; // L: 1570 - } else if (var0 == 3129) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1573 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1574 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1575 - return 1; // L: 1576 - } else if (var0 == 3130) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1579 - return 1; // L: 1580 - } else if (var0 == 3131) { - --ChatChannel.Interpreter_intStackSize; // L: 1583 - return 1; // L: 1584 - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AttackOption.canvasWidth; // L: 1587 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class0.canvasHeight; // L: 1588 - return 1; // L: 1589 - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --ChatChannel.Interpreter_intStackSize; // L: 1592 - return 1; // L: 1593 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1596 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1599 - return 1; // L: 1600 - } else if (var0 == 3136) { - Client.field784 = 3; // L: 1603 - Client.field694 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1604 - return 1; // L: 1605 - } else if (var0 == 3137) { - Client.field784 = 2; // L: 1608 - Client.field694 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1609 - return 1; // L: 1610 - } else if (var0 == 3138) { - Client.field784 = 0; // L: 1613 - return 1; // L: 1614 - } else if (var0 == 3139) { - Client.field784 = 1; // L: 1617 - return 1; // L: 1618 - } else if (var0 == 3140) { - Client.field784 = 3; // L: 1621 - Client.field694 = var2 ? UserComparator5.scriptDotWidget.id * -464746545 * 363798319 : User.scriptActiveWidget.id * -464746545 * 363798319; // L: 1622 - return 1; // L: 1623 - } else { - boolean var11; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1626 - class4.clientPreferences.hideUsername = var11; // L: 1627 - Actor.savePreferences(); // L: 1628 - return 1; // L: 1629 - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.hideUsername ? 1 : 0; // L: 1632 - return 1; // L: 1633 - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1636 - Client.Login_isUsernameRemembered = var11; // L: 1637 - if (!var11) { // L: 1638 - class4.clientPreferences.rememberedUsername = ""; // L: 1639 - Actor.savePreferences(); // L: 1640 - } - - return 1; // L: 1642 - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1645 - return 1; // L: 1646 - } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { - return 1; // L: 1649 - } else if (var0 == 3146) { - var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1652 - if (var11 == class4.clientPreferences.titleMusicDisabled) { // L: 1653 - class4.clientPreferences.titleMusicDisabled = !var11; // L: 1654 - Actor.savePreferences(); // L: 1655 - } - - return 1; // L: 1657 - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1660 - return 1; // L: 1661 - } else if (var0 == 3148) { - return 1; // L: 1664 - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1667 - return 1; // L: 1668 - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1671 - return 1; // L: 1672 - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1675 - return 1; // L: 1676 - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1679 - return 1; // L: 1680 - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1683 - return 1; // L: 1684 - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = FontName.method6329(); // L: 1687 - return 1; // L: 1688 - } else if (var0 == 3155) { - --UserComparator9.Interpreter_stringStackSize; // L: 1691 - return 1; // L: 1692 - } else if (var0 == 3156) { - return 1; // L: 1695 - } else if (var0 == 3157) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1698 - return 1; // L: 1699 - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1702 - return 1; // L: 1703 - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1706 - return 1; // L: 1707 - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1710 - return 1; // L: 1711 - } else if (var0 == 3161) { - --ChatChannel.Interpreter_intStackSize; // L: 1714 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1715 - return 1; // L: 1716 - } else if (var0 == 3162) { - --ChatChannel.Interpreter_intStackSize; // L: 1719 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1720 - return 1; // L: 1721 - } else if (var0 == 3163) { - --UserComparator9.Interpreter_stringStackSize; // L: 1724 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1725 - return 1; // L: 1726 - } else if (var0 == 3164) { - --ChatChannel.Interpreter_intStackSize; // L: 1729 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1730 - return 1; // L: 1731 - } else if (var0 == 3165) { - --ChatChannel.Interpreter_intStackSize; // L: 1734 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1735 - return 1; // L: 1736 - } else if (var0 == 3166) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1739 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1740 - return 1; // L: 1741 - } else if (var0 == 3167) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1744 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1745 - return 1; // L: 1746 - } else if (var0 == 3168) { - ChatChannel.Interpreter_intStackSize -= 2; // L: 1749 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1750 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1751 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1752 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1753 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1754 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1755 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1756 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1757 - Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1758 - return 1; // L: 1759 - } else if (var0 == 3169) { - return 1; // L: 1762 - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1765 - return 1; // L: 1766 - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1769 - return 1; // L: 1770 - } else if (var0 == 3172) { - --ChatChannel.Interpreter_intStackSize; // L: 1773 - return 1; // L: 1774 - } else if (var0 == 3173) { - --ChatChannel.Interpreter_intStackSize; // L: 1777 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1778 - return 1; // L: 1779 - } else if (var0 == 3174) { - --ChatChannel.Interpreter_intStackSize; // L: 1782 - return 1; // L: 1783 - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1786 - return 1; // L: 1787 - } else if (var0 == 3176) { - return 1; // L: 1790 - } else if (var0 == 3177) { - return 1; // L: 1793 - } else if (var0 == 3178) { - --UserComparator9.Interpreter_stringStackSize; // L: 1796 - return 1; // L: 1797 - } else if (var0 == 3179) { - return 1; // L: 1800 - } else if (var0 == 3180) { - --UserComparator9.Interpreter_stringStackSize; // L: 1803 - return 1; // L: 1804 - } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1807 - UserComparator10.method2568((double)(0.5F + (float)var10 / 200.0F)); // L: 1808 - return 1; // L: 1809 - } else if (var0 == 3182) { - float var3 = 200.0F * ((float)class4.clientPreferences.field1312 - 0.5F); // L: 1812 - Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1813 - return 1; // L: 1814 - } else if (var0 != 3183 && var0 != 3184) { - return 2; // L: 1820 - } else { - --ChatChannel.Interpreter_intStackSize; // L: 1817 - return 1; // L: 1818 - } - } - } - } - } - } -} diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java deleted file mode 100644 index bae3fe83b8..0000000000 --- a/runescape-client/src/main/java/class93.java +++ /dev/null @@ -1,116 +0,0 @@ -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ct") -public class class93 { - @ObfuscatedName("f") - public static final int method2186(double var0, double var2, double var4) { - double var6 = var4; // L: 9 - double var8 = var4; // L: 10 - double var10 = var4; // L: 11 - if (var2 != 0.0D) { // L: 12 - double var12; - if (var4 < 0.5D) { // L: 14 - var12 = (1.0D + var2) * var4; - } else { - var12 = var2 + var4 - var2 * var4; // L: 15 - } - - double var14 = var4 * 2.0D - var12; // L: 16 - double var16 = 0.3333333333333333D + var0; // L: 17 - if (var16 > 1.0D) { // L: 18 - --var16; - } - - double var20 = var0 - 0.3333333333333333D; // L: 20 - if (var20 < 0.0D) { // L: 21 - ++var20; - } - - if (6.0D * var16 < 1.0D) { // L: 22 - var6 = var14 + var16 * 6.0D * (var12 - var14); - } else if (2.0D * var16 < 1.0D) { // L: 23 - var6 = var12; - } else if (3.0D * var16 < 2.0D) { // L: 24 - var6 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var16); - } else { - var6 = var14; // L: 25 - } - - if (var0 * 6.0D < 1.0D) { // L: 26 - var8 = var14 + (var12 - var14) * 6.0D * 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 (var20 * 6.0D < 1.0D) { // L: 30 - var10 = var14 + (var12 - var14) * 6.0D * var20; - } else if (var20 * 2.0D < 1.0D) { // L: 31 - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { // L: 32 - var10 = 6.0D * (0.6666666666666666D - var20) * (var12 - var14) + var14; - } else { - var10 = var14; // L: 33 - } - } - - int var22 = (int)(256.0D * var6); // L: 35 - int var13 = (int)(var8 * 256.0D); // L: 36 - int var23 = (int)(var10 * 256.0D); // L: 37 - int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 - return var15; // L: 39 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lda;III)Lbq;", - garbageValue = "225550567" - ) - public static final PcmPlayer method2187(TaskHandler var0, int var1, int var2) { - if (class341.field3921 == 0) { // L: 49 - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { // L: 50 - if (var2 < 256) { // L: 51 - var2 = 256; - } - - try { - PcmPlayer var3 = FontName.pcmPlayerProvider.player(); // L: 53 - var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 54 - var3.field403 = var2; // L: 55 - var3.init(); // L: 56 - var3.capacity = (var2 & -1024) + 1024; // L: 57 - if (var3.capacity > 16384) { // L: 58 - var3.capacity = 16384; - } - - var3.open(var3.capacity); // L: 59 - if (UserComparator1.field4220 > 0 && Login.soundSystem == null) { // L: 60 - Login.soundSystem = new SoundSystem(); // L: 61 - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 62 - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(Login.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 63 - } - - if (Login.soundSystem != null) { // L: 65 - if (Login.soundSystem.players[var1] != null) { // L: 66 - throw new IllegalArgumentException(); - } - - Login.soundSystem.players[var1] = var3; // L: 67 - } - - return var3; // L: 69 - } catch (Throwable var4) { // L: 71 - return new PcmPlayer(); // L: 72 - } - } else { - throw new IllegalArgumentException(); - } - } -} diff --git a/runescape-client/src/main/java/class97.java b/runescape-client/src/main/java/class97.java new file mode 100644 index 0000000000..59fdc98a42 --- /dev/null +++ b/runescape-client/src/main/java/class97.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("cu") +public interface class97 { +} diff --git a/runescape-client/src/main/java/class98.java b/runescape-client/src/main/java/class98.java new file mode 100644 index 0000000000..7a751ef841 --- /dev/null +++ b/runescape-client/src/main/java/class98.java @@ -0,0 +1,314 @@ +import java.security.SecureRandom; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("ck") +public class class98 implements class97 { + @ObfuscatedName("et") + @Export("secureRandom") + static SecureRandom secureRandom; + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-160184995" + ) + static int method2207(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { + if (class41.guestClanSettings != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + SpotAnimationDefinition.field1668 = class41.guestClanSettings; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.currentClanSettings[var3] != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + SpotAnimationDefinition.field1668 = Client.currentClanSettings[var3]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = SpotAnimationDefinition.field1668.name; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.allowGuests ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1359; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1368; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1369; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1383; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.memberCount; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = SpotAnimationDefinition.field1668.memberNames[var3]; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.memberRanks[var3]; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.bannedMemberCount; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = SpotAnimationDefinition.field1668.bannedMemberNames[var3]; + return 1; + } else { + int var5; + int var6; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.method2376(var3, var6, var5); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.currentOwner; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1379; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.method2358(Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + MouseHandler.method368(var6, var3); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1376[var3]; + return 1; + } else { + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + class388.method6942(var5, var3, var4); + } + + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1377[var3] ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { + if (FriendLoginUpdate.guestClanChannel != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + class103.field1293 = FriendLoginUpdate.guestClanChannel; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.currentClanChannels[var3] != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + class103.field1293 = Client.currentClanChannels[var3]; + class227.field2673 = var3; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = class103.field1293.name; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.field1436; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.field1430; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.method2520(); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class103.field1293.members.get(var3)).username.getName(); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class103.field1293.members.get(var3)).rank; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class103.field1293.members.get(var3)).world; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + MusicPatchNode.method4685(class227.field2673, var3); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.method2512(Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class103.field1293.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptFrame.field371 != null ? 1 : 0; + return 1; + } else { + return 2; + } + } + } + } + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "399024588" + ) + static final void method2208(int var0, int var1, boolean var2) { + if (!var2 || var0 != MouseHandler.field136 || class7.field26 != var1) { + MouseHandler.field136 = var0; + class7.field26 = var1; + class16.updateGameState(25); + DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait.", true); + int var3 = GrandExchangeOfferNameComparator.baseX; + int var4 = NPC.baseY; + GrandExchangeOfferNameComparator.baseX = (var0 - 6) * 8; + NPC.baseY = (var1 - 6) * 8; + int var5 = GrandExchangeOfferNameComparator.baseX - var3; + int var6 = NPC.baseY - var4; + var3 = GrandExchangeOfferNameComparator.baseX; + var4 = NPC.baseY; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { + NPC var19 = Client.npcs[var7]; + if (var19 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var19.pathX; + var10000[var9] -= var5; + var10000 = var19.pathY; + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; + var19.y -= var6 * 128; + } + } + + for (var7 = 0; var7 < 2048; ++var7) { + Player var22 = Client.players[var7]; + if (var22 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var22.pathX; + var10000[var9] -= var5; + var10000 = var22.pathY; + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; + var22.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var8 = 104; + byte var21 = 1; + if (var5 < 0) { + var20 = 103; + var8 = -1; + var21 = -1; + } + + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { + for (var14 = var10; var11 != var14; var14 += var12) { + int var15 = var5 + var13; + int var16 = var6 + var14; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { + var18.x -= var5; + var18.y -= var6; + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { + var18.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + ItemContainer.cameraX -= var5 << 7; + WorldMapArchiveLoader.cameraZ -= var6 << 7; + KeyHandler.oculusOrbFocalPointX -= var5 << 7; + ArchiveDiskAction.oculusOrbFocalPointY -= var6 << 7; + Client.field638 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + + } + } + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-33" + ) + @Export("updateSoundEffectVolume") + static final void updateSoundEffectVolume(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + Decimator.clientPreferences.soundEffectsVolume = var0; + MilliClock.savePreferences(); + } +} diff --git a/runescape-client/src/main/java/class99.java b/runescape-client/src/main/java/class99.java new file mode 100644 index 0000000000..a86b4f6a07 --- /dev/null +++ b/runescape-client/src/main/java/class99.java @@ -0,0 +1,82 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cz") +public enum class99 implements Enumerated { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + field1276(3, 0), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + field1268(0, 1), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + field1267(2, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + field1270(1, 3); + + @ObfuscatedName("oj") + @ObfuscatedSignature( + descriptor = "Lns;" + ) + static class371 field1271; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 300633619 + ) + public final int field1269; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1149906791 + ) + @Export("id") + final int id; + + class99(int var3, int var4) { + this.field1269 = var3; + this.id = var4; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1806959663" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Leq;", + garbageValue = "533845584" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); + return var1; + } + } +}